September 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmo-sip-connector[master]: forward SDP between SIP and MNCC

by keith

Attention is currently required from: neels, pespin. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222?usp=email ) Change subject: forward SDP between SIP and MNCC ...................................................................... Patch Set 10: Code-Review+1 (1 comment) Patchset: PS10: I think we should merge this, given that osmo-msc requires it. The whole picture is almost complete, and this is a good step forward. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae Gerrit-Change-Number: 16222 Gerrit-PatchSet: 10 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 03:49:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email ) Change subject: sip: test SDP forwarding via MNCC ...................................................................... Patch Set 4: (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417/comment/8b894f9e_40b5… PS2, Line 241: log("FAIL: expected SDP ", expect_sdp, " but got ", last_sdp); : setverdict(fail, "unexpected SDP"); : mtc.stop; > Misc_Helpers. […] (let's discuss at the other patch, the result will carry here) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2ae8449e673f5027f01d428d3718c006f76d93e Gerrit-Change-Number: 34417 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 02:53:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by neels

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sip: tweak failure reporting for SIP messages ...................................................................... sip: tweak failure reporting for SIP messages Help developers by logging message matching failures in detail. Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 --- M sip/SIP_Tests.ttcn 1 file changed, 57 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/34415/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

by neels

Attention is currently required from: laforge, neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sip: test SDP forwarding via MNCC ...................................................................... sip: test SDP forwarding via MNCC Add CallPars.mncc_with_sdp: when true, the call establishing functions f_establish_{mo,mt} now send valid SDP via MNCC, and validate that the SDP received on MNCC and SIP are as expected. Keep all current tests unchanged with mncc_with_sdp := false: they will continue to test the case without SDP (for legacy compatibility). These tests will still pass on the 'latest' builds. Add two new tests for mncc_with_sdp := true: TC_mt_with_sdp and TC_mo_with_sdp. These new tests will fail on our 'latest' builds until the SDP forwarding feature in osmo-sip-connector is released. Related: osmo-sip-connector I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae Change-Id: Ib2ae8449e673f5027f01d428d3718c006f76d93e --- M sip/SIP_Tests.ttcn 1 file changed, 213 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/34417/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2ae8449e673f5027f01d428d3718c006f76d93e Gerrit-Change-Number: 34417 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: pass CallPars into f_TC_*()

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: sip: pass CallPars into f_TC_*() ...................................................................... sip: pass CallPars into f_TC_*() Move composition of CallPars out of all f_* functions into their TC_* functions, so that future tests can reuse the f_* functions with different CallPars. An upcoming patch wants to call f_TC_mo_success_rel_sip() with different CallPars. Change-Id: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570 --- M sip/SIP_Tests.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/34416/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570 Gerrit-Change-Number: 34416 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: make mncc_with_sdp := true the default

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: sip: make mncc_with_sdp := true the default ...................................................................... sip: make mncc_with_sdp := true the default A preceding patch has added mncc_with_sdp, defaulting to false. So far just two new tests use mncc_with_sdp := true, but operation without SDP is now merely the legacy compatibility mode, and I would rather nudge new tests towards mncc_with_sdp := true. So switch the default to mncc_with_sdp := true. Change-Id: Ic9871917c57a9ab81b2fff0af7f569b09015910c --- M sip/SIP_Tests.ttcn 1 file changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/34418/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9871917c57a9ab81b2fff0af7f569b09015910c Gerrit-Change-Number: 34418 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 1: (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/9a2a7eea_907c… PS1, Line 195: og("FAIL: expected SIP message ", sip_expect); : setverdict(fail, "Received unexpected SIP message"); > I don't really like this kind of duplication. […] IIRC the reason why i got into the behavior to log separately is that message dumps in verdicts aren't formatted by ttcn3_logformat; the verdict string doesn't seem to be intended for long dumps. So I like to get a short crunchy reason in the verdict, and look at the dumps in the normal log instead... I'm using f_shutdown() now, but I am keeping the separate log, ok? BTW with f_shutdown(), I wouldn't know how to append a message dump. With log("bla ", msg) it works, but with f_shutdown(..., fail, "bla " & msg) it doesn't. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Sep 2023 02:49:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-msc[master]: fix codecs in internal call bridge

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34412?usp=email ) Change subject: fix codecs in internal call bridge ...................................................................... fix codecs in internal call bridge This is a fixup for the patch '3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G' I386a6a426c318040b019ab5541689c67e94672a1 After above patch, osmo-msc intelligently decides which codecs to run on which legs of the RTP streams. In the meantime, it seems the necessary matching changes to call_leg_local_bridge() had been lost somehow. Testing 3G to 3G voice now, I noticed that call_leg_local_bridge() overwrites the intelligent choices made earlier. The history of an MGW endpoint that should convert from IUFP to plain AMR, extracted from a pcap, looks like this: <- CRCX None None -> CRCX-OK audio 4050 RTP/AVP 112 None <- MDCX audio 4056 RTP/AVP 112 AMR -> MDCX-OK audio 4050 RTP/AVP 112 AMR <- MDCX audio 4056 RTP/AVP 96 VND.3GPP.IUFP -> MDCX-OK audio 4050 RTP/AVP 96 VND.3GPP.IUFP So after call_leg_local_bridge(), there is an extra MDCX + MDCX-OK that switches the codec from 112 AMR back to 96 IUFP. That is because call_leg_local_bridge() copies the *RAN* side's codec to both CN sides, which used to be ok when RAN and CN codecs were always identical. Instead, adjust only the CN sides of the MGW endpoints, and adjust them so that both CN sides are identical. osmo-mgw should then be able to trivially translate the codecs appropriately. Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d --- M src/libmsc/call_leg.c 1 file changed, 73 insertions(+), 11 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index d0dc642..b797322 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -352,25 +352,46 @@ int call_leg_local_bridge(struct call_leg *cl1, uint32_t call_id1, struct gsm_trans *trans1, struct call_leg *cl2, uint32_t call_id2, struct gsm_trans *trans2) { - struct sdp_audio_codecs *codecs; + struct sdp_audio_codecs *cn_codecs = NULL; cl1->local_bridge = cl2; cl2->local_bridge = cl1; - /* We may just copy the codec info we have for the RAN side of the first leg to the CN side of both legs. This - * also means that if both legs use different codecs the MGW must perform transcoding on the second leg. */ - if (!cl1->rtp[RTP_TO_RAN] || !cl1->rtp[RTP_TO_RAN]->codecs_known) { - LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side RTP stream codec is not known, not ready for bridging\n"); + /* Marry the two CN sides of the call legs. Call establishment should have made all efforts for these to be + * compatible. However, for local bridging, the codecs and payload type numbers must be exactly identical on + * both sides. Both sides may so far have different payload type numbers or slightly differing codecs, but it + * will only work when the SDP on the RTP_TO_CN sides of the call legs talk the same payload type numbers. + * So, simply take the SDP from one RTP_TO_CN side, and overwrite the other RTP_TO_CN side's SDP with it. + * If all goes to plan, the codecs will be identical, or possibly the MGW will do a conversion like AMR-BE to + * AMR-OA. In the worst case, the other call leg cannot transcode, and the call fails -- because codec + * negotiation did not do a good enough job. + * + * Copy one call leg's CN config to the other: + * + * call leg 1 call leg 2 + * ---MGW-ep------- ---MGW-ep------- + * RAN CN CN RAN + * AMR:112 AMR:112 AMR:96 AMR:96 + * | + * +-------+ + * | + * V + * AMR:112 AMR:112 AMR:112 AMR:96 + * ^MGW-endpoint converts payload type numbers between 112 and 96. + */ + if (cl1->rtp[RTP_TO_CN] && cl1->rtp[RTP_TO_CN]->codecs_known) + cn_codecs = &cl1->rtp[RTP_TO_CN]->codecs; + else if (cl2->rtp[RTP_TO_CN] && cl2->rtp[RTP_TO_CN]->codecs_known) + cn_codecs = &cl2->rtp[RTP_TO_CN]->codecs; + if (!cn_codecs) { + LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side CN stream codec is not known, not ready for bridging\n"); + LOG_CALL_LEG(cl2, LOGL_ERROR, "RAN-side CN stream codec is not known, not ready for bridging\n"); return -EINVAL; } - codecs = &cl1->rtp[RTP_TO_RAN]->codecs; - - if (!cl1->rtp[RTP_TO_CN] || !cl2->rtp[RTP_TO_CN]) - return -ENOTCONN; call_leg_ensure_ci(cl1, RTP_TO_CN, call_id1, trans1, - codecs, &cl2->rtp[RTP_TO_CN]->local); + cn_codecs, &cl2->rtp[RTP_TO_CN]->local); call_leg_ensure_ci(cl2, RTP_TO_CN, call_id2, trans2, - codecs, &cl1->rtp[RTP_TO_CN]->local); + cn_codecs, &cl1->rtp[RTP_TO_CN]->local); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d Gerrit-Change-Number: 34412 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-msc[master]: fix codecs in internal call bridge

by neels

Attention is currently required from: fixeria, laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34412?usp=email ) Change subject: fix codecs in internal call bridge ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS2: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34412?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d Gerrit-Change-Number: 34412 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 02:31:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: make two functions static

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email ) Change subject: make two functions static ...................................................................... make two functions static Change-Id: I1de0f35f1606c997777f34bbf4033e069aadbc64 --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c M src/osmo-msc/msc_main.c 3 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/34435/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index 8a1e4ad..c8f3bfd 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -219,7 +219,6 @@ const char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); -void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); /* input from CC code into mncc_builtin */ int int_mncc_recv(struct gsm_network *net, struct msgb *msg); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5908db9..6148bbd 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -129,7 +129,7 @@ /* Call Control */ -void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg) +static void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg) { net->mncc_recv(net, msg); } diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9808e86..913bd21 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -242,8 +242,8 @@ } } -struct gsm_network *msc_network_alloc(void *ctx, - mncc_recv_cb_t mncc_recv) +static struct gsm_network *msc_network_alloc(void *ctx, + mncc_recv_cb_t mncc_recv) { struct gsm_network *net = gsm_network_init(ctx, mncc_recv); if (!net) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1de0f35f1606c997777f34bbf4033e069aadbc64 Gerrit-Change-Number: 34435 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023