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

[M] Change in osmo-bsc[master]: ASCI: Add TX support for UPLINK FREE/BUSY messages
by jolly 06 Jul '23

06 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33608 ) Change subject: ASCI: Add TX support for UPLINK FREE/BUSY messages ...................................................................... ASCI: Add TX support for UPLINK FREE/BUSY messages Change-Id: Ia27e0ebb5bf7edb1b9f84999cafc028231b9489f Related: OS#4852 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/33608/1 diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index c0f8d4b..3106e77 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -34,6 +34,8 @@ const uint8_t *apdu_data, ssize_t apdu_data_len); int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t mode); int gsm48_send_uplink_release(struct gsm_lchan *lchan, uint8_t cause); +int gsm48_send_uplink_busy(struct gsm_lchan *lchan); +int gsm48_send_uplink_free(struct gsm_lchan *lchan, uint8_t acc_bit, uint8_t *uic); int gsm48_rx_rr_modif_ack(struct msgb *msg); int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 5c2b0f8..6d74e43 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -770,6 +770,51 @@ return gsm48_sendmsg(msg); } +/* TS 44.018 section 9.1.46 */ +int gsm48_send_uplink_busy(struct gsm_lchan *lchan) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 UL BUSY"); + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + + msg->lchan = lchan; + gh->proto_discr = GSM48_PDISC_RR; + gh->msg_type = GSM48_MT_RR_UPLINK_BUSY; + + return gsm48_sendmsg_unit(msg); +} + +/* TS 44.018 section 9.1.47 */ +int gsm48_send_uplink_free(struct gsm_lchan *lchan, uint8_t acc_bit, uint8_t *uic) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 UL FREE"); + struct gsm48_hdr_sh *sh = (struct gsm48_hdr_sh *) msgb_put(msg, sizeof(*sh) + 22); + struct bitvec *bv = bitvec_alloc(22, NULL); + + msg->lchan = lchan; + sh->rr_short_pd = GSM48_PDISC_SH_RR; + sh->msg_type = GSM48_MT_RR_SH_UL_FREE; + sh->l2_header = 0; + + /* < Uplink Access Request bit > */ + bitvec_set_bit(bv, (acc_bit) ? H : L); + + /* { L | H <Uplink Identity Code bit(6) > } */ + if (uic) { + bitvec_set_bit(bv, H); + sh->data[0] = 0x40 | *uic; + } else + bitvec_set_bit(bv, L); + + /* Emergency mode not supported */ + + /* Padding the rest with 0x2B and apply to msg. */ + bitvec_spare_padding(bv, 175); + bitvec_pack(bv, sh->data); + bitvec_free(bv); + + return gsm48_sendmsg_unit(msg); +} + int gsm48_rx_rr_modif_ack(struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia27e0ebb5bf7edb1b9f84999cafc028231b9489f Gerrit-Change-Number: 33608 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc/BSC_ConnHdlr: f_call_hangup: unregister IMSI
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33594 ) Change subject: msc/BSC_ConnHdlr: f_call_hangup: unregister IMSI ...................................................................... msc/BSC_ConnHdlr: f_call_hangup: unregister IMSI Fix the missing call to f_ran_unregister_imsi when running f_mt_call(): f_mt_call() -> f_mt_call_establish() -> f_ran_register_imsi() -> f_call_hangup() -> f_ran_unregister_imsi() This is in preparation for calling f_mt_call() multiple times during one test, to test various CSD bearer services. Without this patch, it will result in a "No space left in ImsiTable" error. Related: OS#4394 Change-Id: Ie9b180b95348d7e84650c14a331c5091a1e67d1f --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/33594/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 8c9f63f..4eedeee 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1839,6 +1839,8 @@ deactivate(mdcx); deactivate(dlcx); + + f_ran_unregister_imsi(g_pars.imsi); } function f_mt_call(inout CallParameters cpars) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33594 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: Ie9b180b95348d7e84650c14a331c5091a1e67d1f Gerrit-Change-Number: 33594 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: TC_lu_and_mt_csd: test multiple bearer services
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595 ) Change subject: TC_lu_and_mt_csd: test multiple bearer services ...................................................................... TC_lu_and_mt_csd: test multiple bearer services Related: OS#4394 Change-Id: Idf6502c826a441b8dd18257c85f9a3323883825e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 52 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/33595/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 4eedeee..9b3b255 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1059,17 +1059,12 @@ /* Allocate a call reference and send SETUP via MNCC to MSC */ function f_mt_call_initiate(inout CallParameters cpars) runs on BSC_ConnHdlr { - var template MNCC_bearer_cap bcap := ts_MNCC_bcap_voice; - - if (cpars.csd) { - bcap := ts_MNCC_bcap_data; - } - cpars.mo_call := false; cpars.mncc_callref := f_rnd_int(2147483648); MNCC.send(ts_MNCC_SETUP_req(cpars.mncc_callref, hex2str(g_pars.msisdn), - hex2str(cpars.called_party), hex2str(g_pars.imsi), bcap)); + hex2str(cpars.called_party), hex2str(g_pars.imsi), + cpars.mncc_bearer_cap)); } private template (value) SDP_Message ts_SDP_CRCX_CN(CallParameters cpars) := @@ -1564,10 +1559,9 @@ if (cpars.emergency) { BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_EMERG_SETUP(cpars.transaction_id))); - } if (cpars.csd) { - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party, ts_Bcap_csd))); } else { - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party, + cpars.bearer_cap))); } if (cpars.stop_after_cc_setup) { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 22b308e..4c14070 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7202,13 +7202,49 @@ vc_conn.done; } -friend function f_tc_lu_and_mt_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars); +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.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; + f_perform_lu(); f_mt_call(cpars); } +friend function f_tc_lu_and_mt_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + f_mt_csd("BS21T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_300); + f_mt_csd("BS22T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mt_csd("BS24T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mt_csd("BS25T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mt_csd("BS26T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); + + f_mt_csd("BS21NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_300); + f_mt_csd("BS22NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_1200); + f_mt_csd("BS24NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_2400); + f_mt_csd("BS25NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_4800); + f_mt_csd("BS26NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_9600); + + f_mt_csd("BS31T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mt_csd("BS32T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mt_csd("BS33T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mt_csd("BS34T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); +} testcase TC_lu_and_mt_csd() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595 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: Idf6502c826a441b8dd18257c85f9a3323883825e Gerrit-Change-Number: 33595 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: csd_bs_list_remove: fix removal logic
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33593 ) Change subject: csd_bs_list_remove: fix removal logic ...................................................................... csd_bs_list_remove: fix removal logic Related: OS#4394 Change-Id: I638d4e063fee6bad45ab14d8ad6b9ad847a7127a --- M src/libmsc/csd_bs.c M tests/csd/csd_test.ok 2 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/33593/1 diff --git a/src/libmsc/csd_bs.c b/src/libmsc/csd_bs.c index 9a7dce1..99f50f4 100644 --- a/src/libmsc/csd_bs.c +++ b/src/libmsc/csd_bs.c @@ -347,14 +347,14 @@ bool found = false; for (i = 0; i < list->count; i++) { - if (list->bs[i] == bs) { + if (list->bs[i] == bs) found = true; - list->count--; - continue; - } - if (i && found) - list->bs[i-1] = list->bs[i]; + if (found && i <= list->count) + list->bs[i] = list->bs[i + 1]; } + + if (found) + list->count--; } void csd_bs_list_intersection(struct csd_bs_list *dest, const struct csd_bs_list *other) diff --git a/tests/csd/csd_test.ok b/tests/csd/csd_test.ok index 8ba59b3..0beac46 100644 --- a/tests/csd/csd_test.ok +++ b/tests/csd/csd_test.ok @@ -4,8 +4,8 @@ removing BS25T (not in the list): BS21T,BS22T,BS24T removing BS22T: - BS21T,BS22T + BS21T,BS24T removing BS24T: - BS21T,BS22T -removing BS21T: BS21T +removing BS21T: + (no-bearer-services) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I638d4e063fee6bad45ab14d8ad6b9ad847a7127a Gerrit-Change-Number: 33593 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-msc[master]: test: add csd_test
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33592 ) Change subject: test: add csd_test ...................................................................... test: add csd_test Show that csd_bs_list_remove() is currently broken, the next patch will fix it. Related: OS#4394 Change-Id: Icc98de75e97c75216a71caf94355d09330c95cba --- M configure.ac M tests/Makefile.am A tests/csd/Makefile.am A tests/csd/csd_test.c A tests/csd/csd_test.err A tests/csd/csd_test.ok M tests/testsuite.at 7 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/33592/1 diff --git a/configure.ac b/configure.ac index 44b0881..61df7de 100644 --- a/configure.ac +++ b/configure.ac @@ -249,6 +249,7 @@ tests/msc_vlr/Makefile tests/sdp_msg/Makefile tests/mncc/Makefile + tests/csd/Makefile doc/Makefile doc/examples/Makefile doc/manuals/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 5b77250..839e53b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,6 +4,7 @@ db_sms \ sdp_msg \ mncc \ + csd \ $(NULL) if BUILD_SMPP diff --git a/tests/csd/Makefile.am b/tests/csd/Makefile.am new file mode 100644 index 0000000..581f7d4 --- /dev/null +++ b/tests/csd/Makefile.am @@ -0,0 +1,37 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -no-install \ + $(NULL) + +LDADD = \ + $(top_builddir)/src/libmsc/libmsc.a \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) + +EXTRA_DIST = \ + csd_test.ok \ + csd_test.err \ + $(NULL) + +check_PROGRAMS = \ + csd_test \ + $(NULL) + +csd_test_SOURCES = \ + csd_test.c \ + $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/csd_test >$(srcdir)/csd_test.ok 2>$(srcdir)/csd_test.err diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c new file mode 100644 index 0000000..ad3b0da --- /dev/null +++ b/tests/csd/csd_test.c @@ -0,0 +1,44 @@ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <osmocom/core/application.h> +#include <osmocom/msc/csd_bs.h> +#include <osmocom/msc/debug.h> + +void test_csd_bs_list_remove(void) +{ + struct csd_bs_list list = { + .count = 3, + .bs = { + CSD_BS_21_T_V110_0k3, + CSD_BS_22_T_V110_1k2, + CSD_BS_24_T_V110_2k4, + }, + }; + + printf("=== %s ===\n", __func__); + printf("initial:\n"); + printf(" %s\n", csd_bs_list_to_str(&list)); + + printf("removing BS25T (not in the list):\n"); + csd_bs_list_remove(&list, CSD_BS_25_T_V110_4k8); + printf(" %s\n", csd_bs_list_to_str(&list)); + + printf("removing BS22T:\n"); + csd_bs_list_remove(&list, CSD_BS_22_T_V110_1k2); + printf(" %s\n", csd_bs_list_to_str(&list)); + + printf("removing BS24T:\n"); + csd_bs_list_remove(&list, CSD_BS_24_T_V110_2k4); + printf(" %s\n", csd_bs_list_to_str(&list)); + + printf("removing BS21T:\n"); + csd_bs_list_remove(&list, CSD_BS_21_T_V110_0k3); + printf(" %s\n", csd_bs_list_to_str(&list)); +} + +int main(void) +{ + test_csd_bs_list_remove(); + return 0; +} diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/csd/csd_test.err diff --git a/tests/csd/csd_test.ok b/tests/csd/csd_test.ok new file mode 100644 index 0000000..8ba59b3 --- /dev/null +++ b/tests/csd/csd_test.ok @@ -0,0 +1,11 @@ +=== test_csd_bs_list_remove === +initial: + BS21T,BS22T,BS24T +removing BS25T (not in the list): + BS21T,BS22T,BS24T +removing BS22T: + BS21T,BS22T +removing BS24T: + BS21T,BS22T +removing BS21T: + BS21T diff --git a/tests/testsuite.at b/tests/testsuite.at index 58855f8..fbf594b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -121,3 +121,10 @@ cat $abs_srcdir/mncc/mncc_test.err > experr AT_CHECK([$abs_top_builddir/tests/mncc/mncc_test], [], [expout], [experr]) AT_CLEANUP + +AT_SETUP([csd_test]) +AT_KEYWORDS([csd_test]) +cat $abs_srcdir/csd/csd_test.ok > expout +cat $abs_srcdir/csd/csd_test.err > experr +AT_CHECK([$abs_top_builddir/tests/csd/csd_test], [], [expout], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icc98de75e97c75216a71caf94355d09330c95cba Gerrit-Change-Number: 33592 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: gsm48_cc_tx_setup: use MNCC bcaps for CSD
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33590 ) Change subject: gsm48_cc_tx_setup: use MNCC bcaps for CSD ...................................................................... gsm48_cc_tx_setup: use MNCC bcaps for CSD Use the MNCC bearer capabilities in CC setup for CSD, if available. Note that in the MNCC_F_BEARER_CAP code path sdp_audio_codecs_set_csd() also gets called by trans_cc_set_remote_from_bc(). Related: OS#4394 Change-Id: I56e49ebc41696912a81b8f4f63fbc36d0b605e9e --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/90/33590/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5664f4c..8773db7 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -826,7 +826,16 @@ "Got no information of remote audio codecs: neither SDP nor Bearer Capability. Trying anyway.\n"); break; case GSM48_BCAP_ITCAP_UNR_DIG_INF: - sdp_audio_codecs_set_csd(&trans->cc.codecs.ms); + if (setup->fields & MNCC_F_BEARER_CAP) { + trans->cc.remote = (struct sdp_msg){}; + trans_cc_set_remote_from_bc(trans, &setup->bearer_cap); + LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s Bearer Cap: remote=%s\n", + get_mncc_name(setup->msg_type), sdp_msg_to_str(&trans->cc.remote)); + } else { + LOG_TRANS(trans, LOGL_INFO, + "Got no information of remote Bearer Capability. Trying anyway.\n"); + sdp_audio_codecs_set_csd(&trans->cc.codecs.ms); + } break; default: LOG_TRANS(trans, LOGL_ERROR, "Handling of information transfer capability %d not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I56e49ebc41696912a81b8f4f63fbc36d0b605e9e Gerrit-Change-Number: 33590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: csd_bs_list_to_gsm0808_channel_type: add T 300
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33591 ) Change subject: csd_bs_list_to_gsm0808_channel_type: add T 300 ...................................................................... csd_bs_list_to_gsm0808_channel_type: add T 300 There is no GSM0808_DATA_RATE_TRANSP_300 (not in libosmocore and not in 3GPP TS 48.008 § 3.2.11 on which the enum is based). As I understand it, we need to use GSM0808_DATA_RATE_TRANSP_600 and half rate TCH. Use GSM0808_DATA_FULL_BM instead of GSM0808_SPEECH_FULL_BM. The value is 0x8 for both, but this is the correct name. Related: OS#4394 Change-Id: I7297cc481fbe36355b5231ca800cf566a1ee93c0 --- M src/libmsc/csd_bs.c 1 file changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/91/33591/1 diff --git a/src/libmsc/csd_bs.c b/src/libmsc/csd_bs.c index 2322f20..9a7dce1 100644 --- a/src/libmsc/csd_bs.c +++ b/src/libmsc/csd_bs.c @@ -180,16 +180,23 @@ return csd_bs_to_str_c(OTC_SELECT, bs); } -static int csd_bs_to_gsm0808_data_rate_transp(enum csd_bs bs) +static int csd_bs_to_gsm0808_data_rate_transp(enum csd_bs bs, uint8_t *ch_rate_type) { switch (bs_map[bs].rate) { + case 300: + *ch_rate_type = GSM0808_DATA_HALF_LM; + return GSM0808_DATA_RATE_TRANSP_600; case 1200: + *ch_rate_type = GSM0808_DATA_FULL_BM; return GSM0808_DATA_RATE_TRANSP_1k2; case 2400: + *ch_rate_type = GSM0808_DATA_FULL_BM; return GSM0808_DATA_RATE_TRANSP_2k4; case 4800: + *ch_rate_type = GSM0808_DATA_FULL_BM; return GSM0808_DATA_RATE_TRANSP_4k8; case 9600: + *ch_rate_type = GSM0808_DATA_FULL_BM; return GSM0808_DATA_RATE_TRANSP_9k6; } return -EINVAL; @@ -375,9 +382,10 @@ if (csd_bs_is_transp(list->bs[0])) { ct->data_transparent = true; - rc = csd_bs_to_gsm0808_data_rate_transp(list->bs[0]); + rc = csd_bs_to_gsm0808_data_rate_transp(list->bs[0], &ct->ch_rate_type); } else { rc = csd_bs_to_gsm0808_data_rate_non_transp(list->bs[0]); + ct->ch_rate_type = GSM0808_DATA_FULL_BM; } if (rc < 0) @@ -404,8 +412,6 @@ ct->data_rate_allowed_is_set = true; } - ct->ch_rate_type = GSM0808_SPEECH_FULL_BM; - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7297cc481fbe36355b5231ca800cf566a1ee93c0 Gerrit-Change-Number: 33591 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: mncc_test: fix talloc_named_const
by osmith 06 Jul '23

06 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33589 ) Change subject: mncc_test: fix talloc_named_const ...................................................................... mncc_test: fix talloc_named_const Change-Id: I0f0a5497eb37b9f9b9102e01cee8c1bda85c5dfe --- M tests/mncc/mncc_test.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/33589/1 diff --git a/tests/mncc/mncc_test.c b/tests/mncc/mncc_test.c index f752cab..9532846 100644 --- a/tests/mncc/mncc_test.c +++ b/tests/mncc/mncc_test.c @@ -67,7 +67,7 @@ int main(void) { - void *ctx = talloc_named_const(NULL, 0, "smpp_test"); + void *ctx = talloc_named_const(NULL, 0, "mncc_test"); osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f0a5497eb37b9f9b9102e01cee8c1bda85c5dfe Gerrit-Change-Number: 33589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-msc[master]: ASCI: Add simple implementation of Group Call Register
by pespin 06 Jul '23

06 Jul '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33510 ) Change subject: ASCI: Add simple implementation of Group Call Register ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia74a4a865f943c5fb388cd28f9406005c92e663e Gerrit-Change-Number: 33510 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 06 Jul 2023 12:08:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Allow usage of rtp_stream with other FSM
by pespin 06 Jul '23

06 Jul '23

Attention is currently required from: jolly, neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33500 ) Change subject: ASCI: Allow usage of rtp_stream with other FSM ...................................................................... Patch Set 7: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/33500/comment/dab2fff1_1c95c6cc PS6, Line 13: Drop the unused parent_call_leg member. > Is it really worth sparing me from having to discern different stuff while I review all your patches […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0991927b6d00da08dfd455980645e68281a73a9e Gerrit-Change-Number: 33500 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 06 Jul 2023 12:08:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0