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

[S] Change in osmo-ttcn3-hacks[master]: msc: f_mo_call_establish: improve AoIP IE check
by osmith 19 Jun '23

19 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33353 ) Change subject: msc: f_mo_call_establish: improve AoIP IE check ...................................................................... msc: f_mo_call_establish: improve AoIP IE check Check if the AoIP Transport Layer IE is present before checking its value. This gives a more meaningful error than Dynamic Testcase Error if it is not present. Change-Id: I52fc829b017848b6afe7e637f1911a0976f9c91d --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/33353/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index f141955..4351e06 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1605,6 +1605,10 @@ var BSSMAP_IE_SpeechCodec codec; var BSSMAP_IE_Osmo_OsmuxCID osmuxCID; + if (not ispresent(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer)) { + setverdict(fail, "MSC sent Assignment Request without AoIP Transport Layer IE"); + mtc.stop; + } if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass1) and not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass2)) { log("Expected one of: 1:", tla_ass1, " 2:", tla_ass2); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33353 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: I52fc829b017848b6afe7e637f1911a0976f9c91d Gerrit-Change-Number: 33353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

19 Jun '23

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/33354/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_mt_call_initiate: fix typo
by osmith 19 Jun '23

19 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33352 ) Change subject: msc: f_mt_call_initiate: fix typo ...................................................................... msc: f_mt_call_initiate: fix typo Change-Id: Idfa381a036efcc21044700d069db434150fcaadf --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/33352/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index d96ae0b..f141955 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1050,7 +1050,7 @@ }; /* Allocate a call reference and send SETUP via MNCC to MSC */ -function f_mt_call_initate(inout CallParameters cpars) +function f_mt_call_initiate(inout CallParameters cpars) runs on BSC_ConnHdlr { cpars.mo_call := false; cpars.mncc_callref := f_rnd_int(2147483648); @@ -1337,7 +1337,7 @@ runs on BSC_ConnHdlr { /* Initiate the call via MNCC */ - f_mt_call_initate(cpars); + f_mt_call_initiate(cpars); /* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */ f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 8fc212c..666c6c1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2222,7 +2222,7 @@ f_expect_paging(); log("MNCC signals MT call, before Paging Response"); - f_mt_call_initate(cpars); + f_mt_call_initiate(cpars); f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_sleep(0.5); @@ -5602,7 +5602,7 @@ var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); /* Initiate a call via MNCC interface */ - f_mt_call_initate(cpars); + f_mt_call_initiate(cpars); /* Expect a paging request and respond accordingly with a service request */ SGsAP.receive(tr_SGsAP_PAGING_REQ(pars.imsi, vlr_name, CS_call_indicator, omit)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33352 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: Idfa381a036efcc21044700d069db434150fcaadf Gerrit-Change-Number: 33352 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

19 Jun '23

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/33355/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: Store T3192 value received from SI13, do some sanity checks
by pespin 19 Jun '23

19 Jun '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/33351 ) Change subject: Store T3192 value received from SI13, do some sanity checks ...................................................................... Store T3192 value received from SI13, do some sanity checks Timer T3192 may be used in the future to know wheter a DL TBF assignment can be sent on PACCH after the last DL TBF has finished (final ACK). Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6 --- M src/bts.cpp M src/pcu_l1_if.cpp 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/33351/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6 Gerrit-Change-Number: 33351 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-pcu[master]: bts: Use same default value for T3193 as set in osmo-bts/bsc
by pespin 19 Jun '23

19 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33350 ) Change subject: bts: Use same default value for T3193 as set in osmo-bts/bsc ...................................................................... bts: Use same default value for T3193 as set in osmo-bts/bsc That timer is configured by value sent over PCUIF, hence better have it to the same default value in osmo-bsc/osmo-bts. Change-Id: I498f05ff4d232164690d177430e90eb99b4eea9d --- M src/bts.cpp 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/50/33350/1 diff --git a/src/bts.cpp b/src/bts.cpp index 77d8738..2dbccda 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -80,7 +80,7 @@ { .T=3168, .default_val=4000, .unit=OSMO_TDEF_MS, .desc="Time MS waits for PACKET UPLINK ACK when establishing a UL TBF", .val=0 }, { .T=3169, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of USF and TFI(s) after the MS uplink TBF assignment is invalid", .val=0 }, { .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for an MBMS radio bearer", .val=0 }, - { .T=3193, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF", .val=0 }, + { .T=3193, .default_val=1600, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF", .val=0 }, { .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) upon no response from the MS (radio failure or cell change) for TBF/MBMS radio bearer", .val=0 }, { .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS, .desc = "Granularity for *:all_allocated rate counters: amount of milliseconds that one counter increment" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I498f05ff4d232164690d177430e90eb99b4eea9d Gerrit-Change-Number: 33350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: Store T3192 value received from SI13, do some sanity checks
by pespin 19 Jun '23

19 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33351 ) Change subject: Store T3192 value received from SI13, do some sanity checks ...................................................................... Store T3192 value received from SI13, do some sanity checks Timer T3192 may be used in the future to know wheter a DL TBF assignment can be sent on PACCH after the last DL TBF has finished (final ACK). Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6 --- M src/bts.cpp M src/pcu_l1_if.cpp 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/33351/1 diff --git a/src/bts.cpp b/src/bts.cpp index 2dbccda..177544a 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -80,6 +80,7 @@ { .T=3168, .default_val=4000, .unit=OSMO_TDEF_MS, .desc="Time MS waits for PACKET UPLINK ACK when establishing a UL TBF", .val=0 }, { .T=3169, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of USF and TFI(s) after the MS uplink TBF assignment is invalid", .val=0 }, { .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for an MBMS radio bearer", .val=0 }, + { .T=3192, .default_val=1500, .unit=OSMO_TDEF_MS, .desc="Time MS stays monitoring the PDCH after transmitting DL ACK/NACK for last DL block (FBI=1). Configured at the BSC (SI13).", .val=0 }, { .T=3193, .default_val=1600, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF", .val=0 }, { .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) upon no response from the MS (radio failure or cell change) for TBF/MBMS radio bearer", .val=0 }, { .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS, diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 7437e16..0226ab7 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -436,8 +436,13 @@ si_ro = ((struct gsm48_system_information_type_13*)data)->rest_octets; if (osmo_gsm48_rest_octets_si13_decode(&bts->si13_ro_decoded, si_ro) < 0) LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n"); - /* Update our cached T3168 from it: */ + /* Update our cached timers from it: */ osmo_tdef_set(bts->T_defs_bts, 3168, bts->si13_ro_decoded.cell_opts.t3168, OSMO_TDEF_MS); + osmo_tdef_set(bts->T_defs_bts, 3192, bts->si13_ro_decoded.cell_opts.t3192, OSMO_TDEF_MS); + /* Some sanity checks: */ + if (bts->si13_ro_decoded.cell_opts.t3192 >= + osmo_tdef_get(bts->T_defs_bts, 3193, OSMO_TDEF_MS, -1)) + LOGP(DL1IF, LOGL_ERROR, "Timers incorrectly configured! T3192 > T3193\n"); break; default: LOGP(DL1IF, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6 Gerrit-Change-Number: 33351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-sccp[master]: Forbid partial VTY configurations of ASPs with name asp-clnt-*
by pespin 19 Jun '23

19 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33325 ) Change subject: Forbid partial VTY configurations of ASPs with name asp-clnt-* ...................................................................... Patch Set 2: (1 comment) File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/33325/comment/b51ecdae_20be1fe5 PS2, Line 433: bool role_set_by_vty; > This looks like a public API, and you're adding stuff at the middle of a public struct? 1- Here I'm just readding some fields which used to be there. 2- These fields (.cfg) are basically set by VTY code which is also inside libosmo-sccp. Furthermore the ASP objects are allocated internally so there's no problem with struct size changing. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I65b5fad2ec06a9d9c521f1e3ce8aab633da95a47 Gerrit-Change-Number: 33325 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jun 2023 10:34:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: templates: fix osmo-msc.cfg.tmpl: add 'role asp', 'sctp-role client'
by fixeria 19 Jun '23

19 Jun '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/33349 ) Change subject: templates: fix osmo-msc.cfg.tmpl: add 'role asp', 'sctp-role client' ...................................................................... templates: fix osmo-msc.cfg.tmpl: add 'role asp', 'sctp-role client' This commit fixes osmo-gsm-tester_virtual, which currently fails because osmo-msc is unable to start: DLSCCP NOTICE sccp_user.c:656 OsmoMSC-A-Iu: Requesting an SCCP simple client on ASP asp-clnt-OsmoMSC-A configured with 'sctp-role server' DLSCCP ERROR sccp_user.c:661 OsmoMSC-A-Iu: Requesting an SCCP simple client on ASP asp-clnt-OsmoMSC-A configured with 'sctp-role server' but no matching xUA server was configured! Change-Id: Ie29589b46c65707089ff2b22c3b139b7b435cc95 --- M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved fixeria: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 1b91672..2893619 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -27,6 +27,8 @@ asp asp0 2905 0 m3ua local-ip ${msc.ip_address.addr} remote-ip ${stp.ip_address.addr} + role asp + sctp-role client as as0 m3ua asp asp0 routing-key 1 0.0.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/33349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie29589b46c65707089ff2b22c3b139b7b435cc95 Gerrit-Change-Number: 33349 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-tester[master]: templates: fix osmo-msc.cfg.tmpl: add 'role asp', 'sctp-role client'
by fixeria 19 Jun '23

19 Jun '23

fixeria has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/33349 ) Change subject: templates: fix osmo-msc.cfg.tmpl: add 'role asp', 'sctp-role client' ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/33349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie29589b46c65707089ff2b22c3b139b7b435cc95 Gerrit-Change-Number: 33349 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0