- gerrit-log - lists.osmocom.org

[M] Change in osmo-sgsn[master]: routing area: introduce ran_type on the RA

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40688?usp=email ) Change subject: routing area: introduce ran_type on the RA ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I59c35f1a4912ff11574bb31e4fe424816993548c Gerrit-Change-Number: 40688 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 01 Aug 2025 14:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: {S1AP,NGAP}_Emulation: Fix using the value of an optional field conta...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40816?usp=email ) Change subject: {S1AP,NGAP}_Emulation: Fix using the value of an optional field containing omit ...................................................................... {S1AP,NGAP}_Emulation: Fix using the value of an optional field containing omit This was triggered in NGAP_Emulation during run of C5G_Tests complete testusite, when running TC_ng_register_ping4_256. Titan apparently doesn't like using a field set as omit in a field of a record during match(). Same fix is applied for S1AP_Emulation since they basically use the same logic. Change-Id: I4812c2e9eeeadc26ad057cd8019f7570e4a16155 --- M library/NGAP_Emulation.ttcn M library/S1AP_Emulation.ttcn 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/40816/1 diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index cd71395..7b7d93d 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -264,6 +264,9 @@ runs on NGAP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { + if (not isvalue(NGapAssociationTable[i].ran_ue_ngap_id)) { + continue; + } if (istemplatekind(ran_id, "omit") or match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { if (istemplatekind(amf_id, "omit")) { diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index d1ac243..55a3380 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -209,6 +209,9 @@ runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { + continue; + } if (istemplatekind(enb_id, "omit") or match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { if (istemplatekind(mme_id, "omit")) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40816?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: I4812c2e9eeeadc26ad057cd8019f7570e4a16155 Gerrit-Change-Number: 40816 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: {S1AP,NGAP}_Emulation: Fix indentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40815?usp=email ) Change subject: {S1AP,NGAP}_Emulation: Fix indentation ...................................................................... {S1AP,NGAP}_Emulation: Fix indentation Change-Id: Ifb2e4e3fc2d3ef4a76f2b0e906b12d0f740e9cdd --- M library/NGAP_Emulation.ttcn M library/S1AP_Emulation.ttcn 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/40815/1 diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 1fb571b..cd71395 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -260,7 +260,7 @@ } private function f_assoc_id_by_ngap_ids(template (omit) AMF_UE_NGAP_ID amf_id, - template (omit) RAN_UE_NGAP_ID ran_id) + template (omit) RAN_UE_NGAP_ID ran_id) runs on NGAP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { @@ -298,7 +298,8 @@ } private function f_ngap_id_table_add(NGAP_ConnHdlr comp_ref, - template (omit) AMF_UE_NGAP_ID amf_id, RAN_UE_NGAP_ID ran_id) + template (omit) AMF_UE_NGAP_ID amf_id, + RAN_UE_NGAP_ID ran_id) runs on NGAP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index ba588df..d1ac243 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -205,7 +205,7 @@ } private function f_assoc_id_by_s1ap_ids(template (omit) MME_UE_S1AP_ID mme_id, - template (omit) ENB_UE_S1AP_ID enb_id) + template (omit) ENB_UE_S1AP_ID enb_id) runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { @@ -243,7 +243,8 @@ } private function f_s1ap_id_table_add(S1AP_ConnHdlr comp_ref, - template (omit) MME_UE_S1AP_ID mme_id, ENB_UE_S1AP_ID enb_id) + template (omit) MME_UE_S1AP_ID mme_id, + ENB_UE_S1AP_ID enb_id) runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40815?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: Ifb2e4e3fc2d3ef4a76f2b0e906b12d0f740e9cdd Gerrit-Change-Number: 40815 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: {S1AP,NGAP}_Emulation: Simplify lookup code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40817?usp=email ) Change subject: {S1AP,NGAP}_Emulation: Simplify lookup code ...................................................................... {S1AP,NGAP}_Emulation: Simplify lookup code Simplify code matching IDs. Explicitly test, log and exit function called with both IDs passed as "omit". Change-Id: I02f33c191d131c6325f3608ceec80be6f036aa84 --- M library/NGAP_Emulation.ttcn M library/S1AP_Emulation.ttcn 2 files changed, 34 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/40817/1 diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 7b7d93d..aa4b485 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -36,6 +36,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from DNS_Helpers all; import from SCTP_Templates all; @@ -262,24 +263,27 @@ private function f_assoc_id_by_ngap_ids(template (omit) AMF_UE_NGAP_ID amf_id, template (omit) RAN_UE_NGAP_ID ran_id) runs on NGAP_Emulation_CT return integer { - var integer i; - for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { + if (istemplatekind(ran_id, "omit") and istemplatekind(amf_id, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected call f_assoc_id_by_ngap_ids(omit, omit)"); + } + for (var integer i := 0; i < sizeof(NGapAssociationTable); i := i+1) { if (not isvalue(NGapAssociationTable[i].ran_ue_ngap_id)) { continue; } - if (istemplatekind(ran_id, "omit") or - match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { - if (istemplatekind(amf_id, "omit")) { - return i; - } else { - if (match(NGapAssociationTable[i].amf_ue_ngap_id, amf_id)) { - return i; - } - } + if (not istemplatekind(ran_id, "omit") and + not match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { + continue; } + /* ran_id matched, check amf_id now: */ + if (not istemplatekind(amf_id, "omit") and + not match(NGapAssociationTable[i].amf_ue_ngap_id, amf_id)) { + continue; + } + return i; } - setverdict(fail, "NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id)); + return -1; /* make ttcn3 compiler happy */ } private function f_assoc_id_by_comp(NGAP_ConnHdlr client) diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 55a3380..b3e7731 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -51,6 +51,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from DNS_Helpers all; @@ -207,24 +208,27 @@ private function f_assoc_id_by_s1ap_ids(template (omit) MME_UE_S1AP_ID mme_id, template (omit) ENB_UE_S1AP_ID enb_id) runs on S1AP_Emulation_CT return integer { - var integer i; - for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (istemplatekind(enb_id, "omit") and istemplatekind(mme_id, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected call f_assoc_id_by_s1ap_ids(omit, omit)"); + } + for (var integer i := 0; i < sizeof(S1apAssociationTable); i := i+1) { if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { continue; } - if (istemplatekind(enb_id, "omit") or - match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { - if (istemplatekind(mme_id, "omit")) { - return i; - } else { - if (match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { - return i; - } - } + if (not istemplatekind(enb_id, "omit") and + not match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + continue; } + /* enb_id matched, check mme_id now: */ + if (not istemplatekind(mme_id, "omit") and + not match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + continue; + } + return i; } - setverdict(fail, "S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id)); + return -1; /* make ttcn3 compiler happy */ } private function f_assoc_id_by_comp(S1AP_ConnHdlr client) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40817?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: I02f33c191d131c6325f3608ceec80be6f036aa84 Gerrit-Change-Number: 40817 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Implement UE-initiated de-registration procedure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email ) Change subject: 5gc: Implement UE-initiated de-registration procedure ...................................................................... 5gc: Implement UE-initiated de-registration procedure Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Related: SYS#7073 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M deps/Makefile M library/NG_NAS_Osmo_Templates.ttcn 4 files changed, 59 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/40819/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 30615f2..0b71059 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -291,6 +291,7 @@ private function f_TC_register() runs on ConnHdlr { f_register(); + f_deregister(); } testcase TC_ng_register() runs on MTC_CT { f_init(); @@ -305,6 +306,7 @@ private function f_TC_periodic_registration_updating() runs on ConnHdlr { f_register(); f_periodic_register_update(); + f_deregister(); } testcase TC_periodic_registration_updating() runs on MTC_CT { f_init(); @@ -322,6 +324,7 @@ f_sleep(1.0); f_ping4(g_pars.ue_pars.run_prog_pars.ping_hostname); f_pdu_sess_release(); + f_deregister(); } testcase TC_ng_register_ping4() runs on MTC_CT { f_init(); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index fe96b45..81ad34f 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -423,6 +423,33 @@ as_ngap_handle_configuration_update(); } +/* 3GPP TS 24.501 5.5.2.2 UE-initiated de-registration procedure, + * 3GPP TS 23.502 4.2.2.3.2 UE-initiated Deregistration */ +function f_deregister() runs on ConnHdlr { + var template (value) NG_NAS_UL_Message_Type nas_ul_msg; + var NG_NAS_DL_Message_Type rx_nas; + + nas_ul_msg := cs_NG_DEREGISTRATION_REQUEST_MO(crs_DeregisterType ('0'B,/* p_SwitchOff */ + '0'B,/* p_ReReg */ + '01'B/* p_Access */), + g_pars.kset_id, + cs_NG_MobileIdentity_Guti(omit, g_pars.ue_pars.guti)); + NGAP.send(nas_ul_msg); + + NGAP.receive(cr_NG_DEREGISTRATION_ACCEPT_MO); + as_ngap_handle_UeContextReleaseCmd(); +} + +private altstep as_ngap_handle_UeContextReleaseCmd() runs on ConnHdlr { + var NGAP_PDU rx_ngap; + + [] NGAP.receive(mw_ngap_initMsg(mw_n2_UEContextReleaseCommand)) -> value rx_ngap { + var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); + var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); + NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(amf_id, ran_id, f_ULI()))); + } +} + /* Handle a PDUSessionResourceSetupRequestTransfer contained inside NGAP InitialContextSetupRequest and return a Result for InitialContextSetupResponse */ private function f_pdu_handle_session_resource_released_item(PDUSessionResourceToReleaseItemRelCmd cmd) runs on ConnHdlr return PDUSessionResourceReleasedItemRelRes { diff --git a/deps/Makefile b/deps/Makefile index 818d610..4dba0a1 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -72,7 +72,7 @@ # Use tag names from 'git describe --tags' or commit hashes. This way we get # exact commits of deps when doing regression testing. -nas_commit= dcb175be8b2d9b4daf3e8a4ebf27da3caae8f7cb +nas_commit= ab43cccb96db6067ffba1c763b47cb25cd61b780 titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index c1c8b44..4f8e8cc 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -405,6 +405,34 @@ } } +/* 24.501 cl. 8.2.12 (UE originating deregister) */ +template (value) NG_NAS_UL_Message_Type +cs_NG_DEREGISTRATION_REQUEST_MO(template (value) DeregisterType p_DeregisterType, + template (value) NAS_KeySetIdentifier p_KSI, + template (value) NG_MobileIdentity p_MobileId) := +{ + deregistration_RequestMO := { + 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_DeregistrationRequest_MO, /* cl. 9.7 M V 1 */ + ngKSI := p_KSI, /* cl. 9.11.3.32 M V 1/2 */ + deregistrationType := p_DeregisterType, /* cl. 9.11.3.20 M V 1/2 */ + ngMobileId := p_MobileId /* cl. 9.11.3.4 M LV 5-? */ + } +} + +/* 24.501 cl. 8.2.13 De-registration accept (UE originating de-registration) */ +template (present) NG_NAS_DL_Message_Type cr_NG_DEREGISTRATION_ACCEPT_MO := +{ + deregistration_Accept := { + 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_DeregistrationAccept_MO /* cl. 9.7 M V 1 */ + } +}; + /* 24.501 cl. 8.2.19 */ template (present) NG_NAS_DL_Message_Type cr_NG_CONFIGURATION_UPDATE_COMMAND(template ConfigUpdateInd p_ConfigUpdateInd := *, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?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: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Gerrit-Change-Number: 40819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?usp=email ) Change subject: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete ...................................................................... NGAP_Templates: Fixes and improvements for UEContextReleaseComplete The existing templates for UEContextReleaseComplete were completelly wrong, probably due to copy-paste when introducing them. This commit fixes all those problems and allows passing optional parameters. * procedureCode was wrong * Criticality of several fields was wrong * Type of resource list was wrong, and marked as mandatory while it was optional. Change-Id: I50da7cd4cb15d8e6b2c68b21a4e4be93e3973593 --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 154 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/40818/1 diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index 5ffe2a5..3dec8ef 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -1913,36 +1913,88 @@ /** * @see ETSI TS 138 413 V16.12.0 (2023-05) Clause 9.2.2.6 UE CONTEXT RELEASE COMPLETE */ - template (value) SuccessfulOutcome m_n2_UEContextReleaseComplete( - in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, - in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, - in template (value) PDUSessionResourceSetupListSURes p_pDUSessionResourceSetupListSURes - ) := { - procedureCode := id_InitialContextSetup, + template (value) SuccessfulOutcome m_n2_UEContextReleaseComplete(template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID) + := { + procedureCode := id_UEContextRelease, criticality := reject, value_ := { - PDUSessionResourceSetupResponse := { - protocolIEs := { - { - id := id_AMF_UE_NGAP_ID, - criticality := reject, - value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } - }, - { - id := id_RAN_UE_NGAP_ID, - criticality := reject, - value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } - }, - { - id := id_PDUSessionResourceSetupListSURes, - criticality := reject, - value_ := { PDUSessionResourceSetupListSURes := p_pDUSessionResourceSetupListSURes } - } - } - } + UEContextReleaseComplete := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := ignore, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := ignore, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + } + } + } } } // End of template m_n2_UEContextReleaseComplete + function f_ts_n2_UEContextReleaseComplete(template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + template (omit) UserLocationInformation p_userLocationInformation := omit, + template (omit) InfoOnRecommendedCellsAndRANNodesForPaging p_infoOnRecommendedCellsAndRANNodesForPaging := omit, + template (omit) PDUSessionResourceListCxtRelCpl p_pDUSessionResourceListCxtRelCpl := omit, + template (omit) CriticalityDiagnostics p_criticalityDiagnostics := omit, + template (omit) PagingAssisDataforCEcapabUE p_pagingAssisDataforCEcapabUE := omit) + return template (value) SuccessfulOutcome { + + var template (value) SuccessfulOutcome pdu := m_n2_UEContextReleaseComplete(p_amfUeNgapID, p_ranUeNgapID); + var integer idx := lengthof(pdu.value_.UEContextReleaseComplete.protocolIEs); + + if (isvalue(p_userLocationInformation)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_UserLocationInformation, + criticality := ignore, + value_ := { UserLocationInformation := p_userLocationInformation } + }; + idx := idx + 1; + } + + if (isvalue(p_infoOnRecommendedCellsAndRANNodesForPaging)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_InfoOnRecommendedCellsAndRANNodesForPaging, + criticality := reject, + value_ := { InfoOnRecommendedCellsAndRANNodesForPaging := p_infoOnRecommendedCellsAndRANNodesForPaging } + }; + idx := idx + 1; + } + + if (isvalue(p_pDUSessionResourceListCxtRelCpl)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PDUSessionResourceListCxtRelCpl, + criticality := reject, + value_ := { PDUSessionResourceListCxtRelCpl := p_pDUSessionResourceListCxtRelCpl } + }; + idx := idx + 1; + } + + if (isvalue(p_criticalityDiagnostics)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_CriticalityDiagnostics, + criticality := ignore, + value_ := { CriticalityDiagnostics := p_criticalityDiagnostics } + }; + idx := idx + 1; + } + + if (isvalue(p_pagingAssisDataforCEcapabUE)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PagingAssisDataforCEcapabUE, + criticality := ignore, + value_ := { PagingAssisDataforCEcapabUE := p_pagingAssisDataforCEcapabUE } + } + idx := idx + 1; + } + return pdu; + } + } // End of group Send group Receive { @@ -1950,36 +2002,88 @@ /** * @see ETSI TS 138 413 V16.12.0 (2023-05) Clause 9.2.2.6 UE CONTEXT RELEASE COMPLETE */ - template (present) SuccessfulOutcome mw_n2_UEContextReleaseComplete( - template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?, - template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?, - template (present) PDUSessionResourceSetupListSURes p_pDUSessionResourceSetupListSURes := ? - ) := { - procedureCode := id_InitialContextSetup, + template (present) SuccessfulOutcome mw_n2_UEContextReleaseComplete(template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?, + template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?) + := { + procedureCode := id_UEContextRelease, criticality := reject, value_ := { - PDUSessionResourceSetupResponse := { - protocolIEs := { - { - id := id_AMF_UE_NGAP_ID, - criticality := reject, - value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } - }, - { - id := id_RAN_UE_NGAP_ID, - criticality := reject, - value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } - }, - { - id := id_PDUSessionResourceSetupListSURes, - criticality := reject, - value_ := { PDUSessionResourceSetupListSURes := p_pDUSessionResourceSetupListSURes } - } - } - } + UEContextReleaseComplete := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := ignore, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := ignore, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + } + } + } } } // End of template mw_n2_UEContextReleaseComplete + function f_tr_n2_UEContextReleaseComplete(template (present) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (present) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + template UserLocationInformation p_userLocationInformation := omit, + template InfoOnRecommendedCellsAndRANNodesForPaging p_infoOnRecommendedCellsAndRANNodesForPaging := omit, + template PDUSessionResourceListCxtRelCpl p_pDUSessionResourceListCxtRelCpl := omit, + template CriticalityDiagnostics p_criticalityDiagnostics := omit, + template PagingAssisDataforCEcapabUE p_pagingAssisDataforCEcapabUE := omit) + return template (present) SuccessfulOutcome { + + var template (present) SuccessfulOutcome pdu := m_n2_UEContextReleaseComplete(p_amfUeNgapID, p_ranUeNgapID); + var integer idx := lengthof(pdu.value_.UEContextReleaseComplete.protocolIEs); + + if (not istemplatekind(p_userLocationInformation, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_UserLocationInformation, + criticality := ignore, + value_ := { UserLocationInformation := p_userLocationInformation } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_infoOnRecommendedCellsAndRANNodesForPaging, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_InfoOnRecommendedCellsAndRANNodesForPaging, + criticality := reject, + value_ := { InfoOnRecommendedCellsAndRANNodesForPaging := p_infoOnRecommendedCellsAndRANNodesForPaging } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_pDUSessionResourceListCxtRelCpl, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PDUSessionResourceListCxtRelCpl, + criticality := reject, + value_ := { PDUSessionResourceListCxtRelCpl := p_pDUSessionResourceListCxtRelCpl } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_criticalityDiagnostics, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_CriticalityDiagnostics, + criticality := ignore, + value_ := { CriticalityDiagnostics := p_criticalityDiagnostics } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_pagingAssisDataforCEcapabUE, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PagingAssisDataforCEcapabUE, + criticality := ignore, + value_ := { PagingAssisDataforCEcapabUE := p_pagingAssisDataforCEcapabUE } + } + idx := idx + 1; + } + return pdu; + } + } // End of group Receive } // End of group UE_CONTEXT_RELEASE_COMPLETE -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?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: I50da7cd4cb15d8e6b2c68b21a4e4be93e3973593 Gerrit-Change-Number: 40818 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[S] Change in osmo-uecups[master]: cosmetic: Improve comments on cancellable thread safety

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email ) Change subject: cosmetic: Improve comments on cancellable thread safety ...................................................................... cosmetic: Improve comments on cancellable thread safety * Move the comment explaining safety measures to the top of the thread function * Document that special care must be taken in mutual exclusion zones within the thread code. Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 21 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 7892d4e..87d333c 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -124,11 +124,16 @@ } } -/* one thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) - * IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ +/* One thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *gtp_endpoint_thread(void *arg) { struct gtp_endpoint *ep = (struct gtp_endpoint *)arg; diff --git a/daemon/tun_device.c b/daemon/tun_device.c index ee4fbcc..40b6ec3 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -212,7 +212,16 @@ return rc; } -/* one thread for reading from each TUN device (TUN -> GTP encapsulation) */ +/* One thread for reading from each TUN device (TUN -> GTP encapsulation) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *tun_device_thread(void *arg) { struct tun_device *tun = (struct tun_device *)arg; @@ -223,10 +232,6 @@ uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); - /* IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ snprintf(thread_name, sizeof(thread_name), "Rx%s", tun->devname); pthread_setname_np(pthread_self(), thread_name); @@ -269,6 +274,7 @@ continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); + /* pthread_rwlock_unlock() was called inside tx_gtp1u_pkt(). */ if (rc < 0) { LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[S] Change in osmo-uecups[master]: tun_device: Introduce helper macro LOGTUN_NC()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email ) Change subject: tun_device: Introduce helper macro LOGTUN_NC() ...................................................................... tun_device: Introduce helper macro LOGTUN_NC() Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 --- M daemon/tun_device.c 1 file changed, 14 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/daemon/tun_device.c b/daemon/tun_device.c index b32c08a..ee4fbcc 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -46,6 +46,16 @@ #define LOGTUN(tun, lvl, fmt, args ...) \ LOGP(DTUN, lvl, "%s: " fmt, (tun)->devname, ## args) +/* LOGTUN "No Cancel": Use within the pthread which can be pthread_cancel()ed, in + * order to avoid exiting with the logging mutex held and causing a deadlock afterwards. */ +#define LOGTUN_NC(ep, lvl, fmt, args ...) \ + do { \ + int _old_cancelst_unused; \ + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &_old_cancelst_unused); \ + LOGTUN(tun, lvl, fmt, ## args); \ + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &_old_cancelst_unused); \ + } while (0) + /* extracted information from a packet */ struct pkt_info { struct sockaddr_storage saddr; @@ -211,7 +221,6 @@ /* Make sure "buffer" below ends up aligned to 4byte so that it can access struct iphdr in a 4-byte aligned way. */ const size_t payload_off_4byte_aligned = ((sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr)) + 3) & (~0x3); uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; - int old_cancelst_unused; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); /* IMPORTANT!: All logging functions in this function block must be called with @@ -231,18 +240,14 @@ /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); exit(1); } nread = rc; rc = parse_pkt(&pinfo, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", - osmo_hexdump(buffer, nread)); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", osmo_hexdump(buffer, nread)); continue; } @@ -260,15 +265,12 @@ getnameinfo((const struct sockaddr *)&pinfo.saddr, sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 1 day

1
0
0 0

[S] Change in osmo-uecups[master]: cosmetic: Improve comments on cancellable thread safety

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email ) Change subject: cosmetic: Improve comments on cancellable thread safety ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 13:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 1 day

1
0
0 0

[S] Change in osmo-uecups[master]: tun_device: Introduce helper macro LOGTUN_NC()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email ) Change subject: tun_device: Introduce helper macro LOGTUN_NC() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 13:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 1 day

1
0
0 0

2025

2024

2023

2022

gerrit-log