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

[S] Change in osmo-mgw[master]: mgcp_client: pool: Only pick clients with an MGCP link considered to ...
by laforge 20 Jun '23

20 Jun '23

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33313 ) Change subject: mgcp_client: pool: Only pick clients with an MGCP link considered to be UP ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia3f451d3cd97851f65074408812b1ddc68f67056 Gerrit-Change-Number: 33313 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 16:44:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: mgw: Allow auditing speciall 'null' endpoint
by laforge 20 Jun '23

20 Jun '23

Attention is currently required from: pespin, fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33312 ) Change subject: mgw: Allow auditing speciall 'null' endpoint ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia409b16e9211e6261e2e0f21288544289d6f3733 Gerrit-Change-Number: 33312 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <axilirator(a)gmail.com> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <axilirator(a)gmail.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 16:44:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream: Print socket info as part of the logging context
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33337 ) Change subject: stream: Print socket info as part of the logging context ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I17ef699dab72c1b613708070d22e9f040b0fe069 Gerrit-Change-Number: 33337 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 16:02:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: src/grd: Add option for cherry-picking
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: arehbein. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/33381 ) Change subject: src/grd: Add option for cherry-picking ...................................................................... Patch Set 1: Code-Review+1 (4 comments) Patchset: PS1: nice! some nitpicks, LGTM otherwise File src/grd: https://gerrit.osmocom.org/c/osmo-dev/+/33381/comment/eb646661_18b00e04 PS1, Line 73: cmd = ["git", "cherry-pick", "FETCH_HEAD"]; for consistency: let's also print the command, like in git_checkout_fetch_head() https://gerrit.osmocom.org/c/osmo-dev/+/33381/comment/857ed8ce_2e66f027 PS1, Line 95: , disabled by default I'd remove the ", disabled by default" part, it is redundant as this is an optional parameter and the default action is already described as "instead of fetching into a branch". https://gerrit.osmocom.org/c/osmo-dev/+/33381/comment/3a68c152_0659dd3d PS1, Line 112: git_cherry_pick_fetch_head() I'd switch the logic, so the non-inverted case comes first: ``` if args.cherry_pick: ... else: ... ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I85b1a2c4915e3da374e4b1201f2e977708fc7c4c Gerrit-Change-Number: 33381 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 14:37:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: src/grd: Add option for cherry-picking
by arehbein 20 Jun '23

20 Jun '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33381 ) Change subject: src/grd: Add option for cherry-picking ...................................................................... src/grd: Add option for cherry-picking Option '-c|--cherry-pick' will now cherry-pick into the current branch if passed. Change-Id: I85b1a2c4915e3da374e4b1201f2e977708fc7c4c --- M src/grd 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/81/33381/1 diff --git a/src/grd b/src/grd index b1623ec..4a7e52b 100755 --- a/src/grd +++ b/src/grd @@ -69,6 +69,12 @@ except subprocess.CalledProcessError: exit(1) +def git_cherry_pick_fetch_head(): + cmd = ["git", "cherry-pick", "FETCH_HEAD"]; + try: + return subprocess.run(cmd, check=True) + except subprocess.CalledProcessError: + exit(1) def git_checkout_fetch_head(patch_id, rev): cmd = ["git", "checkout", "-B", f"gerrit/{patch_id}_{rev}", "FETCH_HEAD"] @@ -84,6 +90,9 @@ parser = argparse.ArgumentParser(description=desc) parser.add_argument("patch_id", type=int, help="gerrit review ID") +parser.add_argument("-c", "--cherry-pick", action="store_true", + help="cherry-pick into current branch instead of " + "fetching into a branch, disabled by default") parser.add_argument("-r", "--revision", type=int, help="patchset revision, default is latest") parser.add_argument("-v", "--verbose", action="store_true") @@ -97,4 +106,7 @@ rev = get_highest_revision(details) git_fetch(host, project, args.patch_id, rev) -git_checkout_fetch_head(args.patch_id, rev) +if not args.cherry_pick: + git_checkout_fetch_head(args.patch_id, rev) +else: + git_cherry_pick_fetch_head() -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I85b1a2c4915e3da374e4b1201f2e977708fc7c4c Gerrit-Change-Number: 33381 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-sccp[master]: Add osmo_ss7_asp getters for name and proto
by pespin 20 Jun '23

20 Jun '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33377 ) Change subject: Add osmo_ss7_asp getters for name and proto ...................................................................... Add osmo_ss7_asp getters for name and proto Some apps such as osmo-bsc are accessing some of those fields, so better add a getter API to make it easier to update the struct contents. Change-Id: If9acfca1abc9ab7eb6d2388f548d7ee577b9c5ac --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index ede41b5..5406d05 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,4 +8,5 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmocore >1.8.0 uses new osmo_prim_operation_name() +libosmo-sccp add API osmo_ss7_asp_get_name(), osmo_ss7_asp_get_proto() osmo_sccp_simple_client_on_ss7_id() behavior change: ASPs asp-clnt-* defined through VTY must explicitly configure "role" and "sctp-role" \ No newline at end of file diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index f413983..3c72394 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -471,6 +471,8 @@ int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level); bool osmo_ss7_asp_active(const struct osmo_ss7_asp *asp); int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp); +const char *osmo_ss7_asp_get_name(const struct osmo_ss7_asp *asp); +enum osmo_ss7_asp_protocol osmo_ss7_asp_get_proto(const struct osmo_ss7_asp *asp); /*! Weak function to handle payload for unknown/unsupported PPID or IPA StreamID. * This function can be overridden by application code to implement whatever handling diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 3dc0d51..aba14b3 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2432,6 +2432,24 @@ } } +/*! \brief Get the name of a given ASP + * \param[in] asp The ASP for which the name is requested + * \returns The name of the ASP, or NULL if not set + */ +const char *osmo_ss7_asp_get_name(const struct osmo_ss7_asp *asp) +{ + return asp->cfg.name; +} + +/*! \brief Get the proto of a given ASP + * \param[in] asp The ASP for which the proto is requested + * \returns The proto of the ASP + */ +enum osmo_ss7_asp_protocol osmo_ss7_asp_get_proto(const struct osmo_ss7_asp *asp) +{ + return asp->cfg.proto; +} + /*! Register a call-back function for unknown SCTP PPID / IPA Stream ID */ void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If9acfca1abc9ab7eb6d2388f548d7ee577b9c5ac Gerrit-Change-Number: 33377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: Use new libosmo-sccp APIs osmo_ss7_asp_get_{name,proto}()
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33378 ) Change subject: Use new libosmo-sccp APIs osmo_ss7_asp_get_{name,proto}() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0479f7bfb8337a6a955ba66c7b403db3565659d6 Gerrit-Change-Number: 33378 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 13:28:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: Add osmo_ss7_asp getters for name and proto
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33377 ) Change subject: Add osmo_ss7_asp getters for name and proto ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If9acfca1abc9ab7eb6d2388f548d7ee577b9c5ac Gerrit-Change-Number: 33377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 13:26:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: new test: TC_lu_and_mt_csd
by osmith 20 Jun '23

20 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33355 ) Change subject: msc: new test: TC_lu_and_mt_csd ...................................................................... msc: new test: TC_lu_and_mt_csd Related: OS#4394 Change-Id: Ie1701546e3dc18a5b0da4608b44a580237c979a6 --- M library/MNCC_Types.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 3 files changed, 58 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index 1de34a0..74b9ca9 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -192,6 +192,27 @@ data := omit }; +template MNCC_bearer_cap ts_MNCC_bcap_data := { + transfer := 1, /* unrestricted digital information */ + mode := 0, /* circuit */ + coding := 0, /* GSM standard */ + radio := 3, /* FR/HR, FR preferred */ + speech_ctm := 0, /* not supported */ + speech_ver := { -1 }, + data := { + rate_adaptation := GSM48_BCAP_RA_V110_X30, + sig_access := GSM48_BCAP_SA_NONE, + async := 1, + nr_stop_bits := 1, + nr_data_bits := 1, + user_rate := GSM48_BCAP_UR_4800, + parity := GSM48_BCAP_PAR_ODD, + interm_rate := GSM48_BCAP_IR_8k, + transp := GSM48_BCAP_TR_TRANSP, + modem_type := GSM48_BCAP_MT_V21 + } +}; + type record MNCC_number { GSM48_type_of_number number_type, GSM48_num_plan_ind plan, @@ -514,12 +535,13 @@ /* MT: MSC <- MNCC: SETUP.req from ext. MNCC handler to MSC */ -template MNCC_PDU ts_MNCC_SETUP_req(uint32_t call_id, charstring called, charstring calling, charstring imsi := "") := { +template MNCC_PDU ts_MNCC_SETUP_req(uint32_t call_id, charstring called, charstring calling, charstring imsi := "", + template MNCC_bearer_cap bcap := ts_MNCC_bcap_voice) := { msg_type := MNCC_SETUP_REQ, u := { signal := { /* See 24.008 9.3.23.1 */ callref := call_id, - bearer_cap := ts_MNCC_bcap_voice, /* mandatory */ + bearer_cap := valueof(bcap), /* mandatory */ called := valueof(ts_MNCC_number(called)), /* optional */ calling := valueof(ts_MNCC_number(calling)), /* optional */ redirecting := omit, /* optional */ diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 3d7dc07..039a97d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1057,10 +1057,17 @@ /* 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))); + hex2str(cpars.called_party), hex2str(g_pars.imsi), bcap)); } private template (value) SDP_Message ts_SDP_CRCX_CN(CallParameters cpars) := diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 9650b3e..22b308e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7202,6 +7202,21 @@ vc_conn.done; } +friend function f_tc_lu_and_mt_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + cpars.csd := true; + f_perform_lu(); + f_mt_call(cpars); +} +testcase TC_lu_and_mt_csd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mt_csd), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -7381,6 +7396,7 @@ execute( TC_auth_options_11() ); execute( TC_lu_and_mo_csd() ); + execute( TC_lu_and_mt_csd() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33355 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: Ie1701546e3dc18a5b0da4608b44a580237c979a6 Gerrit-Change-Number: 33355 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: new test: TC_lu_and_mo_csd
by osmith 20 Jun '23

20 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33354 ) Change subject: msc: new test: TC_lu_and_mo_csd ...................................................................... msc: new test: TC_lu_and_mo_csd Related: OS#4394 Depends: https://gitlab.eclipse.org/eclipse/titan/titan.ProtocolModules.MobileL3_v13… Change-Id: Ia863a63a318a9b0a8b4bfc1dc425cbc0235256b3 --- M deps/Makefile M library/L3_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 4 files changed, 120 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index d4f209a..c7be960 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -104,7 +104,7 @@ titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= badbad680df216b3211260d56b14734eeb2c9028 +titan.ProtocolModules.MobileL3_v13.4.0_commit= 76a3557f69834b6171652aaeaeef220444c35ba7 titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index de7063f..edec440 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1305,6 +1305,7 @@ template (value) Speech_AuxiliarySpeech ts_SpeechAuxFR(SpeechVer ver) := ts_SpeechAux(ver, '0'B); template (value) Speech_AuxiliarySpeech ts_SpeechAuxHR(SpeechVer ver) := ts_SpeechAux(ver, '1'B); +/* TS 3GPP 24.008 § 10.5.4.5 */ template (value) BearerCapability_TLV ts_Bcap_voice := { elementIdentifier := '04'O, lengthIndicator := 0, /* overwritten */ @@ -1328,6 +1329,86 @@ octet7 := omit } +/* TS 3GPP 24.008 § 10.5.4.5 */ +template (value) BearerCapability_TLV ts_Bcap_csd := { + elementIdentifier := '04'O, + lengthIndicator := 0, /* overwritten */ + octet3 := { + informationTransferCapability := '001'B, + transferMode := '0'B, + codingStandard := '0'B, + radioChannelRequirement := '11'B, + extension_octet_3 := '0'B, + speech_aux_3a_3b := omit + }, + octet4 := { + establishment := '0'B, + nirr := '1'B, + configuration := '0'B, + duplexMode := '1'B, + structure := '00'B, + compression := '0'B, + extension_octet_4 := '1'B + }, + octet5 := { + signallingAccessProtocol := '001'B, + rateAdaptation := '01'B, /* V.110 */ + accessId := '00'B, + extension_octet_5 := '0'B, + spare2_3 := omit, + otherRateAdaptation := omit, + otherInformationTransferCapability := omit, + extension_octet_5a := omit, + spare3_1 := omit, + inbandNegotiation := omit, + assignor_assignee := omit, + lli := omit, + mode := omit, + multiframe := omit, + hdrNohdr := omit, + extension_octet_5b := omit + }, + octet6 := { + synchronous_asynchronous := '1'B, /* 0: sync, 1: async */ + userInformationLayer1Protocol := '0000'B, + layer1Id := '01'B, + extension_octet_6 := '0'B, + /* octet 6a */ + userRate := '0100'B, /* 4.8 kbit/s */ + numberDataBits := '0'B, + negotiation := '0'B, + numberStopBits := '0'B, + extension_octet_6a := '1'B, + /* octet 6b */ + parity := '000'B, + nicOnRX := '0'B, + nicOnTX := '0'B, + intermediateRate := '10'B, + extension_octet_6b := '1'B, + /* octet 6c */ + modemType := '00000'B, + connectionElement := '00'B, /* 00: T / 01: NT */ + extension_octet_6c := '0'B, + /* octet 6d */ + fixedNetworkUserRate := omit, + otherModemType := omit, + extension_octet_6d := omit, + /* octet 6e */ + maxNumberOfTrafficChannels := omit, + acceptableChannelCodings := omit, + extension_octet_6e := omit, + wantedAirInterfaceUserRate := omit, + uimi := omit, + /* octet 6f */ + extension_octet_6f := omit, + spare := omit, + asymetryIndication := omit, + acceptableChannelCodingsExt := omit, + extension_octet_6g := omit + }, + octet7 := omit +} + template PDU_ML3_MS_NW ts_ML3_MO_CC_SETUP(integer tid, hexstring called, template BearerCapability_TLV bcap := ts_Bcap_voice) := { discriminator := '0011'B, tiOrSkip := { diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 4351e06..3d7dc07 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -375,7 +375,8 @@ EST_TYPE_EMERG_CALL, EST_TYPE_PAG_RESP, EST_TYPE_MO_SMS, - EST_TYPE_SS_ACT + EST_TYPE_SS_ACT, + EST_TYPE_MO_CSD }; /* helper function to fully establish a dedicated channel */ @@ -395,6 +396,9 @@ case (EST_TYPE_MO_CALL) { l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); } + case (EST_TYPE_MO_CSD) { + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + } case (EST_TYPE_EMERG_CALL) { l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_EMERG_CALL, mi)); } @@ -951,6 +955,7 @@ important to set the TI flag properly */ 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? */ /* MNCC related parameters */ uint32_t mncc_callref optional, /* call reference on the MNCC side */ @@ -1538,6 +1543,8 @@ if (cpars.emergency) { f_establish_fully(EST_TYPE_EMERG_CALL); + } else if (cpars.csd) { + f_establish_fully(EST_TYPE_MO_CSD); } else { f_establish_fully(EST_TYPE_MO_CALL); } @@ -1548,6 +1555,8 @@ 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))); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 666c6c1..9650b3e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7187,6 +7187,21 @@ f_TC_auth_options(11); } +friend function f_tc_lu_and_mo_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + cpars.csd := true; + f_perform_lu(); + f_mo_call(cpars); +} +testcase TC_lu_and_mo_csd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_mo_csd), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -7364,6 +7379,8 @@ execute( TC_auth_options_9() ); execute( TC_auth_options_10() ); execute( TC_auth_options_11() ); + + execute( TC_lu_and_mo_csd() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33354 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: Ia863a63a318a9b0a8b4bfc1dc425cbc0235256b3 Gerrit-Change-Number: 33354 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0