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

[S] Change in osmo-ttcn3-hacks[master]: msc: f_call_hangup: add missing rx MNCC_REL_cnf
by osmith 18 Jul '23

18 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 ) Change subject: msc: f_call_hangup: add missing rx MNCC_REL_cnf ...................................................................... msc: f_call_hangup: add missing rx MNCC_REL_cnf Add the missing rx of MNCC_REL_cnf to f_call_hangup for the MO case (called with release_by_ms = false, see f_mo_call()). This is in preparation for running f_mo_call several times in a row to test multiple bearer services in a CSD test (follow up patch). Without this patch, calling f_mo_call_establish() for the second time fails to rx the MNCC_RTP_CREATE because the REL cnf is still in the port. This leads to a timeout of X2 and OsmoMSC sending a CC RELEASE. Adjust the log numbers next to f_call_hangup to re-use numbers 2 and 3 from above, as only one of the two code paths gets executed (similar to numbers 5 and 6 below). Related: OS#4394 Change-Id: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 1359dc7..996f54a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1801,8 +1801,10 @@ /* A-side (PLMN) Release of call */ MNCC.send(ts_MNCC_REL_req(cpars.mncc_callref, valueof(ts_MNCC_cause(42)))); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))); - log("f_call_hangup 4: rx DTAP CC RELEASE"); + log("f_call_hangup 2.a: rx DTAP CC RELEASE"); BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id))); + log("f_call_hangup 3.a: rx MNCC REL cnf"); + MNCC.receive(tr_MNCC_REL_cnf(cpars.mncc_callref, cause := *)); } respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and valueof(cpars.mgw_drop_dlcx)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 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: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 Gerrit-Change-Number: 33664 Gerrit-PatchSet: 3 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-MessageType: merged

1 0

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

18 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 ) Change subject: msc: TC_lu_and_mo_csd: test multiple bearer services ...................................................................... msc: TC_lu_and_mo_csd: test multiple bearer services Related: OS#4394 Change-Id: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 46 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 996f54a..9a21b5d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1559,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 1340252..81819ff 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7187,13 +7187,45 @@ 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); +friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) + runs on BSC_ConnHdlr { + log("-----------------------------------------------"); + log("MO 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); + f_perform_lu(); f_mo_call(cpars); } + +friend function f_tc_lu_and_mo_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + f_mo_csd("BS21T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_300); + f_mo_csd("BS22T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mo_csd("BS24T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mo_csd("BS25T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mo_csd("BS26T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); + + f_mo_csd("BS21NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_300); + f_mo_csd("BS22NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_1200); + f_mo_csd("BS24NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_2400); + f_mo_csd("BS25NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_4800); + f_mo_csd("BS26NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_9600); + + f_mo_csd("BS31T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mo_csd("BS32T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mo_csd("BS33T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mo_csd("BS34T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); +} testcase TC_lu_and_mo_csd() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 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: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f Gerrit-Change-Number: 33665 Gerrit-PatchSet: 3 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-MessageType: merged

1 0

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

18 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595 ) Change subject: msc: TC_lu_and_mt_csd: test multiple bearer services ...................................................................... msc: TC_lu_and_mt_csd: test multiple bearer services Related: OS#4394 Depends: osmo-msc I7297cc481fbe36355b5231ca800cf566a1ee93c0 Change-Id: Idf6502c826a441b8dd18257c85f9a3323883825e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 46 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 76702d4..1359dc7 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) := diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 22b308e..1340252 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7202,13 +7202,44 @@ 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.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: 5 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

[S] Change in osmo-ttcn3-hacks[master]: msc: TC_lu_and_mt/mo_csd: reduce call open time
by osmith 18 Jul '23

18 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 ) Change subject: msc: TC_lu_and_mt/mo_csd: reduce call open time ...................................................................... msc: TC_lu_and_mt/mo_csd: reduce call open time Related: OS#4394 Change-Id: Ie733028f7953d5d9fa1907efdb19485dee93ece9 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 9a21b5d..64e2aff 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1837,12 +1837,12 @@ deactivate(dlcx); } -function f_mt_call(inout CallParameters cpars) +function f_mt_call(inout CallParameters cpars, float open_time := 5.0) runs on BSC_ConnHdlr { f_mt_call_establish(cpars); - f_call_keep_open(cpars); + f_call_keep_open(cpars, open_time); log("Hangup"); f_call_hangup(cpars, true); @@ -1853,12 +1853,12 @@ setverdict(pass); } -function f_mo_call(inout CallParameters cpars) +function f_mo_call(inout CallParameters cpars, float open_time := 5.0) runs on BSC_ConnHdlr { f_mo_call_establish(cpars); - f_call_keep_open(cpars); + f_call_keep_open(cpars, open_time); log("Hangup"); f_call_hangup(cpars, false); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 81819ff..75b7688 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7203,7 +7203,7 @@ cpars.bearer_cap.octet6.userRate := int2bit(enum2int(user_rate), 4); f_perform_lu(); - f_mo_call(cpars); + f_mo_call(cpars, 0.5); } friend function f_tc_lu_and_mo_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -7250,7 +7250,7 @@ cpars.mncc_bearer_cap.data.user_rate := user_rate; f_perform_lu(); - f_mt_call(cpars); + f_mt_call(cpars, 0.5); } friend function f_tc_lu_and_mt_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 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: Ie733028f7953d5d9fa1907efdb19485dee93ece9 Gerrit-Change-Number: 33631 Gerrit-PatchSet: 4 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-MessageType: merged

1 0

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

18 Jul '23

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595 ) Change subject: msc: TC_lu_and_mt_csd: test multiple bearer services ...................................................................... Patch Set 4: Code-Review+2 -- 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: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:32:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-gprs[master]: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive
by pespin 18 Jul '23

18 Jul '23

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 to look at the new patch set (#2). Change subject: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive ...................................................................... rlcmac: Introduce L1CTL-CCCH_READY.ind primitive This is used by lower layer L1CTL to notify the upper layer RLCMAC when it's prepared to use CCCH. Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/gre.c M src/rlcmac/rlcmac_prim.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 5 files changed, 61 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/70/33770/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 Gerrit-Change-Number: 33770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-gprs[master]: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available
by pespin 18 Jul '23

18 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 ) Change subject: gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available ...................................................................... gmm: Make OSMO_GPRS_GMM_TLLI_UNASSIGNED def publicly available This can be used for users receiving the GMMRR_ASSIGN_REQ primitive to find out if it's a creation, update or deletion of a TLLI. Change-Id: I881b1370b283ceee98c035ed42b91f7e12611979 --- M include/osmocom/gprs/gmm/gmm.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/rlcmac/gre.c 4 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/72/33772/1 diff --git a/include/osmocom/gprs/gmm/gmm.h b/include/osmocom/gprs/gmm/gmm.h index 49954e8..1fcd95b 100644 --- a/include/osmocom/gprs/gmm/gmm.h +++ b/include/osmocom/gprs/gmm/gmm.h @@ -5,6 +5,9 @@ #include <stdint.h> #include <stddef.h> +/* 3GPP TS 44.064 § 8.3 TLLI assignment procedures */ +#define OSMO_GPRS_GMM_TLLI_UNASSIGNED (0xffffffff) + /* Use stack as MS or as network? */ enum osmo_gprs_gmm_location { OSMO_GPRS_GMM_LOCATION_UNSET, diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index 5a29600..66ea8d7 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -19,9 +19,6 @@ #include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/gprs/gmm/gmm_ms_fsm.h> -/* 3GPP TS 44.064 § 8.3 TLLI assignment procedures */ -#define GPRS_GMM_TLLI_UNASSIGNED (0xffffffff) - #define GPRS_GMM_SESS_ID_UNASSIGNED (0xffffffff) extern int g_gmm_log_cat[_OSMO_GPRS_GMM_LOGC_MAX]; diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 9f7a9fd..8a293a3 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -165,7 +165,7 @@ gmme->ptmsi_sig = GSM_RESERVED_TMSI; gmme->ptmsi = ptmsi; gmme->old_ptmsi = GSM_RESERVED_TMSI; - gmme->old_tlli = GPRS_GMM_TLLI_UNASSIGNED; + gmme->old_tlli = OSMO_GPRS_GMM_TLLI_UNASSIGNED; gmme->auth_ciph.req.ac_ref_nr = 0xff; /* invalid value */ OSMO_STRLCPY_ARRAY(gmme->imsi, imsi); @@ -299,7 +299,7 @@ rc = -ERANGE; failed: LOGGMM(LOGL_ERROR, "Failed to allocate a TLLI: %d (%s)\n", rc, strerror(-rc)); - return GPRS_GMM_TLLI_UNASSIGNED; + return OSMO_GPRS_GMM_TLLI_UNASSIGNED; } /* TS 24.008 4.7.2.1.1 READY timer behaviour (A/Gb mode only) */ @@ -1000,7 +1000,7 @@ /* Submit LLGMM-ASSIGN-REQ as per TS 24.007 Annex C.3 */ gmme->old_tlli = gmme->tlli; - gmme->tlli = GPRS_GMM_TLLI_UNASSIGNED; + gmme->tlli = OSMO_GPRS_GMM_TLLI_UNASSIGNED; rc = gprs_gmm_submit_llgmm_assing_req(gmme); if (rc < 0) goto rejected; diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index b941435..f23defd 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -39,7 +39,6 @@ /* We have to defer going to CCCH a bit to leave space for last PKT CTRL ACK to be transmitted */ static void _defer_pkt_idle_timer_cb(void *data) { - //struct gprs_rlcmac_entity *gre = data; gprs_rlcmac_submit_l1ctl_pdch_rel_req(); /* Wait for L1CTL-CCCH_READY.ind before attempting new pkt-access-procedure if needed. */ } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I881b1370b283ceee98c035ed42b91f7e12611979 Gerrit-Change-Number: 33772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Add option to switch on or off ASCI support
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33674 ) Change subject: ASCI: Add option to switch on or off ASCI support ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id68deb69f7395f0f8f50b3820e9d51052a34f753 Gerrit-Change-Number: 33674 Gerrit-PatchSet: 6 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-Comment-Date: Tue, 18 Jul 2023 09:29:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

18 Jul '23

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595 ) Change subject: msc: TC_lu_and_mt_csd: test multiple bearer services ...................................................................... Patch Set 4: (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33595/comment/f7769816_88bf… PS4, Line 7226: f_mt_csd("BS21T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_300); > Set to WIP, because BS21T will fail until https://gerrit.osmocom. […] Done -- 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: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:28:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: cosmetic: gmm: Fix typo in comment
by pespin 18 Jul '23

18 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33765 ) Change subject: cosmetic: gmm: Fix typo in comment ...................................................................... cosmetic: gmm: Fix typo in comment Change-Id: I9c32def9571294abe2e67235a50809839ed5966a --- M src/gmm/gmm.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 4836d58..9f7a9fd 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -414,7 +414,7 @@ osmo_timer_del(&gmme->t3316); } -/* T3312 (Delete stored RAND & SRES) timer expiration: */ +/* T3316 (Delete stored RAND & SRES) timer expiration: */ static void t3316_delete_rand_sres_cb(void *data) { struct gprs_gmm_entity *gmme = (struct gprs_gmm_entity *)data; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9c32def9571294abe2e67235a50809839ed5966a Gerrit-Change-Number: 33765 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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