- gerrit-log - lists.osmocom.org

[S] Change in libosmo-abis[master]: trau_frame.c cosmetic: fix misleading comment
by falconia 25 Jun '24

25 Jun '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37284?usp=email ) Change subject: trau_frame.c cosmetic: fix misleading comment ...................................................................... trau_frame.c cosmetic: fix misleading comment The 4 static const ubit_t arrays ft_hr_up_bits[5], ft_hr_down_bits[5], ft_data_hr_up_bits[5] and ft_data_hr_down_bits[5] contain frame type bit patterns that are defined in GSM 08.61 for half-rate speech and data channels with 16 kbit/s Abis transport, and are used as such in the code. However, the comment next to them stated incorrectly that these frame type bit patterns are for 8 kbit/s submultiplexing - fix it. Change-Id: Ic2f818a7f8bab4e82f239464511ab430906d4680 --- M src/trau/trau_frame.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/84/37284/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 9c9baa7..0be005a 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -82,7 +82,7 @@ TS48060_AMR_FC_NO_SPEECH = 0x0, }; -/* 16k sub-slots */ +/* GSM 08.60 frame types, 16k sub-slots */ static const ubit_t ft_fr_up_bits[5] = { 0, 0, 0, 1, 0 }; static const ubit_t ft_fr_down_bits[5] = { 1, 1, 1, 0, 0 }; static const ubit_t ft_data_up_bits[5] = { 0, 1, 0, 0, 0 }; @@ -96,7 +96,7 @@ static const ubit_t ft_d145s_bits[5] = { 1, 0, 1, 0, 0 }; static const ubit_t ft_edata_bits[5] = { 1, 1, 1, 1, 1 }; -/* 8k sub-slots */ +/* GSM 08.61 frame types, still on 16k sub-slots */ static const ubit_t ft_hr_up_bits[5] = { 0, 0, 0, 1, 1 }; static const ubit_t ft_hr_down_bits[5] = { 1, 1, 1, 0, 1 }; static const ubit_t ft_data_hr_up_bits[5] = { 0, 1, 0, 0, 1 }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37284?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic2f818a7f8bab4e82f239464511ab430906d4680 Gerrit-Change-Number: 37284 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-abis[master]: {de,en}code8_hr: fix totally broken functions
by falconia 25 Jun '24

25 Jun '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37285?usp=email ) Change subject: {de,en}code8_hr: fix totally broken functions ...................................................................... {de,en}code8_hr: fix totally broken functions The functions decode8_hr() and encode8_hr() in trau_frame.c (encoding and decoding HRv1 TRAU frames in 8 kbit/s format) are available via osmo_trau_frame_decode_8k() and osmo_trau_frame_encode() public APIs, but they are not currently used anywhere in Osmocom. (OsmoMGW-E1 has no working support for HR codec, and there is no support for HRv1-8k in the TRAU<->RTP layer until next patch in this series.) Study of the code reveals that these functions were totally broken prior to this change: * The movement of Dn bits between trau_bits and fr->d_bits used wrong offsets for some of the bits (and even missed one group of bits entirely in the encoding direction), producing garbled codec frames. * The filling of XCn bits in the encoding direction was likewise garbled by use of wrong offset. * When encoding TRAU-UL frames in this format, bit C5 (odd parity) was set incorrectly. * The order of bits in fr->crc_bits array (Osmocom internal) was opposite the order needed for osmo_crc8gen_check_bits() and osmo_crc8gen_set_bits() functions - contrast with HRv1-16k functions that use sensible bit order for this fr->crc_bits array. Given that this HRv1-8k mode within TRAU frame encoding and decoding API was totally broken and not used anywhere, there are no compatibility concerns with changing aspects of this API such as CRC bit order. Change-Id: I7cf0275f2ff212e001db38d7b090f222f292cdb0 --- M src/trau/trau_frame.c 1 file changed, 49 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/85/37285/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 0be005a..389495c 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -780,15 +780,14 @@ } /* CRC0 .. CRC2 */ - fr->crc_bits[2] = trau_bits[82]; - fr->crc_bits[1] = trau_bits[83]; - fr->crc_bits[0] = trau_bits[84]; + memcpy(fr->crc_bits, trau_bits + 73, 3); /* D45 .. D48 */ - memcpy(fr->d_bits + d_idx, trau_bits + 85, 4); + memcpy(fr->d_bits + d_idx, trau_bits + 76, 4); + d_idx += 4; /* D49 .. D111 */ - for (i = 10; i < 10 + 10; i++) { + for (i = 10; i < 10 + 9; i++) { int offset = i * 8; memcpy(fr->d_bits + d_idx, trau_bits + offset + 1, 7); d_idx += 7; @@ -843,7 +842,7 @@ cbits_out[1] = 0; cbits_out[2] = 0; cbits_out[3] = 1; - cbits_out[4] = 1; + cbits_out[4] = 0; } else { cbits_out[0] = 0; cbits_out[1] = 0; @@ -855,7 +854,7 @@ /* XC1 .. XC2 */ memcpy(trau_bits + 1 * 8 + 6, fr->xc_bits, 2); /* XC3 .. XC6 */ - memcpy(trau_bits + 2 * 8 + 2, fr->xc_bits, 4); + memcpy(trau_bits + 2 * 8 + 2, fr->xc_bits + 2, 4); /* D1 .. D2 */ memcpy(trau_bits + 2 * 8 + 6, fr->d_bits, 2); d_idx += 2; @@ -868,12 +867,14 @@ }; /* CRC0 .. CRC2 */ - trau_bits[82] = fr->crc_bits[2]; - trau_bits[83] = fr->crc_bits[1]; - trau_bits[84] = fr->crc_bits[0]; + memcpy(trau_bits + 73, fr->crc_bits, 3); + + /* D45 .. D48 */ + memcpy(trau_bits + 76, fr->d_bits + d_idx, 4); + d_idx += 4; /* D49 .. D111 */ - for (i = 10; i < 10 + 10; i++) { + for (i = 10; i < 10 + 9; i++) { int offset = i * 8; memcpy(trau_bits + offset + 1, fr->d_bits + d_idx, 7); d_idx += 7; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37285?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7cf0275f2ff212e001db38d7b090f222f292cdb0 Gerrit-Change-Number: 37285 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-abis[master]: build config: add --disable-ortp option
by falconia 25 Jun '24

25 Jun '24

Attention is currently required from: laforge, neels. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email ) Change subject: build config: add --disable-ortp option ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > hmm, except, do we now need to update the build system to ensure that this option builds successfully? I am not asking Osmocom core team to test builds with this new option. **I** will be making a lot of builds with --disable-ortp, and if it breaks in the future, I will be the one to raise the alert and fix it. > Might reconsider the effort:benefit ratio...? What effort? I am not asking your team to add the new build variant to your CI, just merge the patch (providing the option) so I don't have to keep reapplying it to every new release and every sandbox build I do. With the two +1's from you and @osmith@sysmocom.de I can now merge the patch - but I'll give it another few days for further review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883 Gerrit-Change-Number: 36975 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> 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-Comment-Date: Tue, 25 Jun 2024 01:21:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmo-abis[master]: build config: add --disable-ortp option
by neels 25 Jun '24

25 Jun '24

Attention is currently required from: falconia, laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email ) Change subject: build config: add --disable-ortp option ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > even if premature for osmo-bts, it's not harmful to add this compiler option; makes the build more f […] hmm, except, do we now need to update the build system to ensure that this option builds successfully? Might reconsider the effort:benefit ratio...? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883 Gerrit-Change-Number: 36975 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jun 2024 01:04:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmo-abis[master]: build config: add --disable-ortp option
by neels 25 Jun '24

25 Jun '24

Attention is currently required from: falconia, laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email ) Change subject: build config: add --disable-ortp option ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/36975/comment/9bf8806d_6a2c944d PS2, Line 25: and work with ortp dependency eliminated. (nitpick: very low word-count to information ratio... isn't this already all that needs to be said: ``` Add --disable-ortp option Assist distributions where it is incovenient to install libortp. ``` ) Patchset: PS2: even if premature for osmo-bts, it's not harmful to add this compiler option; makes the build more flexible without adverse effects AFAICT. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883 Gerrit-Change-Number: 36975 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jun 2024 01:01:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: test re-assignment to match codec with MT
by neels 25 Jun '24

25 Jun '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?usp=email ) Change subject: msc: test re-assignment to match codec with MT ...................................................................... msc: test re-assignment to match codec with MT Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Depends: osmo-msc I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Change-Id: I402ed0523a2a87b83f29c5577b2c828102005d53 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 84 insertions(+), 7 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 109888a..16309ed 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -979,7 +979,11 @@ BearerCapability_TLV bearer_cap, /* which bearer capabilities to claim */ boolean emergency, /* is this an emergency call? */ boolean csd, /* is this a circuit switched data call? */ - BSSMAP_FIELD_CodecElement tch_codec_chosen, /* If TCH, which codec to send in BSSMAP Assignment Complete. */ + BSSMAP_FIELD_CodecElement ass_compl_chosen_codec, /* If TCH, which codec to send in BSSMAP Assignment Complete. */ + charstring mncc_alert_req_sends_remote_sdp, /* SDP string. MNCC_ALERT_REQ is when MO learns MT's codec capabilities */ + boolean expect_re_assignment, /* Set to true when mncc_alert_req_sends_remote_sdp should trigger a 2nd Assignment to adjust the codec */ + BSSMAP_FIELD_CodecElements re_ass_req_codecs, /* If expect_re_assignment: verify codecs seen in 2nd Assignment Request */ + BSSMAP_FIELD_CodecElement re_ass_compl_chosen_codec, /* If expect_re_assignment: What Codec (Chosen) to send back in 2nd Assignment Complete */ /* MNCC related parameters */ uint32_t mncc_callref optional, /* call reference on the MNCC side */ @@ -1017,7 +1021,11 @@ bearer_cap := valueof(ts_Bcap_voice), emergency := false, csd := false, - tch_codec_chosen := valueof(ts_CodecFR), + ass_compl_chosen_codec := ts_CodecFR, + mncc_alert_req_sends_remote_sdp := "", + expect_re_assignment := false, + re_ass_req_codecs := {ts_CodecFR}, + re_ass_compl_chosen_codec := ts_CodecFR, mncc_callref := omit, mncc_bearer_cap := valueof(ts_MNCC_bcap_voice), mncc_rtp_ip := "42.23.11.5", @@ -1058,7 +1066,11 @@ bearer_cap := ?, emergency := ?, csd := ?, - tch_codec_chosen := ?, + ass_compl_chosen_codec := ?, + mncc_alert_req_sends_remote_sdp := ?, + expect_re_assignment := ?, + re_ass_req_codecs := ?, + re_ass_compl_chosen_codec := ?, mncc_callref := *, mncc_bearer_cap := ?, mncc_rtp_ip := ?, @@ -1609,7 +1621,8 @@ } } -private function f_mo_call_establish__handle_assignment_request(inout CallParameters cpars, PDU_BSSAP ass_req) +private function f_mo_call_establish__handle_assignment_request(inout CallParameters cpars, PDU_BSSAP ass_req, + BSSMAP_FIELD_CodecElement tch_codec_chosen) runs on BSC_ConnHdlr { var BSSMAP_IE_AoIP_TransportLayerAddress tla; var BSSMAP_IE_SpeechCodec codec; @@ -1645,7 +1658,7 @@ if (cpars.csd) { codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecCSData})); } else { - codec := valueof(ts_BSSMAP_IE_SpeechCodec({cpars.tch_codec_chosen})); + codec := valueof(ts_BSSMAP_IE_SpeechCodec({tch_codec_chosen})); } var PDU_BSSAP bssap; @@ -1736,13 +1749,31 @@ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_CALL_PROC(cpars.transaction_id))); /* Alerting */ - MNCC.send(ts_MNCC_ALERT_req(cpars.mncc_callref)); + var MNCC_PDU mncc_alert_req := valueof(ts_MNCC_ALERT_req(cpars.mncc_callref)); + + /* Tell the MO call leg about MT's codecs, via SDP in MNCC */ + mncc_alert_req.u.signal.sdp := cpars.mncc_alert_req_sends_remote_sdp; + + MNCC.send(mncc_alert_req); + + if (cpars.expect_re_assignment) { + /* Another Assignment Request is expected after telling the MO call leg about MT's codecs */ + BSSAP.receive(tr_BSSMAP_AssignmentReq(omit)) -> value bssap; + + if (not match(bssap.pdu.bssmap.assignmentRequest.codecList.codecElements, + cpars.re_ass_req_codecs)) { + setverdict(fail, "MSC sent Assignment Request with unexpected codec list"); + mtc.stop; + } + + f_mo_call_establish__handle_assignment_request(cpars, bssap, cpars.re_ass_compl_chosen_codec); + } } //[g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit)) -> value bssap { log("f_mo_call_establish 4: rx Assignment Request"); - f_mo_call_establish__handle_assignment_request(cpars, bssap); + f_mo_call_establish__handle_assignment_request(cpars, bssap, cpars.ass_compl_chosen_codec); } [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap { log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment Request"); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 898aeef..a503d20 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7414,6 +7414,39 @@ vc_conn.done; } +friend function f_tc_lu_and_mo_call_reass_for_mt_codec(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + /* MO will first choose GSM-FR = BSC returns GSM-FR in Assignment Complete's Codec (Chosen) */ + cpars.ass_compl_chosen_codec := valueof(ts_CodecFR); + /* But when the MT call leg responds, we learn that it only supports AMR */ + cpars.mncc_alert_req_sends_remote_sdp := + "v=0\r\n" + & "o=BSC_ConnectionHandler.ttcn 0 0 IN IP4 1.1.1.1\r\n" + & "s=GSM Call\r\n" + & "c=IN IP4 " & cpars.bss_rtp_ip & "\r\n" + & "t=0 0\r\n" + & "m=audio " & int2str(cpars.bss_rtp_port) & " RTP/AVP 112\r\n" + & "a=rtpmap:112 AMR/8000\r\n" + & "a=fmtp:112 octet-align=1\r\n" + & "a=ptime:20\r\n"; + /* MSC should ask for another Assignment after MNCC_ALERT_REQ, that should now contain only the remote call + * leg's capabilities, i.e. only AMR. */ + cpars.expect_re_assignment := true; + cpars.re_ass_req_codecs := {valueof(ts_CodecAMR_F), valueof(ts_CodecAMR_H)}; + /* When the MSC asks for another Assignment after MNCC_ALERT_REQ, we'll give it AMR. */ + cpars.re_ass_compl_chosen_codec := valueof(ts_CodecAMR_F); + f_perform_lu(); + f_mo_call(cpars); +} +testcase TC_lu_and_mo_call_reass_for_mt_codec() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call_reass_for_mt_codec), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -7602,6 +7635,8 @@ execute( TC_lu_and_mo_csd() ); execute( TC_lu_and_mt_csd() ); + + execute( TC_lu_and_mo_call_reass_for_mt_codec() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?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: I402ed0523a2a87b83f29c5577b2c828102005d53 Gerrit-Change-Number: 35053 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: split off f_mo_call_establish__handle_assignment_request()
by neels 25 Jun '24

25 Jun '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email ) Change subject: msc: split off f_mo_call_establish__handle_assignment_request() ...................................................................... msc: split off f_mo_call_establish__handle_assignment_request() Subsequent patch wants to re-use that code. Split off to keep the patches small. Related: I402ed0523a2a87b83f29c5577b2c828102005d53 Change-Id: I98c6171a592dfe1573e15136c4ecf4ff234048d7 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 74 insertions(+), 51 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 056a3c0..109888a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -979,6 +979,7 @@ BearerCapability_TLV bearer_cap, /* which bearer capabilities to claim */ boolean emergency, /* is this an emergency call? */ boolean csd, /* is this a circuit switched data call? */ + BSSMAP_FIELD_CodecElement tch_codec_chosen, /* If TCH, which codec to send in BSSMAP Assignment Complete. */ /* MNCC related parameters */ uint32_t mncc_callref optional, /* call reference on the MNCC side */ @@ -1016,6 +1017,7 @@ bearer_cap := valueof(ts_Bcap_voice), emergency := false, csd := false, + tch_codec_chosen := valueof(ts_CodecFR), mncc_callref := omit, mncc_bearer_cap := valueof(ts_MNCC_bcap_voice), mncc_rtp_ip := "42.23.11.5", @@ -1056,6 +1058,7 @@ bearer_cap := ?, emergency := ?, csd := ?, + tch_codec_chosen := ?, mncc_callref := *, mncc_bearer_cap := ?, mncc_rtp_ip := ?, @@ -1606,6 +1609,63 @@ } } +private function f_mo_call_establish__handle_assignment_request(inout CallParameters cpars, PDU_BSSAP ass_req) +runs on BSC_ConnHdlr { + var BSSMAP_IE_AoIP_TransportLayerAddress tla; + var BSSMAP_IE_SpeechCodec codec; + var BSSMAP_IE_Osmo_OsmuxCID osmuxCID; + + if (not ispresent(ass_req.pdu.bssmap.assignmentRequest.aoIPTransportLayer)) { + setverdict(fail, "MSC sent Assignment Request without AoIP Transport Layer IE"); + mtc.stop; + } + + var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 := + f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?); + var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 := + f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?); + + if (not match(ass_req.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass1) + and not match(ass_req.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass2)) { + log("Expected one of: 1:", tla_ass1, " 2:", tla_ass2); + log("Got:", ass_req.pdu.bssmap.assignmentRequest.aoIPTransportLayer); + setverdict(fail, "MSC sent Assignment Request with unexpected AoIP Transport Layer IE"); + mtc.stop; + } + + if (cpars.csd and not match(ass_req.pdu.bssmap.assignmentRequest.codecList.codecElements, + {ts_CodecCSData})) { + setverdict(fail, "MSC sent Assignment Request with unexpected codec list for CSD ", + ass_req.pdu.bssmap.assignmentRequest.codecList); + mtc.stop; + } + + tla := valueof(f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port)); + + if (cpars.csd) { + codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecCSData})); + } else { + codec := valueof(ts_BSSMAP_IE_SpeechCodec({cpars.tch_codec_chosen})); + } + + var PDU_BSSAP bssap; + if (cpars.use_osmux) { + if (not ispresent(ass_req.pdu.bssmap.assignmentRequest.osmuxCID)) { + setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE"); + mtc.stop; + } + osmuxCID := valueof(ts_OsmuxCID(0)); + if (cpars.use_osmux and not match(ass_req.pdu.bssmap.assignmentRequest.osmuxCID, osmuxCID)) { + setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE"); + mtc.stop; + } + bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec, osmuxCID)); + } else { + bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec)); + } + BSSAP.send(bssap); +} + function f_mo_call_establish(inout CallParameters cpars) runs on BSC_ConnHdlr { @@ -1642,11 +1702,6 @@ return; } - var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 := - f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?); - var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 := - f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?); - var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port)); var boolean got_mncc_setup_compl_ind := false; var boolean got_cc_connect := false; @@ -1687,52 +1742,7 @@ //[g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit)) -> value bssap { log("f_mo_call_establish 4: rx Assignment Request"); - var BSSMAP_IE_AoIP_TransportLayerAddress tla; - var BSSMAP_IE_SpeechCodec codec; - var BSSMAP_IE_Osmo_OsmuxCID osmuxCID; - - if (not ispresent(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer)) { - setverdict(fail, "MSC sent Assignment Request without AoIP Transport Layer IE"); - mtc.stop; - } - if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass1) - and not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass2)) { - log("Expected one of: 1:", tla_ass1, " 2:", tla_ass2); - log("Got:", bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer); - setverdict(fail, "MSC sent Assignment Request with unexpected AoIP Transport Layer IE"); - mtc.stop; - } - - if (cpars.csd and not match(bssap.pdu.bssmap.assignmentRequest.codecList.codecElements, - {ts_CodecCSData})) { - setverdict(fail, "MSC sent Assignment Request with unexpected codec list for CSD ", - bssap.pdu.bssmap.assignmentRequest.codecList); - mtc.stop; - } - - tla := valueof(f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port)); - - if (cpars.csd) { - codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecCSData})); - } else { - codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR})); - } - - if (cpars.use_osmux) { - if (not ispresent(bssap.pdu.bssmap.assignmentRequest.osmuxCID)) { - setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE"); - mtc.stop; - } - osmuxCID := valueof(ts_OsmuxCID(0)); - if (cpars.use_osmux and not match(bssap.pdu.bssmap.assignmentRequest.osmuxCID, osmuxCID)) { - setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE"); - mtc.stop; - } - bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec, osmuxCID)); - } else { - bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec)); - } - BSSAP.send(bssap); + f_mo_call_establish__handle_assignment_request(cpars, bssap); } [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap { log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment Request"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?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: I98c6171a592dfe1573e15136c4ecf4ff234048d7 Gerrit-Change-Number: 35052 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-msc[master]: do not invoke two Assignments (fixup for re-assignment)
by neels 25 Jun '24

25 Jun '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email ) Change subject: do not invoke two Assignments (fixup for re-assignment) ...................................................................... do not invoke two Assignments (fixup for re-assignment) Make sure we wait for Assignment responses before dispatching an Assignment Request towards RAN. In particular, when the remote call leg sends its codecs, we may trigger Re-Assignment to match that codec. Make sure this is done only once: when receiving another SDP message, wait for the first Assignment. Implement as an osmo_timer, since there still is no osmo_fsm implementation for Assignment nor for CC trans FSM. Also it doesn't belong in the msc_a FSM (it should remain in state COMMUNICATING). Without this patch, new ttcn3 test TC_lu_and_mo_call_reass_for_mt_codec sporadically fails, if MNCC with SDP falls in-between Assignment Request and Assignment Complete. Related: osmo-msc d767c73a1f93253a54d6a8650a4cf2143353bba0 == I8760feaa8598047369ef8c3ab2673013bac8ac8a Related: osmo-ttcn3-hacks I402ed0523a2a87b83f29c5577b2c828102005d53 Change-Id: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 --- M include/osmocom/msc/msc_a.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/ran_infra.c 4 files changed, 75 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index a5b624c..d180e38 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -137,6 +137,8 @@ /* There may be up to 7 incoming calls for this subscriber. This is the currently serviced voice call, * as in, the other person the subscriber is currently talking to. */ struct gsm_trans *active_trans; + + struct osmo_timer_list assignment_request_pending; } cc; struct msc_ho_state ho; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 63b1699..fc4f730 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -772,7 +772,8 @@ const struct gsm_mncc_bearer_cap *bcap) { struct codec_filter *codecs = &trans->cc.codecs; - struct call_leg *cl = trans->msc_a ? trans->msc_a->cc.call_leg : NULL; + struct msc_a *msc_a = trans->msc_a; + struct call_leg *cl = msc_a ? msc_a->cc.call_leg : NULL; struct rtp_stream *rtp_cn = cl ? cl->rtp[RTP_TO_CN] : NULL; if (sdp[0]) { @@ -818,6 +819,16 @@ return; } + if (msc_a && osmo_timer_pending(&msc_a->cc.assignment_request_pending)) { + /* Still waiting for an Assignment Response. + * For example, when the remote call leg sends some MNCC with SDP with a mismatching codec, + * we start Re-Assignment to match that codec: we send an Assignment Request and wait for a response. + * When we receive another MNCC with SDP from the remote call leg before this Re-Assignment is + * completed, we must not trigger *another* Assignment Request, but instead wait for the Re-Assignment + * to come back with a response first. */ + return; + } + /* We've already completed Assignment of a voice channel (some time ago), and now the remote side has changed * to a mismatching codec (list). Try to re-assign this side to a matching codec. */ LOG_TRANS(trans, LOGL_INFO, "Remote call leg mismatches assigned codec: %s\n", diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bff5e67..2e88a32 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -673,6 +673,8 @@ rtp_to_ran->codecs_known ? &rtp_to_ran->codecs : NULL, NULL); } +static void assignment_request_timeout_cb(void *data); + /* The MGW has given us a local IP address for the RAN side. Ready to start the Assignment of a voice channel. */ void msc_a_tx_assignment_cmd(struct msc_a *msc_a) { @@ -680,6 +682,19 @@ struct gsm_trans *cc_trans = msc_a->cc.active_trans; struct gsm0808_channel_type channel_type; + /* Do not dispatch another Assignment Command before an earlier assignment is completed. This is a sanity + * safeguard, ideally callers should not even invoke this function when an Assignment is already ongoing. + * (There is no osmo_fsm for Assignment / the CC trans code; when we refactor that one day, this timer should be + * an FSM state.) */ + if (osmo_timer_pending(&msc_a->cc.assignment_request_pending)) { + LOG_MSC_A(msc_a, LOGL_ERROR, + "Not transmitting Assignment, still waiting for the response to an earlier Assignment\n"); + return; + } + osmo_timer_setup(&msc_a->cc.assignment_request_pending, assignment_request_timeout_cb, msc_a); + osmo_timer_schedule(&msc_a->cc.assignment_request_pending, + osmo_tdef_get(msc_a->c.ran->tdefs, -37, OSMO_TDEF_S, 10), 0); + if (!cc_trans) { LOG_MSC_A(msc_a, LOGL_ERROR, "No CC transaction active\n"); call_leg_release(msc_a->cc.call_leg); @@ -943,6 +958,9 @@ vlr_subscr_enable_expire_lu(vsub); } + /* We no longer care about assignment responses. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* If we're closing in a middle of a trans, we need to clean up */ trans_conn_closed(msc_a); @@ -1051,6 +1069,7 @@ vsub->msc_conn_ref = NULL; osmo_timer_del(&msc_a->lu_delay_timer); + osmo_timer_del(&msc_a->cc.assignment_request_pending); } const struct value_string msc_a_fsm_event_names[] = { @@ -1479,6 +1498,9 @@ const struct gsm0808_speech_codec *codec_if_known = ac->assignment_complete.codec_present ? &ac->assignment_complete.codec : NULL; + /* Pending assignment has worked out. We're no longer waiting for a response now. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* For a voice group call, handling is performed by VGCS FSM */ gcc_trans = trans_find_by_type(msc_a, TRANS_GCC); if (gcc_trans) { @@ -1582,10 +1604,15 @@ } } +/* Invoked when Assignment has failed, either by a failure response, or by timeout. When failing on timeout, + * pass af == NULL. */ static void msc_a_up_call_assignment_failure(struct msc_a *msc_a, const struct ran_msg *af) { struct gsm_trans *trans; + /* Pending assignment has failed. We're no longer waiting for a response now. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* For a normal voice call, there will be an rtp_stream FSM. */ if (msc_a->cc.call_leg && msc_a->cc.call_leg->rtp[RTP_TO_RAN]) { LOG_MSC_A(msc_a, LOGL_ERROR, "Assignment Failure, releasing call\n"); @@ -1617,6 +1644,12 @@ msc_a_release_cn(msc_a); } +static void assignment_request_timeout_cb(void *data) +{ + struct msc_a *msc_a = data; + msc_a_up_call_assignment_failure(msc_a, NULL); +} + static void msc_a_up_classmark_update(struct msc_a *msc_a, const struct osmo_gsm48_classmark *classmark, struct osmo_gsm48_classmark *dst) { diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c index 79de7d2..0656cca 100644 --- a/src/libmsc/ran_infra.c +++ b/src/libmsc/ran_infra.c @@ -47,6 +47,8 @@ { .T = -36, .default_val = 0, .unit = OSMO_TDEF_MS, \ .desc = "Delay connection release after LU. Useful to optimize an SMSC to dispatch " \ "pending messages within the initial connection." }, \ + { .T = -37, .default_val = 10, \ + .desc = "Voice channel Assignment sanity timeout, when no response is received (should never happen)." }, \ struct osmo_tdef msc_tdefs_geran[] = { RAN_TDEFS -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37272?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: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Gerrit-Change-Number: 37272 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-msc[master]: do not invoke two Assignments (fixup for re-assignment)
by neels 25 Jun '24

25 Jun '24

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email ) Change subject: do not invoke two Assignments (fixup for re-assignment) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37272?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: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Gerrit-Change-Number: 37272 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jun 2024 00:49:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-s1gw[master]: fix Copyright year in *.erl files: 2021 -> 2024
by fixeria 24 Jun '24

24 Jun '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37264?usp=email ) Change subject: fix Copyright year in *.erl files: 2021 -> 2024 ...................................................................... fix Copyright year in *.erl files: 2021 -> 2024 Change-Id: I610ced7d15a8a1652813c02978e2d7569c077337 --- M src/osmo_s1gw.erl M src/osmo_s1gw_app.erl M src/osmo_s1gw_sup.erl M src/s1ap_proxy.erl M src/sctp_client.erl M src/sctp_proxy.erl M src/sctp_server.erl 7 files changed, 16 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_s1gw.erl b/src/osmo_s1gw.erl index 422b3c7..71ac34c 100644 --- a/src/osmo_s1gw.erl +++ b/src/osmo_s1gw.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/osmo_s1gw_app.erl b/src/osmo_s1gw_app.erl index e41f5f5..c570804 100644 --- a/src/osmo_s1gw_app.erl +++ b/src/osmo_s1gw_app.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index fe67f59..e13cd1a 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 6c143e8..579df40 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/sctp_client.erl b/src/sctp_client.erl index 06ee31d..24ec75d 100644 --- a/src/sctp_client.erl +++ b/src/sctp_client.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 7f389aa..a40371d 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 2c3893a..d0484e6 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -1,4 +1,4 @@ -%% Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> %% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> %% %% All Rights Reserved -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I610ced7d15a8a1652813c02978e2d7569c077337 Gerrit-Change-Number: 37264 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log