May 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: library/ngap: Fix criticality of several NGAP messages

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40407?usp=email ) Change subject: library/ngap: Fix criticality of several NGAP messages ...................................................................... library/ngap: Fix criticality of several NGAP messages As defined in ASN.1 in 3GPP TS 38.413 section 9.4.3. Change-Id: I2283a5b025f0ce7d7445fa0ce9ba8405156c4533 --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/40407/1 diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index d297bea..dde7844 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -685,7 +685,7 @@ ) := { procedureCode := id_PDUSessionResourceNotify, - criticality := reject, + criticality := ignore, value_ := { PDUSessionResourceNotify := { protocolIEs := { @@ -723,7 +723,7 @@ ) := { procedureCode := id_PDUSessionResourceNotify, - criticality := reject, + criticality := ignore, value_ := { PDUSessionResourceNotify := { protocolIEs := { @@ -1673,7 +1673,7 @@ in template (value) PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq ) := { procedureCode := id_UEContextReleaseRequest, - criticality := reject, + criticality := ignore, value_ := { UEContextReleaseRequest := { protocolIEs := { @@ -1710,7 +1710,7 @@ template (present) Cause p_cause := ? ) := { procedureCode := id_UEContextReleaseRequest, - criticality := reject, + criticality := ignore, value_ := { UEContextReleaseRequest := { protocolIEs := { @@ -2243,7 +2243,7 @@ in template (value) UserLocationInformation p_userLocationInformation ) := { procedureCode := id_RRCInactiveTransitionReport, - criticality := reject, + criticality := ignore, value_ := { RRCInactiveTransitionReport := { protocolIEs := { @@ -2286,7 +2286,7 @@ template (present) UserLocationInformation p_userLocationInformation := ? ) := { procedureCode := id_RRCInactiveTransitionReport, - criticality := reject, + criticality := ignore, value_ := { RRCInactiveTransitionReport := { protocolIEs := { @@ -4143,7 +4143,7 @@ in template (value) UserLocationInformation p_userLocationInformation ) := { procedureCode := id_HandoverNotification, - criticality := reject, + criticality := ignore, value_ := { HandoverNotify := { protocolIEs := { @@ -4180,7 +4180,7 @@ template (present) UserLocationInformation p_userLocationInformation := ? ) := { procedureCode := id_HandoverNotification, - criticality := reject, + criticality := ignore, value_ := { HandoverNotify := { protocolIEs := { @@ -4638,7 +4638,7 @@ in template (value) RANStatusTransfer_TransparentContainer p_rANStatusTransfer_TransparentContainer ) := { procedureCode := id_UplinkRANStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { UplinkRANStatusTransfer := { protocolIEs := { @@ -4672,7 +4672,7 @@ template (present) RANStatusTransfer_TransparentContainer p_rANStatusTransfer_TransparentContainer := ? ) := { procedureCode := id_UplinkRANStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { UplinkRANStatusTransfer := { protocolIEs := { @@ -4713,7 +4713,7 @@ in template (value) RANStatusTransfer_TransparentContainer p_rANStatusTransfer_TransparentContainer ) := { procedureCode := id_DownlinkRANStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANStatusTransfer := { protocolIEs := { @@ -4750,7 +4750,7 @@ template (present) RANStatusTransfer_TransparentContainer p_rANStatusTransfer_TransparentContainer := ? ) := { procedureCode := id_DownlinkRANStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANStatusTransfer := { protocolIEs := { @@ -4790,7 +4790,7 @@ in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID ) := { procedureCode := id_HandoverSuccess, - criticality := reject, + criticality := ignore, value_ := { HandoverSuccess := { protocolIEs := { @@ -4821,7 +4821,7 @@ template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ? ) := { procedureCode := id_HandoverSuccess, - criticality := reject, + criticality := ignore, value_ := { HandoverSuccess := { protocolIEs := { @@ -4935,7 +4935,7 @@ in template (value) EarlyStatusTransfer_TransparentContainer p_earlyStatusTransfer_TransparentContainer ) := { procedureCode := id_DownlinkRANEarlyStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANEarlyStatusTransfer := { protocolIEs := { @@ -4972,7 +4972,7 @@ template (present) EarlyStatusTransfer_TransparentContainer p_earlyStatusTransfer_TransparentContainer := ? ) := { procedureCode := id_DownlinkRANEarlyStatusTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANEarlyStatusTransfer := { protocolIEs := { @@ -5019,7 +5019,7 @@ in template (value) TAIListForPaging p_tAIListForPaging ) := { procedureCode := id_Paging, - criticality := reject, + criticality := ignore, value_ := { Paging := { protocolIEs := { @@ -5050,7 +5050,7 @@ template (present) TAIListForPaging p_tAIListForPaging := ? ) := { procedureCode := id_Paging, - criticality := reject, + criticality := ignore, value_ := { Paging := { protocolIEs := { @@ -5094,7 +5094,7 @@ in template (value) RRCEstablishmentCause p_rrcEstCause := PX_RRC_ESTABLISHMENT_CAUSE ) := { procedureCode := id_InitialUEMessage, - criticality := reject, + criticality := ignore, value_ := { InitialUEMessage := { protocolIEs := { @@ -5215,7 +5215,7 @@ template (present) RRCEstablishmentCause p_rrcEstCause := ? ) := { procedureCode := id_InitialUEMessage, - criticality := reject, + criticality := ignore, value_ := { InitialUEMessage := { protocolIEs := { @@ -5261,7 +5261,7 @@ in template (value) NAS_PDU p_nasPdu ) := { procedureCode := id_DownlinkNASTransport, - criticality := reject, + criticality := ignore, value_ := { DownlinkNASTransport := { protocolIEs := { @@ -5298,7 +5298,7 @@ template (present) NAS_PDU p_nasPdu := ? ) := { procedureCode := id_DownlinkNASTransport, - criticality := reject, + criticality := ignore, value_ := { DownlinkNASTransport := { protocolIEs := { @@ -5340,7 +5340,7 @@ in template (value) UserLocationInformation p_userLocationInformation ) := { procedureCode := id_UplinkNASTransport, - criticality := reject, + criticality := ignore, value_ := { UplinkNASTransport := { protocolIEs := { @@ -5383,7 +5383,7 @@ template (present) UserLocationInformation p_userLocationInformation := ? ) := { procedureCode := id_UplinkNASTransport, - criticality := reject, + criticality := ignore, value_ := { UplinkNASTransport := { protocolIEs := { @@ -5430,7 +5430,7 @@ in template (value) Cause p_cause := m_cause_nas(PX_CAUSE_NAS_NON_DELIVERY_INDICATION) ) := { procedureCode := id_NASNonDeliveryIndication, - criticality := reject, + criticality := ignore, value_ := { NASNonDeliveryIndication := { protocolIEs := { @@ -5473,7 +5473,7 @@ template (present) Cause p_cause := ? ) := { procedureCode := id_NASNonDeliveryIndication, - criticality := reject, + criticality := ignore, value_ := { NASNonDeliveryIndication := { protocolIEs := { @@ -6483,7 +6483,7 @@ in template (value) UnavailableGUAMIList p_unavailableGUAMIList ) := { procedureCode := id_AMFStatusIndication, - criticality := reject, + criticality := ignore, value_ := { AMFStatusIndication := { protocolIEs := { @@ -6508,7 +6508,7 @@ template (present) UnavailableGUAMIList p_unavailableGUAMIList := ? ) := { procedureCode := id_AMFStatusIndication, - criticality := reject, + criticality := ignore, value_ := { AMFStatusIndication := { protocolIEs := { @@ -6639,7 +6639,7 @@ */ template (value) InitiatingMessage m_n2_ErrorIndication := { procedureCode := id_ErrorIndication, - criticality := reject, + criticality := ignore, value_ := { ErrorIndication := { protocolIEs := { } @@ -6656,7 +6656,7 @@ in template (value) Cause p_cause ) := { procedureCode := id_ErrorIndication, - criticality := reject, + criticality := ignore, value_ := { ErrorIndication := { protocolIEs := { @@ -6743,7 +6743,7 @@ */ template (value) InitiatingMessage m_n2_OverloadStart := { procedureCode := id_OverloadStart, - criticality := reject, + criticality := ignore, value_ := { OverloadStart := { protocolIEs := { } @@ -6760,7 +6760,7 @@ */ template (present) InitiatingMessage mw_n2_OverloadStart := { procedureCode := id_OverloadStart, - criticality := reject, + criticality := ignore, value_ := { OverloadStart := { protocolIEs := { } @@ -6775,7 +6775,7 @@ template (present) OverloadStartNSSAIList p_overloadStartNSSAIList:= ? ):= { procedureCode := id_OverloadStart, - criticality := reject, + criticality := ignore, value_ := { OverloadStart := { protocolIEs := { @@ -6847,7 +6847,7 @@ */ template (value) InitiatingMessage m_n2_UplinkRANConfigurationTransfer := { procedureCode := id_UplinkRANConfigurationTransfer, - criticality := reject, + criticality := ignore, value_ := { UplinkRANConfigurationTransfer := { protocolIEs := { } @@ -6864,7 +6864,7 @@ */ template (present) InitiatingMessage mw_n2_UplinkRANConfigurationTransfer := { procedureCode := id_UplinkRANConfigurationTransfer, - criticality := reject, + criticality := ignore, value_ := { UplinkRANConfigurationTransfer := { protocolIEs := { } @@ -6885,7 +6885,7 @@ */ template (value) InitiatingMessage m_n2_DownlinkRANConfigurationTransfer := { procedureCode := id_DownlinkRANConfigurationTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANConfigurationTransfer := { protocolIEs := { } @@ -6902,7 +6902,7 @@ */ template (present) InitiatingMessage mw_n2_DownlinkRANConfigurationTransfer := { procedureCode := id_DownlinkRANConfigurationTransfer, - criticality := reject, + criticality := ignore, value_ := { DownlinkRANConfigurationTransfer := { protocolIEs := { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40407?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2283a5b025f0ce7d7445fa0ce9ba8405156c4533 Gerrit-Change-Number: 40407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: library/ngap: Fix wrong id set on PWSFailureIndication templates

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40406?usp=email ) Change subject: library/ngap: Fix wrong id set on PWSFailureIndication templates ...................................................................... library/ngap: Fix wrong id set on PWSFailureIndication templates Change-Id: Ied1c7a5914c6cbacf64ba857aa31c12ca6f001fb --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/40406/1 diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index b6be2d3..d297bea 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -7310,7 +7310,7 @@ in template (value) PWSFailedCellIDList p_pWSFailedCellIDList, in template (value) GlobalRANNodeID p_globalRANNodeID ) := { - procedureCode := id_PWSRestartIndication, + procedureCode := id_PWSFailureIndication, criticality := ignore, value_ := { PWSFailureIndication := { @@ -7341,7 +7341,7 @@ template (present) PWSFailedCellIDList p_pWSFailedCellIDList := ?, template (present) GlobalRANNodeID p_globalRANNodeID := ? ) := { - procedureCode := id_PWSRestartIndication, + procedureCode := id_PWSFailureIndication, criticality := ignore, value_ := { PWSFailureIndication := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied1c7a5914c6cbacf64ba857aa31c12ca6f001fb Gerrit-Change-Number: 40406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Initial NAS receiving support

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email ) Change subject: 5gc: Initial NAS receiving support ...................................................................... 5gc: Initial NAS receiving support With this patch it is already possible to receive the NAS Auth Request in the test ConnHdlr. nas.git dep needs updating to include a new patch fixing decoding of NG_AUTHENTICATION_REQUEST. Change-Id: I6697f30f95777fc9aed16a529a669d10f42c57be --- M 5gc/C5G_Tests.ttcn M 5gc/create_test_subscribers.sh M 5gc/gen_links.sh M deps/Makefile M library/NGAP_Emulation.ttcn M library/NGAP_Functions.ttcn A library/NG_NAS_Osmo_Templates.ttcn M library/Osmocom_Types.ttcn 8 files changed, 273 insertions(+), 96 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/40408/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 62553fc..320d61f 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -17,6 +17,7 @@ import from Misc_Helpers all; import from Osmocom_Types all; +import from GSM_Types all; import from NGAP_PDU_Descriptions all; import from NGAP_IEs all; @@ -29,10 +30,14 @@ import from NGAP_Functions all; import from NGAP_Emulation all; +import from NAS_CommonTypeDefs all; + import from NG_NAS_Common all; import from NG_NAS_MsgContainers all; import from NAS_CommonTemplates all; import from NG_NAS_Templates all; + +import from NG_NAS_Osmo_Templates all; import from NG_NAS_Functions all; /* (maximum) number of emulated eNBs */ @@ -48,7 +53,9 @@ integer mp_5gc_ngap_port := 38412; charstring mp_local_ngap_ip := "127.0.0.1"; integer mp_local_ngap_port := 50000; - PLMNIdentity mp_plmn_id := '99f907'O; + GsmMcc mp_mcc := '999'H; + GsmMnc mp_mnc := '70'H; + hexstring mp_imsi := '999700000000000'H; uint24_t mp_tac := 1; } @@ -86,9 +93,9 @@ /* copied over from MTC_CT on start of component */ UeParams ue_pars, /* currently used 5GC (index into ngran_pars, NGAP, ...) */ - integer c5g_idx//, + integer c5g_idx, /* Currently set KSI */ - //NAS_KeySetIdentifierV kset_id + NAS_KeySetIdentifier kset_id } /* send incoming unit data messages (like reset) to global NGAP_UNIT port */ @@ -108,17 +115,18 @@ remote_ip := mp_5gc_ngap_ip, remote_sctp_port := mp_5gc_ngap_port, local_ip := mp_local_ngap_ip, - local_sctp_port := mp_local_ngap_port + num //, - //role := NAS_ROLE_UE + local_sctp_port := mp_local_ngap_port + num, + role := NGAP_NAS_ROLE_UE }; + var PLMNIdentity plmn_id := f_enc_mcc_mnc(mp_mcc, mp_mnc); var NGRANParams ngran_pars := { - global_ngran_id := valueof(m_globalRANNodeID_globalGNB_ID(m_ie_globalGnbId(mp_plmn_id, int2bit(num, 22)))), - cell_identity := { nR_CGI := valueof(m_nR_CGI(mp_plmn_id, int2bit(num, 36))) }, + global_ngran_id := valueof(m_globalRANNodeID_globalGNB_ID(m_ie_globalGnbId(plmn_id, int2bit(num, 22)))), + cell_identity := { nR_CGI := valueof(m_nR_CGI(plmn_id, int2bit(num, 36))) }, supported_ta_list := { { tAC := int2oct(mp_tac, 3), broadcastPLMNList := { - valueof(m_ie_broadcastPLMNItem(mp_plmn_id, { m_sliceSupportItem(m_s_NSSAI('01'O)) })) + valueof(m_ie_broadcastPLMNItem(plmn_id, { m_sliceSupportItem(m_s_NSSAI('01'O)) })) }, iE_Extensions := omit } @@ -136,17 +144,17 @@ friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { uep := { - imsi := f_gen_imsi(imsi_suffix), + imsi := f_concat_pad(lengthof(mp_imsi), substr(mp_imsi, 0, lengthof(mp_imsi) - 6), imsi_suffix), ue_ip := "192.168.123.50" } } -friend function f_init_ngap(integer imsi_suffix) runs on MTC_CT { +friend function f_init_ngap(integer imsi_suffix := 0) runs on MTC_CT { var integer i; for (i := 0; i < NUM_NGRAN; i := i+1) { f_init_one_ngran(i); } for (i := 0; i < NUM_UE; i := i+1) { - f_init_one_ue(g_ue_pars[i], i*1000 + imsi_suffix); + f_init_one_ue(g_ue_pars[i], 1000*imsi_suffix + i); } } @@ -156,8 +164,8 @@ var ConnHdlrPars pars := { ngran_pars := g_ngran_pars, ue_pars := g_ue_pars[ue_idx], - c5g_idx := 0//, - //kset_id := valueof(ts_NAS_KeySetIdentifierV('000'B, c_NAS_TSC_NATIVE_SEC_CTX)) + c5g_idx := 0, + kset_id := valueof(cs_NAS_KeySetIdentifier_lv(tsc_NasKsi_NoKey, '0'B)) }; return pars; } @@ -203,6 +211,14 @@ iE_Extensions := omit } +private function f_SUCI_IMSI() runs on ConnHdlr return octetstring { + var hexstring imsi := g_pars.ue_pars.imsi; + var GsmMcc mcc := substr(imsi, 0, 3); + var GsmMnc mnc := substr(imsi, 3, 2); + var octetstring imsi_suffix := imsi_hex2oct(substr(imsi, lengthof(imsi)-10, 10)); + return f_enc_mcc_mnc(mcc, mnc) & '21430001'O & imsi_suffix; +} + friend function f_ngap_setup(integer idx := 0, template (omit) NGAP_IEs.Cause cause := omit) runs on MTC_CT { var template (present) NGAP_IEs.Cause exp_cause := ?; var boolean exp_fail := false; @@ -243,6 +259,25 @@ } } +private function f_tr_ConnHdlr_kset_id() runs on ConnHdlr return template (present) NAS_KeySetIdentifier { + /* KSI not yet set, expect whatever assignment from network: */ + if (g_pars.kset_id.nasKeySetId == tsc_NasKsi_NoKey) { + return cr_NAS_KeySetIdentifier(?, ?); + } else { + /* Expect specific kset_id. Upon transmitting it UE->Network, f_attach() + * has updated it to the expected value. */ + return g_pars.kset_id; + } +} + +private altstep as_ngap_handle_auth() runs on ConnHdlr { + var NG_NAS_DL_Message_Type rx_nas; + var template (present) NAS_KeySetIdentifier kset_id := f_tr_ConnHdlr_kset_id(); + [] NGAP.receive(cr_NG_AUTHENTICATION_REQUEST) -> value rx_nas { + log("Rx NAS message: ", rx_nas); + } +} + private function f_register() runs on ConnHdlr { var template (value) UserLocationInformation p_ueLocInf; var template (value) NGAP_PDU tx_pdu; @@ -258,10 +293,11 @@ )); nas_ul_msg := cs_NG_REGISTRATION_REQUEST(cs_RegistrationType(tsc_NG_RegistrationInitial, '1'B), - tsc_NasKsi_NoKey, - '0'B, + g_pars.kset_id.nasKeySetId, + g_pars.kset_id.tsc, cs_NG_MobileIdentitySUCI('0000'B /* Type IMSI */, - '00f110214300014444330302'O)); + f_SUCI_IMSI()), + p_UESecurityCap := cs_NG_UE_SecurityCapability); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); @@ -271,7 +307,7 @@ mo_Signalling)); NGAP.send(tx_pdu); - f_sleep(5.0); + as_ngap_handle_auth(); /* TODO: handle Auth, SecurityModeCommand, InitialContextSetup, PDUSessionresource, */ } @@ -279,21 +315,21 @@ /* NG Setup procedure to 5GC using a Global gNB ID containing unknown/foreign PLMN. * Related: https://github.com/open5gs/open5gs/issues/3544 */ testcase TC_ng_setup_unknown_global_gnb_id_plmn() runs on MTC_CT { - f_init_ngap(1); + f_init_ngap(); g_ngran_pars[0].global_ngran_id.globalGNB_ID.pLMNIdentity := '62F224'O; f_ngap_setup(0); } /* Unsuccessful NG Setup procedure to AMF (wrong PLMN) */ testcase TC_ng_setup_wrong_tac() runs on MTC_CT { - f_init_ngap(2); + f_init_ngap(); g_ngran_pars[0].supported_ta_list[0].broadcastPLMNList[0].pLMNIdentity := '62F224'O; f_ngap_setup(0, {misc:=unknown_PLMN_or_SNPN}); } /* NG Setup procedure to 5GC using a correct Global gNB ID. */ testcase TC_ng_setup() runs on MTC_CT { - f_init_ngap(3); + f_init_ngap(); f_ngap_setup(0); } @@ -302,7 +338,7 @@ f_register(); } testcase TC_ng_register() runs on MTC_CT { - f_init_ngap(4); + f_init_ngap(); f_ngap_setup(0); var ConnHdlrPars pars := f_init_pars(ue_idx := 0); diff --git a/5gc/create_test_subscribers.sh b/5gc/create_test_subscribers.sh index f5b6c5b..a400e0f 100755 --- a/5gc/create_test_subscribers.sh +++ b/5gc/create_test_subscribers.sh @@ -18,10 +18,10 @@ done # Create a test subscriber with IMSI=001010000000000 -$DBCTL_CMD add 001010000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +$DBCTL_CMD add 999700000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 # Mark test subscriber with IMSI=001010000000001 as: # Subscriber-Status=OPERATOR_DETERMINED_BARRING (1) # Operator-Determined-Barring="Barring of all outgoing inter-zonal calls except those directed to the home PLMN country" (7) -$DBCTL_CMD add 001010000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 -$DBCTL_CMD subscriber_status 001010000000001 1 7 +$DBCTL_CMD add 999700000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +$DBCTL_CMD subscriber_status 999700000000001 1 7 diff --git a/5gc/gen_links.sh b/5gc/gen_links.sh index 2cab445..295ca24 100755 --- a/5gc/gen_links.sh +++ b/5gc/gen_links.sh @@ -66,7 +66,7 @@ FILES+="SCTP_Templates.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="NGAP_CodecPort.ttcn NGAP_CodecPort_CtrlFunctDef.cc NGAP_CodecPort_CtrlFunct.ttcn NGAP_Functions.ttcn NGAP_Emulation.ttcn " -FILES+="NG_NAS_Functions.ttcn " +FILES+="NG_NAS_Osmo_Templates.ttcn NG_NAS_Functions.ttcn " gen_links $DIR $FILES gen_links_finish diff --git a/deps/Makefile b/deps/Makefile index b4a411a..a97b0a9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -85,7 +85,7 @@ # Do not put references to branches here, except for local testing: this breaks the caching # logic of docker containers, which only invalidate their cached ttcn3 dependencies if this # file changed. -nas_commit= 205e24167517500ba2d49322dfa1754ab8a0fc43 +nas_commit= a82a1ce22ea056971f47a7d02389f989e2f4183b titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index e885a4d..46f1d63 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -33,8 +33,16 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +import from General_Types all; +import from Osmocom_Types all; +import from IPL4asp_Types all; +import from DNS_Helpers all; + +import from SCTP_Templates all; + import from NGAP_CodecPort all; import from NGAP_CodecPort_CtrlFunct all; +import from NGAP_CommonDataTypes all; import from NGAP_Types all; import from NGAP_Constants all; import from NGAP_PDU_Contents all; @@ -42,13 +50,14 @@ import from NGAP_IEs all; import from NGAP_Templates all; import from NGAP_Functions all; -import from SCTP_Templates all; -import from General_Types all; -import from Osmocom_Types all; -import from IPL4asp_Types all; -import from DNS_Helpers all; +import from NG_NAS_MsgContainers all; +import from NG_NAS_Functions all; +type enumerated NGAP_NAS_Role { + NGAP_NAS_ROLE_UE, /* ATS implements/emulates UE */ + NGAP_NAS_ROLE_AMF /* ATS implements/emulates AMF */ +}; type component NGAP_ConnHdlr { port NGAP_Conn_PT NGAP; @@ -58,7 +67,7 @@ /* port between individual per-connection components and this dispatcher */ type port NGAP_Conn_PT message { - inout NGAP_PDU; + inout NGAP_PDU, NG_NAS_UL_Message_Type, NG_NAS_DL_Message_Type; } with { extension "internal" }; @@ -135,7 +144,7 @@ type record AssociationData { NGAP_ConnHdlr comp_ref, /* component handling this UE connection */ uint32_t ran_ue_ngap_id optional, /* eNB side NGAP ID */ - uint40_t amf_ue_ngap_id optional//, /* MME side NGAP ID */ + uint40_t amf_ue_ngap_id optional//, /* AMF side NGAP ID */ //EUTRAN_CGI cgi optional, //TAI tai optional, //NAS_UE_State nus @@ -182,8 +191,8 @@ HostName remote_ip, IPL4asp_Types.PortNumber remote_sctp_port, HostName local_ip, - IPL4asp_Types.PortNumber local_sctp_port//, - //NAS_Role role + IPL4asp_Types.PortNumber local_sctp_port, + NGAP_NAS_Role role } function tr_NGAP_RecvFrom_R(template NGAP_PDU msg) @@ -205,8 +214,8 @@ var integer i; log("f_ngap_ids_known(",amf_id,", ",ran_id,")"); for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { - log("tbl[",i,"]: mme=", NGapAssociationTable[i].amf_ue_ngap_id, - ", enb=", NGapAssociationTable[i].ran_ue_ngap_id); + log("tbl[",i,"]: amf=", NGapAssociationTable[i].amf_ue_ngap_id, + ", ran=", NGapAssociationTable[i].ran_ue_ngap_id); /* skip empty records */ if (NGapAssociationTable[i].amf_ue_ngap_id == omit and NGapAssociationTable[i].ran_ue_ngap_id == omit) { @@ -214,11 +223,11 @@ continue; } if (NGapAssociationTable[i].amf_ue_ngap_id == omit) { - log("entry ", i, " has no MME ID yet (enb=", NGapAssociationTable[i].ran_ue_ngap_id); - /* Table doesn't yet know the MME side ID, let's look-up only + log("entry ", i, " has no AMF ID yet (ran=", NGapAssociationTable[i].ran_ue_ngap_id); + /* Table doesn't yet know the AMF side ID, let's look-up only * based on the eNB side ID */ if (match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { - /* update table with MME side ID */ + /* update table with AMF side ID */ NGapAssociationTable[i].amf_ue_ngap_id := valueof(amf_id); return true; } @@ -256,7 +265,7 @@ } } } - setverdict(fail, "NGAP Association Table not found by ENB-ID=", ran_id, " MME-ID=", amf_id); + setverdict(fail, "NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id); mtc.stop; } @@ -346,20 +355,20 @@ return mrf.msg; } -//function handle_NGAP_UeContextReleaseCmd(template (present) NGAP_PDU rel_cmd) runs on NGAP_Emulation_CT { +function handle_NGAP_UeContextReleaseCmd(template (present) NGAP_PDU rel_cmd) runs on NGAP_Emulation_CT { // if (ispresent(rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair)) { -// var template AMF_UE_NGAP_ID mme_ue_id; -// var template RAN_UE_NGAP_ID enb_ue_id; +// var template AMF_UE_NGAP_ID amf_ue_id; +// var template RAN_UE_NGAP_ID ran_ue_id; // var integer assoc_id; // var NGAP_ConnHdlr vc_conn // -// mme_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.mME_UE_NGAP_ID; -// enb_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.eNB_UE_NGAP_ID; +// amf_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.mME_UE_NGAP_ID; +// ran_ue_id := rel_cmd.initiatingMessage.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.eNB_UE_NGAP_ID; // -// assoc_id := f_assoc_id_by_ngap_ids(mme_ue_id, enb_ue_id); +// assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); // vc_conn := NGapAssociationTable[assoc_id].comp_ref; // -// f_ngap_id_table_del(vc_conn, valueof(enb_ue_id)); +// f_ngap_id_table_del(vc_conn, valueof(ran_ue_id)); // } else { // /* TODO: The UE CONTEXT RELEASE COMMAND (see also: 3GPP TS 36.413, section 9.1.4.6), may identify the // * context by either an uE_NGAP_ID_pair (AMF_UE_NGAP_ID and RAN_UE_NGAP_ID) or an AMF_UE_NGAP_ID alone. @@ -367,7 +376,7 @@ // setverdict(fail, "complete implementation of UeContextReleaseCmd handling"); // mtc.stop; // } -//} +} private function SendToNGapExpectTableProc(NGAP_PDU msg) runs on NGAP_Emulation_CT { var integer procedureCode; @@ -395,6 +404,19 @@ return; } +template ProcedureCode tr_NGAP_ProcedureCode_non_UErelated := +(id_NGSetup, id_RANConfigurationUpdate, id_AMFStatusIndication, id_NGReset, id_ErrorIndication, id_OverloadStart, id_OverloadStop); +template (present) NGAP_PDU +tr_NGAP_nonUErelated := (mw_ngap_initMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?}), + mw_ngap_succMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?}), + mw_ngap_unsuccMsg({procedureCode := tr_NGAP_ProcedureCode_non_UErelated, + criticality := ?, + value_ := ?})); + function main(NGAPOps ops, NGAP_conn_parameters p, charstring id) runs on NGAP_Emulation_CT { var Result res; g_pars := p; @@ -430,7 +452,7 @@ var integer procedureCode; var NGAP_RecvFrom mrf; var NGAP_PDU msg; - var charstring vlr_name, mme_name; + var charstring vlr_name, amf_name; var integer ai; var octetstring kasme; @@ -458,54 +480,59 @@ NGAP.send(t_NGAP_Send(g_ngap_conn_id, msg)); } - /* NGAP received from peer (MME) */ + /* NGAP received from peer (AMF) */ [] NGAP.receive(tr_NGAP_RecvFrom_R(?)) -> value mrf { -// if (match(mrf.msg, tr_NGAP_nonUErelated)) { + if (match(mrf.msg, tr_NGAP_nonUErelated)) { /* non-UE-related NGAP message */ SendToNGapExpectTableProc(mrf.msg); var template NGAP_PDU resp := ops.unitdata_cb.apply(mrf.msg); if (isvalue(resp)) { NGAP.send(t_NGAP_Send(g_ngap_conn_id, valueof(resp))); } -// } else { -// /* Ue-related NGAP message */ -// /* obtain MME + ENB UE NGAP ID */ -// var template (omit) AMF_UE_NGAP_ID mme_ue_id := f_NGAP_get_AMF_UE_NGAP_ID(mrf.msg); -// var template (omit) RAN_UE_NGAP_ID enb_ue_id := f_NGAP_get_RAN_UE_NGAP_ID(mrf.msg); -// /* check if those IDs are known in our table */ -// if (f_ngap_ids_known(mme_ue_id, enb_ue_id)) { -// /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ -// var template (omit) octetstring nas_enc; -// var integer assoc_id := f_assoc_id_by_ngap_ids(mme_ue_id, enb_ue_id); -// vc_conn := NGapAssociationTable[assoc_id].comp_ref; -// nas_enc := f_NGAP_get_NAS_PDU(mrf.msg); -// if (isvalue(nas_enc)) { -// nas := dec_PDU_NAS_EPS(valueof(nas_enc)); -// if (match(nas, tr_NAS_EMM_SecurityProtected)) { -// nas := f_nas_try_decaps(NGapAssociationTable[assoc_id].nus, nas); -// } -// /* DL/UlNasTransport are not interesting, don't send them */ -// if (not match(mrf.msg, (tr_NGAP_DlNasTransport, tr_NGAP_UlNasTransport))) { -// /* send raw NGAP */ -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// /* send decoded NAS */ -// NGAP_CLIENT.send(nas) to vc_conn; -// } else { -// /* send raw NGAP */ -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// } else { -// /* if not, call create_cb so it can create new ConnHdlr */ -// vc_conn := ops.create_cb.apply(mrf.msg, mme_ue_id, enb_ue_id, id); -// f_ngap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); -// NGAP_CLIENT.send(mrf.msg) to vc_conn; -// } -// if (match(mrf.msg, tr_NGAP_UeContextReleaseCmd)) { -// handle_NGAP_UeContextReleaseCmd(mrf.msg); -// } -// } + } else { + /* Ue-related NGAP message */ + /* obtain AMF + NGRAN UE NGAP ID */ + var template (omit) AMF_UE_NGAP_ID amf_ue_id := f_NGAP_get_AMF_UE_NGAP_ID(mrf.msg); + var template (omit) RAN_UE_NGAP_ID ran_ue_id := f_NGAP_get_RAN_UE_NGAP_ID(mrf.msg); + /* check if those IDs are known in our table */ + if (f_ngap_ids_known(amf_ue_id, ran_ue_id)) { + /* if yes, dispatch to the ConnHdlr for this Ue-Connection */ + var template (omit) octetstring nas_enc; + var integer assoc_id := f_assoc_id_by_ngap_ids(amf_ue_id, ran_ue_id); + vc_conn := NGapAssociationTable[assoc_id].comp_ref; + nas_enc := f_NGAP_get_NAS_PDU(mrf.msg); + if (isvalue(nas_enc)) { + if (g_pars.role == NGAP_NAS_ROLE_UE) { + var NG_NAS_DL_Message_Type dl_nas := dec_NG_NAS_DL_Message_Type(valueof(nas_enc)); +// if (match(dl_nas, tr_NAS_EMM_SecurityProtected)) { +// dl_nas := f_nas_try_decaps(NGapAssociationTable[assoc_id].nus, dl_nas); +// } + /* DL/UlNasTransport are not interesting, don't send them */ + if (not match(mrf.msg, mw_ngap_initMsg(mw_n2_DownlinkNASTransport))) { + /* send raw NGAP */ + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + /* send decoded NAS */ + NGAP_CLIENT.send(dl_nas) to vc_conn; + } else { + log("Incoming NAS HANDLING in AMF role not supported!"); + var NG_NAS_UL_Message_Type ul_nas := dec_NG_NAS_UL_Message_Type(valueof(nas_enc)); + } + } else { + /* send raw NGAP */ + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + } else { + /* if not, call create_cb so it can create new ConnHdlr */ + vc_conn := ops.create_cb.apply(mrf.msg, amf_ue_id, ran_ue_id, id); + f_ngap_id_table_add(vc_conn, amf_ue_id, valueof(ran_ue_id)); + NGAP_CLIENT.send(mrf.msg) to vc_conn; + } + if (match(mrf.msg, mw_ngap_initMsg(mw_n2_UEContextReleaseCommand))) { + handle_NGAP_UeContextReleaseCmd(mrf.msg); + } } + } [] NGAP.receive(tr_SctpAssocChange) { } [] NGAP.receive(tr_SctpPeerAddrChange) { } [] NGAP_PROC.getcall(NGAPEM_register:{?,?,?}) -> param(amf_id, ran_id, vc_conn) { diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index 7ab2f5a..1323ab9 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -21,7 +21,10 @@ { if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (ngap) { + select (im) { + case (mw_n2_DownlinkNASTransport) { + return im.value_.downlinkNASTransport.protocolIEs[0].value_.aMF_UE_NGAP_ID; + } case (?) { return omit; /* TODO */ @@ -31,7 +34,7 @@ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (ngap) { + select (so) { case (?) { return omit; /* TODO */ @@ -41,7 +44,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (ngap) { + select (uo) { case (?) { return omit; /* TODO */ @@ -61,11 +64,14 @@ case (mw_n2_initialUeMessage) { return im.value_.InitialUEMessage.protocolIEs[0].value_.RAN_UE_NGAP_ID; } + case (mw_n2_DownlinkNASTransport) { + return im.value_.downlinkNASTransport.protocolIEs[1].value_.RAN_UE_NGAP_ID; + } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { var SuccessfulOutcome so := ngap.successfulOutcome; - select (ngap) { + select (so) { case (?) { return omit; /* TODO */ @@ -75,7 +81,7 @@ } } else if (ischosen(ngap.unsuccessfulOutcome)) { var UnsuccessfulOutcome uo := ngap.unsuccessfulOutcome; - select (ngap) { + select (uo) { case (?) { return omit; /* TODO */ @@ -87,4 +93,41 @@ return omit; } +function f_NGAP_get_NAS_PDU(NGAP_PDU ngap) return template (omit) NAS_PDU +{ + var integer i, j; + + if (ischosen(ngap.initiatingMessage)) { + var InitiatingMessage im := ngap.initiatingMessage; + select (im) { + case (mw_n2_DownlinkNASTransport) { + var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (mw_n2_UplinkNASTransport) { + var UplinkNASTransport msg := im.value_.UplinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (mw_n2_initialUeMessage) { + var InitialUEMessage msg := im.value_.InitialUEMessage; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + return omit; + } + } + } + return omit; +} + } diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn new file mode 100644 index 0000000..a22c542 --- /dev/null +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -0,0 +1,71 @@ +/* Our own NG NAS templates on top of deps/nas/ttcn/Lib3GPP/NG_NAS/NG_NAS_Templates.ttcn. */ +module NG_NAS_Osmo_Templates { + +/* (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from CommonDefs all; +import from NAS_CommonTypeDefs all; +import from NAS_CommonTemplates all; +import from NG_NAS_Common all; +import from NG_NAS_TypeDefs all; +import from NG_NAS_Templates all; +import from NG_NAS_MsgContainers all; + +/* 24.501 cl. 9.11.3.54 */ +private function f_cs_NG_UE_SecurityCapability_length(template (omit) O1_Type eeaCap := omit, + template (omit) O1_Type eiaCap := omit) +return integer { + var integer len := 2; + if (isvalue(eeaCap)) { + len := len + 1; + } + if (isvalue(eiaCap)) { + len := len + 1; + } + return len; +} +template (value) NG_UE_SecurityCapability cs_NG_UE_SecurityCapability(template (value) O1_Type ngeaCap := 'f0'O, + template (value) O1_Type ngiaCap := '70'O, + template (omit) O1_Type eeaCap := omit, + template (omit) O1_Type eiaCap := omit) := +{ + iei := '2E'O, + iel := int2oct(f_cs_NG_UE_SecurityCapability_length(eeaCap, eiaCap), 1), + ngeaCap := ngeaCap, + ngiaCap := ngiaCap, + eeaCap := eeaCap, + eiaCap := eiaCap, + spare := omit +}; + + +/* 24.501 cl. 8.2.1 */ +template (present) NG_NAS_DL_Message_Type cr_NG_AUTHENTICATION_REQUEST(template (present) NAS_KsiValue p_KeySetId := ?, + template (present) ABBA p_ABBA := ?, + template RAND p_RAND := *, + template AUTN p_AUTN := *, + template EAP_Message p_EAP := * + ) := +{ /* 24.501 cl. 8.2.1 */ + authentication_Request := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_AuthenticationRequest, /* cl. 9.7 M V 1 */ + spareHalfOctet2 := tsc_SpareHalfOctet, /* cl. 9.5 M V 1/2 */ + ngNasKeySetId := cr_NAS_KeySetIdentifier(p_KeySetId, tsc_NasKsi_NativeSecurityContext), /* cl. 9.11.3.32 M V 1/2 */ + abba := p_ABBA, /* cl. 9.11.3.10 M LV 3-n */ + rand := p_RAND, /* cl. 9.11.3.16 O TV 17 IEI=21 */ + autn := p_AUTN, /* cl. 9.11.3.15 O TLV 18 IEI=20 */ + eapMessage := p_EAP /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */ + } +} + +} diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 995342a..21d7abf 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -343,7 +343,7 @@ } -private function f_concat_pad(integer tot_len, hexstring prefix, integer suffix) return hexstring { +function f_concat_pad(integer tot_len, hexstring prefix, integer suffix) return hexstring { var integer suffix_len := tot_len - lengthof(prefix); var charstring suffix_ch := int2str(suffix); var integer pad_len := suffix_len - lengthof(suffix_ch); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6697f30f95777fc9aed16a529a669d10f42c57be Gerrit-Change-Number: 40408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in pysim[master]: es2p.py: also allow 18 digit ICCID

by laforge

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/40341?usp=email ) Change subject: es2p.py: also allow 18 digit ICCID ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > why would 18 digits be permitted? According to the wikpedia "SIM card" page, *In practice, this mea […] ping? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa6e710132e3f4c6cecc5ff786922f6c0fcfb54e Gerrit-Change-Number: 40341 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 May 2025 15:48:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

3 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Fix upfd failing to start outside podman

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40405?usp=email ) Change subject: 5gc: Fix upfd failing to start outside podman ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5d3e0c3b7391d312304190acf07b347320481275 Gerrit-Change-Number: 40405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 May 2025 15:47:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmo-sigtran[pespin/rel-2.1.0]: sccp_sclc.c: Fix potential memory leak

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40401?usp=email ) Change subject: sccp_sclc.c: Fix potential memory leak ...................................................................... sccp_sclc.c: Fix potential memory leak If data_ie is not found, msgb will be leaked. (cherry picked from commit a9271575181accf1476131e3a32a9272317efd40) Change-Id: I21073484dd73ee536116d49301f508f0d32415c9 --- M src/sccp_sclc.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 186efbd..6196d35 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -159,7 +159,7 @@ struct osmo_scu_prim *prim; struct osmo_scu_unitdata_param *param; struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); - struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct msgb *upmsg; struct osmo_sccp_user *scu; uint32_t protocol_class; @@ -168,6 +168,7 @@ return -1; } + upmsg = sccp_msgb_alloc(__func__); /* fill primitive */ prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); param = &prim->u.unitdata; @@ -208,7 +209,7 @@ struct osmo_scu_prim *prim; struct osmo_scu_notice_param *param; struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); - struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct msgb *upmsg; struct osmo_sccp_user *scu; if (!data_ie) { @@ -216,6 +217,7 @@ return -1; } + upmsg = sccp_msgb_alloc(__func__); /* fill primitive */ prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); param = &prim->u.notice; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40401?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: pespin/rel-2.1.0 Gerrit-Change-Id: I21073484dd73ee536116d49301f508f0d32415c9 Gerrit-Change-Number: 40401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[S] Change in libosmo-sigtran[pespin/rel-2.1.0]: ipa: Fix asp_id/SLS unset in tcp-server mode

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40400?usp=email ) Change subject: ipa: Fix asp_id/SLS unset in tcp-server mode ...................................................................... ipa: Fix asp_id/SLS unset in tcp-server mode Commit changing the value set to asp_id (used to derive SLS) for IPA conns only updated the asp_id value on the stream_cli code path, but not on the stream_srv one. As a result, on IPA conns with an underlaying TCP server conn, asp_id and SLS was always 0. Fixes: 2c9ba16 "ipa: Use pseudo-random number for SLS in IPA->M3UA direction (cherry picked from commit a3232c4b7ba8d90f852211c987a4a438c8970aa6) Change-Id: Ic24c389940d6f6aae8283ee623f8616d41568385 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c 2 files changed, 10 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index d81d25c..57ebc82 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -945,8 +945,8 @@ rc = ss7_asp_apply_primary_address(asp); } else { if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { - /* we use the lower 4 bits of the asp_id feld as SLS; let's initialize it here from a - * pseudo-random value */ + /* we use the lower 4 bits of the asp_id field as SLS; + * let's initialize it here from a pseudo-random value */ asp->asp_id = rand() & 0xf; } } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 4962bfd..35e360f 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -61,7 +61,7 @@ * SS7 xUA Server ***********************************************************************/ -/* server has accept()ed a new SCTP association, let's find the ASP for +/* Server has accept()ed a new SCTP association / TCP connection, let's find the ASP for * it (if any) */ static int xua_accept_cb(struct osmo_stream_srv_link *link, int fd) { @@ -177,9 +177,15 @@ * data */ osmo_stream_srv_set_data(srv, asp); - if (oxs->cfg.trans_proto == IPPROTO_SCTP) { + if (asp->cfg.trans_proto == IPPROTO_SCTP) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + } else { + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + /* we use the lower 4 bits of the asp_id field as SLS; + * let's initialize it here from a pseudo-random value */ + asp->asp_id = rand() & 0xf; + } } /* send M-SCTP_ESTABLISH.ind to Layer Manager */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40400?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: pespin/rel-2.1.0 Gerrit-Change-Id: Ic24c389940d6f6aae8283ee623f8616d41568385 Gerrit-Change-Number: 40400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmo-sigtran[pespin/rel-2.1.0]: snm: Fix generating wrong format in 'affected PCs' log string

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40399?usp=email ) Change subject: snm: Fix generating wrong format in 'affected PCs' log string ...................................................................... snm: Fix generating wrong format in 'affected PCs' log string The previous code wrongly added an extra ", " string between each element. (cherry picked from commit b8a27a9b09babdf219e76347e89b66a9214f7b08) Change-Id: I339e7a94ffe56a37ad0bebc1b8067023d33a882b --- M src/xua_snm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/xua_snm.c b/src/xua_snm.c index 36fe3c7..971380b 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -59,7 +59,7 @@ uint8_t mask = _aff_pc >> 24; /* append point code + mask */ - out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", + out = talloc_asprintf_append(out, "%s%s/%u", i == 0 ? "" : ", ", osmo_ss7_pointcode_print(s7i, pc), mask); } return out; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40399?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: pespin/rel-2.1.0 Gerrit-Change-Id: I339e7a94ffe56a37ad0bebc1b8067023d33a882b Gerrit-Change-Number: 40399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[XS] Change in libosmo-sigtran[pespin/rel-2.1.0]: sccp_scoc: Match local conn by src_ref, not dest_ref

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40402?usp=email ) Change subject: sccp_scoc: Match local conn by src_ref, not dest_ref ...................................................................... sccp_scoc: Match local conn by src_ref, not dest_ref SCRC Routing Failure is dispatched when a local SCCP Connection Oriented message fails to be routed to a peer. Hence, in order to figure out if the msg belons to a local conn, we need to use the src_ref (the sender), not the dst_ref (the peer's id). As a result, event SCOC_E_RCOC_ROUT_FAIL_IND was potentially being set to the wrong connection FSM. (cherry picked from commit 0a5161a0a8922a383e9478340a46c139428ed343) Change-Id: Ic3bc75ca30e78e831d3d8b80c477338eab6a3b0f --- M src/sccp_scoc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index c11dddf..0b6bd98 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1545,7 +1545,7 @@ xua_hdr_dump(xua, &xua_dialect_sua)); /* try to dispatch to connection FSM (if any) */ - conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); + conn_id = xua_msg_get_u32(xua, SUA_IEI_SRC_REF); conn = conn_find_by_id(inst, conn_id); if (conn) { osmo_fsm_inst_dispatch(conn->fi, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40402?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: pespin/rel-2.1.0 Gerrit-Change-Id: Ic3bc75ca30e78e831d3d8b80c477338eab6a3b0f Gerrit-Change-Number: 40402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

[S] Change in libosmo-sigtran[pespin/rel-2.1.0]: asp: Avoid double-free of received msg if conn is teared down

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40403?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... asp: Avoid double-free of received msg if conn is teared down """ 20250516192255921 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Received Event IPA_CCM_ID_RESP (ipa.c:120) 20250516192255921 DLMI DEBUG Rx IPA CCM ID_RESP: Unit_ID='0/1/2' MAC_Address='' Location_1='' Location_2='' Equipment_Version='' Software_Version='' Unit_Name='mahlzeit' Serial_Number='' (ipa.c:233) 20250516192255921 DLSS7 NOTICE IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Cannot find any definition for IPA Unit Name 'mahlzeit' (xua_asp_fsm.c:968) 20250516192255921 DLSS7 INFO ipa-asp-loadshare-sender0: connection closed (ss7_asp.c:1159) 20250516192255921 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Received Event SCTP-COMM_DOWN.ind (ss7_asp.c:1165) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: state_chg to ASP_DOWN (xua_asp_fsm.c:1154) 20250516192255922 DLSS7 DEBUG XUA_AS(ipa-as-loadshare-sender){AS_DOWN}: Received Event ASPAS-ASP_DOWN.ind (xua_asp_fsm.c:370) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){ASP_DOWN}: No Layer Manager, dropping M-ASP_DOWN.indication (xua_asp_fsm.c:119) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){ASP_DOWN}: No Layer Manager, dropping M-SCTP_RELEASE.indication (xua_asp_fsm.c:119) Program terminated with signal SIGABRT, Aborted. #0 0x000076bb9898ceec in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #0 0x000076bb9898ceec in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x000076bb9893dfb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x000076bb98928472 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x000076bb98ae6496 in ?? () from /lib/x86_64-linux-gnu/libtalloc.so.2 #4 0x000076bb98b1b869 in msgb_free (m=0x5f957de3e750) at ../../../src_copy/libosmocore/src/core/msgb.c:119 #5 0x000076bb98bab8c8 in ipa_rx_msg_ccm (asp=0x5f957de3da50, msg=0x5f957de3e750) at ../../src_copy/libosmo-sigtran/src/ipa.c:137 #6 0x000076bb98bac135 in ipa_rx_msg (asp=0x5f957de3da50, msg=0x5f957de3e750, sls=0 '\000') at ../../src_copy/libosmo-sigtran/src/ipa.c:321 #7 0x000076bb98bca44f in ss7_asp_ipa_srv_conn_rx_cb (conn=0x5f957ddba4a0, res=49, msg=0x5f957de3e750) at ../../src_copy/libosmo-sigtran/src/ss7_asp.c:895 #8 0x000076bb988efcb1 in stream_srv_iofd_read_cb (iofd=0x5f957ddd8e40, res=49, msg=0x5f957de3e750) at ../../src_copy/libosmo-netif/src/stream_srv.c:732 #9 0x000076bb98b23c3c in iofd_handle_segmented_read (iofd=0x5f957ddd8e40, msg=0x5f957de3e750, rc=49) at ../../../src_copy/libosmocore/src/core/osmo_io.c:357 #10 0x000076bb98b23d2b in iofd_handle_recv (iofd=0x5f957ddd8e40, msg=0x5f957de3e750, rc=49, hdr=0x0) at ../../../src_copy/libosmocore/src/core/osmo_io.c:384 #11 0x000076bb98b257b7 in iofd_poll_ofd_cb_recvmsg_sendmsg (ofd=0x5f957ddd8ef0, what=1) at ../../../src_copy/libosmocore/src/core/osmo_io_poll.c:64 #12 0x000076bb98b25b32 in iofd_poll_ofd_cb_dispatch (ofd=0x5f957ddd8ef0, what=1) at ../../../src_copy/libosmocore/src/core/osmo_io_poll.c:136 #13 0x000076bb98b2907b in poll_disp_fds (n_fd=6) at ../../../src_copy/libosmocore/src/core/select.c:419 #14 0x000076bb98b29191 in _osmo_select_main (polling=0) at ../../../src_copy/libosmocore/src/core/select.c:457 #15 0x000076bb98b291ac in osmo_select_main (polling=0) at ../../../src_copy/libosmocore/src/core/select.c:496 #16 0x00005f9553dd9a21 in main (argc=3, argv=0x7ffe754fac38) at ../../src_copy/libosmo-sigtran/stp/stp_main.c:270 """ Related: OS#6728 (cherry picked from commit dfccd989dbffe418d9ab7b4d3087345636da762d) Change-Id: I4b893078212444c967164a64219c67f6c6a74c37 --- M src/osmo_ss7_asp.c 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 57ebc82..dc60f67 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -802,6 +802,14 @@ int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); + + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); if (res <= 0) { if (res == -EAGAIN) { @@ -824,10 +832,18 @@ int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); unsigned int ppid; int flags; int rc = 0; + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); + /* process the received xUA message */ flags = msgb_sctp_msg_flags(msg); @@ -889,9 +905,17 @@ int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); const struct xua_common_hdr *hdr; int rc; + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); + if (res <= 0) { if (res == -EAGAIN) { msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40403?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: pespin/rel-2.1.0 Gerrit-Change-Id: I4b893078212444c967164a64219c67f6c6a74c37 Gerrit-Change-Number: 40403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025