October 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: gracefully exit on receipt of SIGTERM

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29847 ) Change subject: trxcon: gracefully exit on receipt of SIGTERM ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/29847/comment/02d8c598_f7e1b55c PS2, Line 7: grecefully > gracefully Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 24 Oct 2022 19:35:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29853 ) Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init ...................................................................... Patch Set 2: (1 comment) File src/libosmo-mgcp/mgcp_iuup.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-404): https://gerrit.osmocom.org/c/osmo-mgw/+/29853/comment/9439c800_921885e0 PS2, Line 102: /* No IuUP Initialization has occured on the IuUP side yet. Return error and drop the RTP data, until 'occured' may be misspelled - perhaps 'occurred'? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Oct 2022 19:34:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: IuUP->AMR: log whether converting to AMR OA or BE

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29856 ) Change subject: IuUP->AMR: log whether converting to AMR OA or BE ...................................................................... IuUP->AMR: log whether converting to AMR OA or BE Enhance the existing log message Convert IuUP -> AMR:... to Convert IuUP -> AMR OA:... (or BE) to show wether emitting Octet-Aligned or Bandwidth-Efficient. Related: SYS#5092 Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index c84b971..95487fc 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -274,9 +274,9 @@ return ft; } msgb_pull_to_l3(msg); - LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); if (mgcp_codec_amr_is_octet_aligned(conn_rtp_dst->end.codec)) { + LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR OA: ft %d, len %d\n", ft, msgb_length(msg)); amr_hdr = (struct amr_hdr *) msgb_push(msg, sizeof(struct amr_hdr)); amr_hdr->cmr = 15; /* no change */ amr_hdr->f = 0; @@ -295,6 +295,7 @@ amr_data[1] |= ((ft & 0x1) << 7) | (((!fqc) & 0x1) << 6); amr_length = (osmo_amr_bits(ft) + 10 + 7) / 8; msgb_trim(msg, amr_length); + LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR BE: ft %d, len %zd\n", ft, amr_length); } rtp_hdr = (struct rtp_hdr *) msgb_push(msg, sizeof(*rtp_hdr)); *rtp_hdr = (struct rtp_hdr){ null-- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3672d01d2879ae8820176a46454f26a4f5f584de Gerrit-Change-Number: 29856 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: IuUP->AMR: do not patch payload type a second time

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29855 ) Change subject: IuUP->AMR: do not patch payload type a second time ...................................................................... IuUP->AMR: do not patch payload type a second time When converting IuUP to AMR/RTP, bridge_iuup_to_rtp_peer() sets the AMR side's payload type number and then calls mgcp_send(). In mgcp_send(), do not attempt to patch the payload type number a second time. In mgcp_send(), skip patching payload type numbers if the source side is IuUP. This matches exactly the case of converting IuUP to AMR/RTP. There already is a check for IuUP, but for the wrong side. Drop that one and explain in a comment why. Move the comment about transcoding into the failure branch, where it is relevant and doesn't clutter the new explanation of payload type patching conditions. Related: OS#5720 Related: SYS#5092 Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 13 insertions(+), 9 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index bb8cfa3..29c0dc2 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1160,17 +1160,21 @@ else LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n"); - /* FIXME: It is legal that the payload type on the egress connection is - * different from the payload type that has been negotiated on the - * ingress connection. Essentially the codecs are the same so we can - * match them and patch the payload type. However, if we can not find - * the codec pendant (everything ist equal except the PT), we are of - * course unable to patch the payload type. A situation like this - * should not occur if transcoding is consequently avoided. Until - * we have transcoding support in osmo-mgw we can not resolve this. */ - if (is_rtp && !mgcp_conn_rtp_is_iuup(conn_dst)) { + /* Patch the payload type number: translate from conn_src to conn_dst. + * Do not patch for IuUP, where the correct payload type number is already set in bridge_iuup_to_rtp_peer(): + * IuUP -> AMR: calls this function, skip patching if conn_src is IuUP. + * {AMR or IuUP} -> IuUP: calls mgcp_udp_send() directly, skipping this function: No need to examine dst. */ + if (is_rtp && !mgcp_conn_rtp_is_iuup(conn_src)) { rc = mgcp_patch_pt(conn_src, conn_dst, msg); if (rc < 0) { + /* FIXME: It is legal that the payload type on the egress connection is + * different from the payload type that has been negotiated on the + * ingress connection. Essentially the codecs are the same so we can + * match them and patch the payload type. However, if we can not find + * the codec pendant (everything ist equal except the PT), we are of + * course unable to patch the payload type. A situation like this + * should not occur if transcoding is consequently avoided. Until + * we have transcoding support in osmo-mgw we can not resolve this. */ LOGPENDP(endp, DRTP, LOGL_DEBUG, "can not patch PT because no suitable egress codec was found.\n"); } null-- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7c722cd959f76bd104ae4941d182c77e5c025867 Gerrit-Change-Number: 29855 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: properly translate Q -> FQC

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29854 ) Change subject: AMR->IuUP: properly translate Q -> FQC ...................................................................... AMR->IuUP: properly translate Q -> FQC Fix the reversed logic when composing IuUP.FQC: AMR.Q == 1 means the frame is good. Without this fix, all frames on IuUP are marked as bad, and no voice is heard on the IuUP side. Related: SYS#5092 Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30 --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 15d674d..c84b971 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -679,12 +679,13 @@ LOG_CONN_RTP(conn_dest_rtp, LOGL_NOTICE, "Bridge RTP=>IuUP: No RFCI found for AMR OA ft=%u\n", amr_hdr->ft); goto free_ret; } - irp->u.data.fqc = amr_hdr->q; + irp->u.data.fqc = amr_hdr->q ? IUUP_FQC_FRAME_GOOD : IUUP_FQC_FRAME_BAD; irp->u.data.rfci = rfci; msgb_pull(msg, 2); } else { uint8_t *amr_bwe_hdr = (uint8_t *) msgb_data(msg); int8_t ft; + uint8_t q; if (msgb_length(msg) < 2) { LOG_CONN_RTP(conn_src_rtp, LOGL_NOTICE, "Bridge RTP=>IuUP: too short for AMR BE hdr (%u)\n", msgb_length(msg)); @@ -699,7 +700,8 @@ LOG_CONN_RTP(conn_dest_rtp, LOGL_NOTICE, "Bridge RTP=>IuUP: No RFCI found for AMR BE ft=%u\n", ft); goto free_ret; } - irp->u.data.fqc = ((amr_bwe_hdr[1] & 0x40) >> 6); + q = amr_bwe_hdr[1] & 0x40; + irp->u.data.fqc = q ? IUUP_FQC_FRAME_GOOD : IUUP_FQC_FRAME_BAD; irp->u.data.rfci = rfci; rc = iuup_length = osmo_amr_bwe_to_iuup(msgb_data(msg), msgb_length(msg)); if (rc < 0) { null-- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I29878dd27af9ba0c9e600324c528b22940cdcc30 Gerrit-Change-Number: 29854 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29853 ) Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init ...................................................................... AMR->IuUP: do not crash on AMR data before IuUP Init When translating AMR to IuUP, when AMR data arrives before the IuUP side has negotiated an IuUP Initialization, do not crash osmo-mgw, but return failure and drop the AMR packet. As soon as IuUP Initialization occured and RFCIs are defined, the AMR starts to pass through to the IuUP side. Related: SYS#5092 Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 90021f3..15d674d 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -98,7 +98,11 @@ uint8_t rfci_cnt = 0; unsigned match_bytes = (unsigned)osmo_amr_bytes(ft); struct osmo_iuup_rnl_prim *irp = conn_rtp->iuup.init_ind; - OSMO_ASSERT(irp); + if (!irp) { + /* No IuUP Initialization has occured on the IuUP side yet. Return error and drop the RTP data, until + * the IuUP Initialization has configured the link. */ + return -1; + } /* TODO: cache this somehow */ for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) { null-- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: log conversion, like for the flipside

by neels

Attention is currently required from: neels. Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 to look at the new patch set (#2). Change subject: AMR->IuUP: log conversion, like for the flipside ...................................................................... AMR->IuUP: log conversion, like for the flipside For IuUP -> AMR, we log a message like Convert IuUP -> AMR OA:... Do the same for the direction AMR -> IuUP. Related: SYS#5092 Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/29857/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac Gerrit-Change-Number: 29857 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: do not crash on AMR data before IuUP Init

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 to look at the new patch set (#2). Change subject: AMR->IuUP: do not crash on AMR data before IuUP Init ...................................................................... AMR->IuUP: do not crash on AMR data before IuUP Init When translating AMR to IuUP, when AMR data arrives before the IuUP side has negotiated an IuUP Initialization, do not crash osmo-mgw, but return failure and drop the AMR packet. As soon as IuUP Initialization occured and RFCIs are defined, the AMR starts to pass through to the IuUP side. Related: SYS#5092 Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/29853/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9efb7e523d8d9af988e4bf4f5e925839204f934 Gerrit-Change-Number: 29853 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: give L1CTL API direct access to trxcon_fsm

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 to look at the new patch set (#3). Change subject: trxcon: give L1CTL API direct access to trxcon_fsm ...................................................................... trxcon: give L1CTL API direct access to trxcon_fsm The L1CTL interface logic currently gets access to the trxcon_fsm via an associated struct trxcon_inst. No other fields are used, so we can pass trxcon->fi directly. All communication shall be done via the FSM anyway. Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c 2 files changed, 72 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/29849/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5a15a676ce3917d2eddc44f1143cea8d3cd8781f Gerrit-Change-Number: 29849 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: gracefully exit on receipt of SIGTERM

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 to look at the new patch set (#3). Change subject: trxcon: gracefully exit on receipt of SIGTERM ...................................................................... trxcon: gracefully exit on receipt of SIGTERM Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 --- M src/host/trxcon/src/trxcon.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/29847/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id33e598b5c7a7a474a383f815cdbda65b29d25a0 Gerrit-Change-Number: 29847 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022