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

[S] Change in osmo-msc[master]: Cosmetic: fix typo

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34170 ) Change subject: Cosmetic: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib707fa66ae789abfa8795b4e521a16e24c77647d Gerrit-Change-Number: 34170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Aug 2023 14:56:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: rebar3.lock: Update epcap dep to v1.1.1 to fix compilation error

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34180 ) Change subject: rebar3.lock: Update epcap dep to v1.1.1 to fix compilation error ...................................................................... rebar3.lock: Update epcap dep to v1.1.1 to fix compilation error Fixes compilation error at build time: """ /git/erlang/osmo_dia2gsup/_build/default/lib/epcap/c_src/epcap.c:31:10: fatal error: ei.h: No such file or directory """ Related: OS#6141 Change-Id: I033f0e8882cb64c596c6f2802a1f90b3cfeed621 --- M rebar.lock 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/80/34180/1 diff --git a/rebar.lock b/rebar.lock index 5079329..2114e56 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,7 +1,7 @@ {"1.2.0", [{<<"epcap">>, {git,"https://github.com/msantos/epcap", - {ref,"8328f8cae4efdeb94642f3b406225a2fa03a5cca"}}, + {ref,"106e763520510afa7b7d8bdfeb0e402a46ea3496"}}, 1}, {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1}, {<<"lager">>, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I033f0e8882cb64c596c6f2802a1f90b3cfeed621 Gerrit-Change-Number: 34180 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: TC_ho_inter_bsc_csd: new test

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34177 ) Change subject: msc: TC_ho_inter_bsc_csd: new test ...................................................................... msc: TC_ho_inter_bsc_csd: new test Related: OS#4394 Change-Id: I391856282d046e915c374e0efb06d4da870bff1f --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/34177/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 9f74199..396c3f7 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -133,6 +133,7 @@ boolean ran_is_geran, boolean use_osmux, boolean use_ipv6, + boolean use_csd, boolean verify_cell_id, OCT3 common_id_last_eutran_plmn optional }; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e5ae7d3..89c39c1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -414,6 +414,7 @@ ran_is_geran := ran_is_geran, use_osmux := use_osmux, use_ipv6 := false, + use_csd := false, verify_cell_id := verify_cell_id, common_id_last_eutran_plmn := omit }; @@ -5773,6 +5774,9 @@ cpars.mgw_conn_2.mgw_rtp_ip := "::2"; cpars.bss_rtp_ip := "::3"; } + if (pars.use_csd) { + cpars := f_set_cpars_csd(cpars, "BS25T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + } f_init_handler(pars); @@ -5949,13 +5953,14 @@ f_expect_clear(); setverdict(pass); } -function f_tc_ho_inter_bsc_main(boolean use_ipv6 := false, integer a5_n := 0) runs on MTC_CT { +function f_tc_ho_inter_bsc_main(boolean use_ipv6 := false, integer a5_n := 0, boolean use_csd := false) runs on MTC_CT { var BSC_ConnHdlr vc_conn0; var BSC_ConnHdlr vc_conn1; f_init(2); var BSC_ConnHdlrPars pars0 := f_init_pars(53); pars0.use_ipv6 := use_ipv6; + pars0.use_csd := use_csd; pars0.net.expect_ciph := a5_n > 0; pars0.net.expect_auth := pars0.net.expect_ciph; pars0.net.kc_support := bit2oct('00000001'B << a5_n); @@ -5970,6 +5975,7 @@ var BSC_ConnHdlrPars pars1 := f_init_pars(53); pars1.use_ipv6 := use_ipv6; + pars1.use_csd := use_csd; pars1.net.expect_ciph := pars0.net.expect_ciph; pars1.net.expect_auth := pars0.net.expect_ciph; pars1.net.kc_support := bit2oct('00000001'B << a5_n); @@ -6008,6 +6014,9 @@ testcase TC_ho_inter_bsc_ipv6() runs on MTC_CT { f_tc_ho_inter_bsc_main(true); } +testcase TC_ho_inter_bsc_csd() runs on MTC_CT { + f_tc_ho_inter_bsc_main(use_csd := true); +} function f_ML3_patch_seq_nr_MS_NW(in uint2_t seq_nr, inout octetstring enc_l3) { log("MS_NW patching N(SD)=", seq_nr, " into dtap ", enc_l3); @@ -7415,6 +7424,7 @@ execute( TC_ho_inter_bsc_a5_3() ); execute( TC_ho_inter_bsc_a5_4() ); execute( TC_ho_inter_bsc_ipv6() ); + execute( TC_ho_inter_bsc_csd() ); execute( TC_ho_inter_msc_out() ); execute( TC_ho_inter_msc_out_a5_1() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34177 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: I391856282d046e915c374e0efb06d4da870bff1f Gerrit-Change-Number: 34177 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc/BSC Conn…: ass req/compl: check/use CSD codec

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34175 ) Change subject: msc/BSC_Conn…: ass req/compl: check/use CSD codec ...................................................................... msc/BSC_Conn…: ass req/compl: check/use CSD codec Verify that the MSC sends the CSData codec in the Assignment Request and send this codec in the Assignment Complete towards the MSC. Related: OS#4394 Change-Id: I7906e6fdb82c27f071aa55f2f73ba4108bfb46db --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 41 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/34175/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 170694a..9f74199 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1149,8 +1149,21 @@ var BSSMAP_IE_SpeechCodec codec; var BSSMAP_IE_Osmo_OsmuxCID osmuxCID; log("f_mt_call_complete 6"); + + 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 := f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port); - codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR})); + + 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)) { @@ -1637,8 +1650,21 @@ 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)); - codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR})); + + 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"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34175 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: I7906e6fdb82c27f071aa55f2f73ba4108bfb46db Gerrit-Change-Number: 34175 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add helper func f_set_cpars_csd()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34176 ) Change subject: msc: add helper func f_set_cpars_csd() ...................................................................... msc: add helper func f_set_cpars_csd() Prepare to add new CSD related tests that also need to configure the call parameters for CSD. Related: OS#4394 Change-Id: I49c29af736cc37c393cecde4c45c4ffd41322bf7 --- M msc/MSC_Tests.ttcn 1 file changed, 34 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/34176/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index d955f02..e5ae7d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7187,21 +7187,34 @@ f_TC_auth_options(11); } -friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) - runs on BSC_ConnHdlr { +function f_set_cpars_csd(CallParameters cpars, charstring bs_name, BIT1 async, + GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) + runs on BSC_ConnHdlr return CallParameters { log("-----------------------------------------------"); - log("MO CSD: " & bs_name); + log("CSD Bearer Service: " & bs_name); log("-----------------------------------------------"); - g_Tguard.start(20.0); - - var CallParameters cpars := valueof(t_CallParams); cpars.csd := true; + cpars.bearer_cap := valueof(ts_Bcap_csd); cpars.bearer_cap.octet6.synchronous_asynchronous := async; cpars.bearer_cap.octet6.connectionElement := int2bit(enum2int(transp), 2); cpars.bearer_cap.octet6.userRate := int2bit(enum2int(user_rate), 4); + cpars.mncc_bearer_cap := valueof(ts_MNCC_bcap_data); + cpars.mncc_bearer_cap.data.async := bit2int(async); + cpars.mncc_bearer_cap.data.transp := transp; + cpars.mncc_bearer_cap.data.user_rate := user_rate; + + return cpars; +} + +friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) + runs on BSC_ConnHdlr { + var CallParameters cpars := valueof(t_CallParams); + + g_Tguard.start(20.0); + cpars := f_set_cpars_csd(cpars, bs_name, async, transp, user_rate); f_perform_lu(); f_mo_call(cpars, 0.5); } @@ -7236,19 +7249,10 @@ friend function f_mt_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) runs on BSC_ConnHdlr { - log("-----------------------------------------------"); - log("MT CSD: " & bs_name); - log("-----------------------------------------------"); - g_Tguard.start(20.0); - var CallParameters cpars := valueof(t_CallParams); - cpars.csd := true; - cpars.mncc_bearer_cap := valueof(ts_MNCC_bcap_data); - cpars.mncc_bearer_cap.data.async := bit2int(async); - cpars.mncc_bearer_cap.data.transp := transp; - cpars.mncc_bearer_cap.data.user_rate := user_rate; - + g_Tguard.start(20.0); + cpars := f_set_cpars_csd(cpars, bs_name, async, transp, user_rate); f_perform_lu(); f_mt_call(cpars, 0.5); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34176 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: I49c29af736cc37c393cecde4c45c4ffd41322bf7 Gerrit-Change-Number: 34176 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Cosmetic: msc: f_tc_ho_inter_msc_out: fix indent

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34178 ) Change subject: Cosmetic: msc: f_tc_ho_inter_msc_out: fix indent ...................................................................... Cosmetic: msc: f_tc_ho_inter_msc_out: fix indent Change-Id: Ie648a485991aff0c28182955a7df2d1505457978 --- M msc/MSC_Tests.ttcn 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34178/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 89c39c1..1a3af65 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -6030,9 +6030,9 @@ cpars := valueof(t_CallParams('12345'H, 0)); if (pars.use_ipv6) { - cpars.mgw_conn_1.mgw_rtp_ip := "::1"; - cpars.mgw_conn_2.mgw_rtp_ip := "::2"; - cpars.bss_rtp_ip := "::3"; + cpars.mgw_conn_1.mgw_rtp_ip := "::1"; + cpars.mgw_conn_2.mgw_rtp_ip := "::2"; + cpars.bss_rtp_ip := "::3"; } var hexstring ho_number := f_gen_msisdn(99999); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34178 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: Ie648a485991aff0c28182955a7df2d1505457978 Gerrit-Change-Number: 34178 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: TC_ho_inter_msc_out_csd: new test

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34179 ) Change subject: msc: TC_ho_inter_msc_out_csd: new test ...................................................................... msc: TC_ho_inter_msc_out_csd: new test Related: OS#4394 Change-Id: Id45a634888776265a88d607080b951a2cc33820d --- M msc/MSC_Tests.ttcn 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/34179/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1a3af65..ef56fe6 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -6034,6 +6034,9 @@ cpars.mgw_conn_2.mgw_rtp_ip := "::2"; cpars.bss_rtp_ip := "::3"; } + if (pars.use_csd) { + cpars := f_set_cpars_csd(cpars, "BS25T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + } var hexstring ho_number := f_gen_msisdn(99999); f_init_handler(pars); @@ -6346,6 +6349,16 @@ vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars); vc_conn.done; } +testcase TC_ho_inter_msc_out_csd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(1); + + var BSC_ConnHdlrPars pars := f_init_pars(54); + pars.use_csd := true; + + vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars); + vc_conn.done; +} private function f_tc_lu_imsi_auth_tmsi_check_imei(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { pars.net.expect_auth := true; @@ -7431,6 +7444,7 @@ execute( TC_ho_inter_msc_out_a5_3() ); execute( TC_ho_inter_msc_out_a5_4() ); execute( TC_ho_inter_msc_out_ipv6() ); + execute( TC_ho_inter_msc_out_csd() ); execute( TC_lu_imsi_auth_tmsi_check_imei() ); execute( TC_lu_imsi_auth3g_tmsi_check_imei() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34179 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: Id45a634888776265a88d607080b951a2cc33820d Gerrit-Change-Number: 34179 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_a_up_call_assignment_complete: check CSD codec

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34173 ) Change subject: msc_a_up_call_assignment_complete: check CSD codec ...................................................................... msc_a_up_call_assignment_complete: check CSD codec Reject any other codec than GSM0808_SCT_CSD in Assignment Complete from RAN, if OsmoMSC is preparing a CSD call. Related: OS#4394 Change-Id: I94de84df41bcd050d0e7b4e4fea1c6a6551ef7d3 --- M src/libmsc/msc_a.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/34173/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 0d8a747..087f610 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1483,6 +1483,15 @@ return; } + /* Check for unexpected codec with CSD */ + if (cc_trans->bearer_cap.transfer == GSM48_BCAP_ITCAP_UNR_DIG_INF && + codec_if_known->type != GSM0808_SCT_CSD) { + LOG_TRANS(cc_trans, LOGL_ERROR, "Unexpected codec in Assignment Complete for CSD: %s\n", + gsm0808_speech_codec_type_name(codec_if_known->type)); + call_leg_release(msc_a->cc.call_leg); + return; + } + /* Update RAN-side endpoint CI from Assignment result -- unless it is forced by the ran_infra, in which * case it remains unchanged as passed to the earlier call of call_leg_ensure_ci(). */ if (msc_a->c.ran->force_mgw_codecs_to_ran.count == 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I94de84df41bcd050d0e7b4e4fea1c6a6551ef7d3 Gerrit-Change-Number: 34173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-msc[master]: gsm48 cc tx call proc …: verify bcap.transfer

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34174 ) Change subject: gsm48_cc_tx_call_proc_…: verify bcap.transfer ...................................................................... gsm48_cc_tx_call_proc_…: verify bcap.transfer Fail if MNCC tries to switch the Information Transfer Capability from CSD to speech, so it is obvious that something is wrong here. I ran into this while writing a test. Related: OS#4394 Change-Id: Ibb76d08cad1ac3bc3320391c89766150a2e605c3 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/74/34174/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 4162944..5908db9 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1047,6 +1047,14 @@ /* bearer capability */ if (proceeding->fields & MNCC_F_BEARER_CAP) { + /* MNCC should not switch from e.g. CSD to speech */ + if (proceeding->bearer_cap.transfer != trans->bearer_cap.transfer) { + LOG_TRANS(trans, LOGL_ERROR, "Unexpected Information Transfer Capability %d from MNCC," + " transaction has %d\n", + proceeding->bearer_cap.transfer, + trans->bearer_cap.transfer); + return -EINVAL; + } gsm48_encode_bearer_cap(msg, 0, &proceeding->bearer_cap); memcpy(&trans->bearer_cap, &proceeding->bearer_cap, sizeof(trans->bearer_cap)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibb76d08cad1ac3bc3320391c89766150a2e605c3 Gerrit-Change-Number: 34174 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_ho_send_handover_request: support CSD

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34172 ) Change subject: msc_ho_send_handover_request: support CSD ...................................................................... msc_ho_send_handover_request: support CSD Related: OS#4394 Change-Id: I5fea299bdc19d2979b5c222d8dd265dac2068307 --- M src/libmsc/msc_ho.c 1 file changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/72/34172/1 diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 9e4417f..9748ed9 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -413,12 +413,29 @@ : "-"); if (cc_trans) { - if (sdp_audio_codecs_to_gsm0808_channel_type(&channel_type, - &cc_trans->cc.local.audio_codecs)) { - msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE, - "Failed to determine Channel Type for Handover Request message\n"); + switch (cc_trans->bearer_cap.transfer) { + case GSM48_BCAP_ITCAP_SPEECH: + if (sdp_audio_codecs_to_gsm0808_channel_type(&channel_type, + &cc_trans->cc.local.audio_codecs)) { + msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Failed to determine Channel Type for Handover Request message (speech)\n"); + return; + } + break; + case GSM48_BCAP_ITCAP_UNR_DIG_INF: + if (csd_bs_list_to_gsm0808_channel_type(&channel_type, &cc_trans->cc.local.bearer_services)) { + msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Failed to determine Channel Type for Handover Request message (CSD)\n"); + return; + } + break; + default: + msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE, "Failed to create" + " Handover Request message for information transfer capability %d\n", + cc_trans->bearer_cap.transfer); return; } + ran_enc_msg.handover_request.geran.channel_type = &channel_type; ran_enc_msg.handover_request.call_id_present = true; ran_enc_msg.handover_request.call_id = cc_trans->call_id; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5fea299bdc19d2979b5c222d8dd265dac2068307 Gerrit-Change-Number: 34172 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023