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

[XS] Change in osmo-uecups[master]: tun_device: Fix Tx uninitialized gtpu ext hdr fields

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40790?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: tun_device: Fix Tx uninitialized gtpu ext hdr fields ...................................................................... tun_device: Fix Tx uninitialized gtpu ext hdr fields Change-Id: Ie1d4b2d8cd659fd23811c5330d8ae0e43ff0a0d2 --- M daemon/tun_device.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/90/40790/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie1d4b2d8cd659fd23811c5330d8ae0e43ff0a0d2 Gerrit-Change-Number: 40790 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>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by pespin

Attention is currently required from: osmith. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by osmith, Verified+1 by Jenkins Builder Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... gtp_endpoint: Avoid deadlocks logging while thread is cancelled We cannot garantee that LOGP will not end up calling a syscall which can be a cancellation point. Since the syscall will be probably called while having the logging mutex locked, an eventual cancellation of the thread would leave the logging mutex locked forever, hence making all other threads deadlock as soon as they try to write anything to the log. Similar to what's already done in tun_device_thread(). Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb --- M daemon/gtp_endpoint.c 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/88/40788/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-uecups[master]: Set thread names

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Set thread names ...................................................................... Set thread names Change-Id: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/89/40789/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 Gerrit-Change-Number: 40789 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>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email ) Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... Patch Set 1: (2 comments) File daemon/gtp_endpoint.c: https://gerrit.osmocom.org/c/osmo-uecups/+/40788/comment/4b9ea98c_030ac50c?… : PS1, Line 89: LOGEP(ep, LOGL_NOTICE, "Short GTP Message according to flags 0x%02x: %lu < len=%u\n", > missing `pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused);` before this line? Done https://gerrit.osmocom.org/c/osmo-uecups/+/40788/comment/890a12ea_8facbc13?… : PS1, Line 96: LOGEP(ep, LOGL_NOTICE, "Short GTP Message according to flags 0x%02x: %lu < len=%u\n", > missing `pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused);` before this line? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?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: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:42:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_ng_register_ping4_256

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40786?usp=email ) Change subject: 5gc: Introduce test TC_ng_register_ping4_256 ...................................................................... 5gc: Introduce test TC_ng_register_ping4_256 open5gs-dbctl tool is called in batches of multiple IMSIs to speed up setup, since each call takes fractions of seconds to complete. mongosh called by open5gs-dbctl actually uses quite a lot of CPU and RAM resources, hence limit the amount of parallel runs to a fair amount (eg. running the 256 of them in parallel froze my workstation with 16GB of RAM). Change-Id: I7282fa3c1a474c4b7dceeb5e358547dcdbd1fea6 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/create_test_subscribers.sh M 5gc/expected-results.xml M library/NGAP_Emulation.ttcn 5 files changed, 51 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 4cda45f..9eb6f30 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -49,9 +49,6 @@ import from ConnHdlr all; -/* (maximum) number of emulated UEs */ -const integer NUM_UE := 1; - modulepar { /* NG-C interface */ charstring mp_5gc_ngap_ip := "127.0.0.1"; @@ -81,16 +78,17 @@ ping_hostname := mp_ping_hostname } -template (value) UeParams ts_UeParams(integer imsi_suffix) := +template (value) UeParams ts_UeParams(integer idx) := { - imsi := f_concat_pad(lengthof(mp_imsi), substr(mp_imsi, 0, lengthof(mp_imsi) - 6), imsi_suffix), + idx := idx, + imsi := f_concat_pad(lengthof(mp_imsi), substr(mp_imsi, 0, lengthof(mp_imsi) - 6), idx), imeisv := f_rnd_imeisv(), usim_key := mp_usim_key, usim_opc := mp_usim_opc, apn := mp_apn, - run_prog_pars := ts_RunProgParams(imsi_suffix), + run_prog_pars := ts_RunProgParams(idx), ran_gtpu_ip := mp_local_gtpu_ip, - ran_gtpu_teid := int2oct(imsi_suffix + 1, 4), + ran_gtpu_teid := int2oct(idx + 1, 4), cn_gtpu_ip := omit, cn_gtpu_teid := omit, qfi := omit, @@ -108,8 +106,6 @@ port GTP1UEM_PT TEID0; timer g_Tguard := 30.0; - - var UeParams g_ue_pars[NUM_UE]; } /* send incoming unit data messages (like reset) to global NGAP_UNIT port */ @@ -156,19 +152,11 @@ NGAP_UNIT[num].receive(NGAPEM_Event:{up_down:=NGAPEM_EVENT_UP}); } -private function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { - - uep := valueof(ts_UeParams(imsi_suffix)); -} - private 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], 1000*imsi_suffix + i); - } } private function f_init_gtp1u() runs on MTC_CT { @@ -198,7 +186,7 @@ runs on MTC_CT return ConnHdlrPars { var ConnHdlrPars pars := { ngran_pars := g_ngran_pars, - ue_pars := g_ue_pars[ue_idx], + ue_pars := valueof(ts_UeParams(ue_idx)), c5g_idx := 0, kset_id := valueof(cs_NAS_KeySetIdentifier_lv(tsc_NasKsi_NoKey, '0'B)) }; @@ -329,6 +317,23 @@ vc_conn := f_start_handler_with_pars(refers(f_TC_register_ping4), pars); vc_conn.done; } +testcase TC_ng_register_ping4_256() runs on MTC_CT { + var ConnHdlr vc_conn[256]; + var integer i; + + f_init(); + f_ngap_setup(0); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + var ConnHdlrPars pars := f_init_pars(ue_idx := i); + vc_conn[i] := f_start_handler_with_pars(refers(f_TC_register_ping4), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + control { execute( TC_ng_setup() ); @@ -336,6 +341,7 @@ execute( TC_ng_setup_wrong_tac() ); execute( TC_ng_register() ); execute( TC_ng_register_ping4() ); + execute( TC_ng_register_ping4_256() ); } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 6c816fe..144b00b 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -67,6 +67,7 @@ /* parameters of emulated UE */ type record UeParams { + integer idx, HEX15n imsi, HEX16n imeisv, octetstring usim_key, @@ -367,7 +368,7 @@ f_SUCI_IMSI()), p_UESecurityCap := f_UE_SecurityCapability()); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); - tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.c5g_idx, + tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.ue_pars.idx, nas_pdu, /* Registration request */ f_ULI(), mo_Signalling)); diff --git a/5gc/create_test_subscribers.sh b/5gc/create_test_subscribers.sh index a400e0f..28a7b6f 100755 --- a/5gc/create_test_subscribers.sh +++ b/5gc/create_test_subscribers.sh @@ -17,11 +17,25 @@ sleep 1 done -# Create a test subscriber with IMSI=001010000000000 -$DBCTL_CMD add 999700000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +NUM_SUBCRS=256 +get_subscr_imsi() { + subscr_idx=$1 + printf "999700000000%03u" "$subscr_idx" +} -# 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 999700000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 -$DBCTL_CMD subscriber_status 999700000000001 1 7 +# Create a test subscriber with IMSI=001010000000000 +DBCTL_PARALLEL_JOBS=20 +idx=0 +while test "$idx" -lt "$NUM_SUBCRS"; do + remain="$((NUM_SUBCRS - idx))" + if test "$remain" -gt "$DBCTL_PARALLEL_JOBS"; then + iterations=$DBCTL_PARALLEL_JOBS + else + iterations=$remain + fi + for it in $(seq "$iterations"); do + $DBCTL_CMD add "$(get_subscr_imsi $idx)" 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 & + idx=$((idx + 1)) + done + wait $(jobs -p) +done diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index 01d53a1..98dee58 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -5,4 +5,5 @@ <testcase classname='C5G_Tests' name='TC_ng_setup' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_ng_register_ping4_256' time='MASKED'/> </testsuite> diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 9fbaddc..1fb571b 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -168,11 +168,11 @@ * to send where with CLIENT.send() to vc_conn */ port NGAP_Conn_PT NGAP_CLIENT; /* currently tracked connections */ - var AssociationData NGapAssociationTable[16]; + var AssociationData NGapAssociationTable[256]; /* pending expected NGAP Association (UE oriented) */ - var ExpectData NGapExpectTable[8]; + var ExpectData NGapExpectTable[256]; /* pending expected NGAP PDU */ - var ExpectDataProc NGapExpectTableProc[8]; + var ExpectDataProc NGapExpectTableProc[256]; /* procedure based port to register for incoming connections */ port NGAPEM_PROC_PT NGAP_PROC; /* test port for unit data messages */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7282fa3c1a474c4b7dceeb5e358547dcdbd1fea6 Gerrit-Change-Number: 40786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: NGAP_Functions.ttcn: Fix wrong offset of NGAP_ID_pair in uEContextRel...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40780?usp=email ) Change subject: NGAP_Functions.ttcn: Fix wrong offset of NGAP_ID_pair in uEContextReleaseCommand ...................................................................... NGAP_Functions.ttcn: Fix wrong offset of NGAP_ID_pair in uEContextReleaseCommand Change-Id: I2302bebf75530f574a7fe2647b1eafcc4d5fd7df --- M library/NGAP_Functions.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index f6c1389..910a71f 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -72,7 +72,7 @@ return im.value_.initialContextSetupRequest.protocolIEs[1].value_.RAN_UE_NGAP_ID; } case (id_UEContextRelease) { - return im.value_.uEContextReleaseCommand.protocolIEs[1].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.rAN_UE_NGAP_ID; + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.rAN_UE_NGAP_ID; } /* TODO */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2302bebf75530f574a7fe2647b1eafcc4d5fd7df Gerrit-Change-Number: 40780 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: Comment out debugging for NGAP/5G-NAS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?usp=email ) Change subject: library: Comment out debugging for NGAP/5G-NAS ...................................................................... library: Comment out debugging for NGAP/5G-NAS The current NGAP and 5G auth code is now working fine, so disable debug logging. Keep it commented out so it can be re-enabled at any time if some related topic needs to be debugged (will eventually happen). Change-Id: I4250766644742f0fd11ca5e24b1a1a581dc81b4b --- M library/NGAP_Emulation.ttcn M library/milenage/milenage.c 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 4cb2f05..9fbaddc 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -143,7 +143,7 @@ NGapExpectTable[i].amf_id := omit; NGapExpectTable[i].ran_id := omit; NGapExpectTable[i].vc_conn := null; - log("Found Expect[", i, "] for ", msg, " handled at ", ret); + //log("Found Expect[", i, "] for ", msg, " handled at ", ret); return ret; } } @@ -222,18 +222,18 @@ template (omit) RAN_UE_NGAP_ID ran_id) runs on NGAP_Emulation_CT return boolean { var integer i; - log("f_ngap_ids_known(",amf_id,", ",ran_id,")"); + //log("f_ngap_ids_known(",amf_id,", ",ran_id,")"); for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { - log("tbl[",i,"]: amf=", NGapAssociationTable[i].amf_ue_ngap_id, - ", ran=", 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) { - log("skipping empty ", i); + //log("skipping empty ", i); continue; } if (NGapAssociationTable[i].amf_ue_ngap_id == omit) { - log("entry ", i, " has no AMF ID yet (ran=", NGapAssociationTable[i].ran_ue_ngap_id); + //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)) { diff --git a/library/milenage/milenage.c b/library/milenage/milenage.c index d079a3d..f7a6f74 100644 --- a/library/milenage/milenage.c +++ b/library/milenage/milenage.c @@ -90,7 +90,7 @@ return 0; } -#define DEBUG +//#define DEBUG #ifdef DEBUG void hexdump(const char *text, const uint8_t *data, int len) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4250766644742f0fd11ca5e24b1a1a581dc81b4b Gerrit-Change-Number: 40785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Implement PDU Session Release procedure

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40779?usp=email ) Change subject: 5gc: Implement PDU Session Release procedure ...................................................................... 5gc: Implement PDU Session Release procedure Related: SYS#7073 Change-Id: If79cb0c97008e7a9885bb548a3d2e67e41ba170f --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M library/NGAP_Functions.ttcn M library/NG_NAS_Functions.ttcn M library/NG_NAS_Osmo_Templates.ttcn M library/NG_NAS_Osmo_Types.ttcn 6 files changed, 181 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index ff6e43f..4cda45f 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -315,10 +315,10 @@ private function f_TC_register_ping4() runs on ConnHdlr { f_register(); - f_pdu_sess_create_tun(); + f_pdu_sess_establish(); f_sleep(1.0); f_ping4(g_pars.ue_pars.run_prog_pars.ping_hostname); - f_pdu_sess_delete_tun(); + f_pdu_sess_release(); } testcase TC_ng_register_ping4() runs on MTC_CT { f_init(); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 2e3bedc..6c816fe 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -41,6 +41,7 @@ import from NG_NAS_MsgContainers all; import from NG_NAS_Templates all; +import from NG_NAS_Osmo_Types all; import from NG_NAS_Osmo_Templates all; import from NG_NAS_Functions all; import from NG_CryptoFunctions all; @@ -323,7 +324,7 @@ } } -private function f_pdu_sess_establish() runs on ConnHdlr { +function f_pdu_sess_establish() runs on ConnHdlr { var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var NAS_PDU nas_pdu; var NG_NAS_DL_Message_Type rx_nas, inner_nas; @@ -349,6 +350,8 @@ g_pars.ue_pars.ue_ip := f_inet_ntoa(inner_nas.pdu_Session_Establishment_Accept.pduAddress.adressInfo); log("5GC assigned CN GTPU Address: ", g_pars.ue_pars.cn_gtpu_ip, " TEID: ", g_pars.ue_pars.cn_gtpu_teid); log("5GC assigned UE IP address: ", g_pars.ue_pars.ue_ip); + + f_pdu_sess_create_tun(); } function f_register() runs on ConnHdlr { @@ -387,8 +390,100 @@ NGAP.send(cs_NG_REGISTRATION_COMPLETE); as_ngap_handle_configuration_update(); +} - f_pdu_sess_establish(); +/* 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 +{ + var PDUSessionResourceReleasedItemRelRes resp; + var NAS_CauseValue_Type nas_cause; + + nas_cause := oct2bit(cmd.pDUSessionResourceReleaseCommandTransfer); + + g_pars.ue_pars.cn_gtpu_ip := omit; + g_pars.ue_pars.cn_gtpu_teid := omit; + + /* Prepare Response for it: */ + resp := valueof(m_pDUSessionResourceReleasedItemRelRes(cmd.pDUSessionID, bit2oct(nas_cause))); + return resp; +} + +private function f_pdu_handle_session_resource_released_list(PDUSessionResourceToReleaseListRelCmd li_cmd) runs on ConnHdlr return PDUSessionResourceReleasedListRelRes +{ + var PDUSessionResourceReleasedListRelRes li_resp; + for (var integer i := 0; i < lengthof(li_cmd); i := i + 1) { + var PDUSessionResourceReleasedItemRelRes it_resp; + it_resp := f_pdu_handle_session_resource_released_item(li_cmd[i]); + if (i == 0) { /* min 1 item in list doesn't allow previously allocating an empty list */ + li_resp := { it_resp }; + } else { + li_resp := li_resp & { it_resp }; + } + } + return li_resp; +} + +private altstep as_ngap_handle_PDUSessionReleaseCommand() runs on ConnHdlr { + var NGAP_PDU rx_ngap; + + [] NGAP.receive(mw_ngap_initMsg(f_tr_n2_PDUSessionResourceReleaseCommand(?, ?, ?, ?))) -> 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)); + var PDUSessionResourceReleaseCommand rel_cmd := rx_ngap.initiatingMessage.value_.PDUSessionResourceReleaseCommand; + var PDUSessionResourceReleasedListRelRes resources; + + for (var integer i := 0; i < lengthof(rel_cmd.protocolIEs); i := i + 1) { + if (rel_cmd.protocolIEs[i].id != id_PDUSessionResourceToReleaseListRelCmd) { + continue; + } + var PDUSessionResourceToReleaseListRelCmd li := rel_cmd.protocolIEs[i].value_.pDUSessionResourceToReleaseListRelCmd; + resources := f_pdu_handle_session_resource_released_list(li); + } + NGAP.send(m_ngap_succMsg(m_n2_PDUSessionResourceReleaseResponse(amf_id, ran_id, resources))); + } +} + +function f_pdu_sess_release() runs on ConnHdlr { + var template (value) NG_NAS_UL_Message_Type nas_ul_msg; + var NAS_PDU nas_pdu; + var NG_NAS_DL_Message_Type rx_nas, inner_nas; + var OCT1 pdu_sess_id := '01'O; + var ProcedureTransactionIdentifier pti := '02'O; + var NAS_CauseValue_Type cause_val := c_5GSM_Cause_RegularDeactivation; + + nas_ul_msg := cs_NG_PDU_SESSION_RELEASE_REQUEST(cs_NG_PDU_SessionIdV(pdu_sess_id), pti, + p_Cause := cs_GMM_GSM_Cause('59'O, cause_val)); + nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); + nas_ul_msg := cs_NG_UL_NAS_TRANSPORT(cs_PayloadContainerType(tsc_PayloadContainerESMMsg), + cs_PayloadContainerLV(nas_pdu), + p_PDU_SessionId := cs_NG_PDU_SessionIdTV(pdu_sess_id), + p_RequestType := cs_NG_Request_TypeTV('001'B), + p_DNN := cs_DNN_TLV(f_enc_dns_hostname(g_pars.ue_pars.apn))); + NGAP.send(nas_ul_msg); + as_ngap_handle_PDUSessionReleaseCommand(); + + /* 5G-NAS PDU Session Release Command: This DL NAS arrives contained in NGAP PDUSessionReleaseCommand handled above: */ + NGAP.receive(cr_NG_DL_NAS_TRANSPORT) -> value rx_nas; + inner_nas := f_dec_NG_NAS_DL_Message_Payload_Container(rx_nas.dl_Nas_Transport.payloadContainerType.container, + rx_nas.dl_Nas_Transport.payload.payload); + if (not match(inner_nas, cr_NG_PDU_SESSION_RELEASE_COMMAND(cs_NG_PDU_SessionIdV(pdu_sess_id), pti, + cs_GMM_GSM_Cause(omit, cause_val)))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected decoded NAS Payload Container ", inner_nas)); + } + + g_pars.ue_pars.qfi := omit; + g_pars.ue_pars.ue_ip := omit; + + nas_ul_msg := cs_NG_PDU_SESSION_RELEASE_COMPLETE(cs_NG_PDU_SessionIdV(pdu_sess_id), pti, + p_Cause := cs_GMM_GSM_Cause('59'O, cause_val)); + nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); + nas_ul_msg := cs_NG_UL_NAS_TRANSPORT(cs_PayloadContainerType(tsc_PayloadContainerESMMsg), + cs_PayloadContainerLV(nas_pdu), + p_PDU_SessionId := cs_NG_PDU_SessionIdTV(pdu_sess_id)); + NGAP.send(nas_ul_msg); + + f_pdu_sess_delete_tun(); } function f_pdu_sess_create_tun() runs on ConnHdlr { diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index 910a71f..3b19d90 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -31,6 +31,9 @@ case (id_UEContextRelease) { return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.aMF_UE_NGAP_ID; } + case (id_PDUSessionResourceRelease) { + return im.value_.pDUSessionResourceReleaseCommand.protocolIEs[0].value_.aMF_UE_NGAP_ID; + } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { @@ -74,6 +77,9 @@ case (id_UEContextRelease) { return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_NGAP_IDs.uE_NGAP_ID_pair.rAN_UE_NGAP_ID; } + case (id_PDUSessionResourceRelease) { + return im.value_.pDUSessionResourceReleaseCommand.protocolIEs[1].value_.rAN_UE_NGAP_ID; + } /* TODO */ } } else if (ischosen(ngap.successfulOutcome)) { @@ -144,7 +150,16 @@ } } return omit; + } + case (id_PDUSessionResourceRelease) { + var PDUSessionResourceReleaseCommand msg := im.value_.PDUSessionResourceReleaseCommand; + 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_Functions.ttcn b/library/NG_NAS_Functions.ttcn index 0fbfa75..c6ae81f 100644 --- a/library/NG_NAS_Functions.ttcn +++ b/library/NG_NAS_Functions.ttcn @@ -56,6 +56,8 @@ } else if (ischosen(sm.pdu_Session_Modification_Command)) { ret.pdu_Session_Modification_Command := sm.pdu_Session_Modification_Command; } else if (ischosen(sm.pdu_Session_Modification_Reject)) { + ret.pdu_Session_Modification_Reject := sm.pdu_Session_Modification_Reject; + } else if (ischosen(sm.pdu_Session_Release_Command)) { ret.pdu_Session_Release_Command := sm.pdu_Session_Release_Command; } else if (ischosen(sm.pdu_Session_Release_Reject)) { ret.pdu_Session_Release_Reject := sm.pdu_Session_Release_Reject; diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index f417fcc..c1c8b44 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -628,4 +628,66 @@ } } +/* 24.501 cl. 8.3.12 */ +template (value) NG_NAS_UL_Message_Type +cs_NG_PDU_SESSION_RELEASE_REQUEST(template (value) NG_PDU_SessionId p_PDU_SessionId, + template (value) ProcedureTransactionIdentifier p_PTI, + template (omit) GMM_GSM_Cause p_Cause := omit, + template (omit) ExtdProtocolConfigOptions p_ExtdPCO := omit) := +{ + pdu_Session_Release_Request := { + protocolDiscriminator := tsc_EPD_GSM, /* cl. 9.2 M V 1 */ + pduSessionId := p_PDU_SessionId, /* cl. 9.4 M V 1 */ + procedureTransactionIdentifier := p_PTI, /* cl. 9.6 M V 1 */ + messageType := tsc_MT_NG_PDUSessionReleaseRequest, /* cl. 9.7 M V 1 */ + gsmCause := p_Cause, /* cl. 9.11.4.2 O TV 2 IEI=59 */ + extdProtocolConfigurationOptions := p_ExtdPCO /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ + } +}; + +/* 24.501 cl. 8.3.14 */ +template (present) NG_NAS_DL_Message_Type +cr_NG_PDU_SESSION_RELEASE_COMMAND(template (present) NG_PDU_SessionId p_PDU_SessionId := ?, + template (present) ProcedureTransactionIdentifier p_PTI := ?, + template (present) GMM_GSM_Cause p_Cause := ?, + template GPRS_Timer3 p_BackOffTimer := *, + template EAP_Message p_EAP := *, + template NGSM_CongestionReattemptInd p_NGSM_CongestionReattemptInd := *, // @sic R5s190543 sic@ + template ExtdProtocolConfigOptions p_ExtdPCO := *, + template AccessType p_AccessType := *, + template ServiceLvlAAContainer p_ServiceLvlAA := *) := +{ + /* 24.501 cl. 8.3.14 */ + pdu_Session_Release_Command := { + protocolDiscriminator := tsc_EPD_GSM, /* cl. 9.2 M V 1 */ + pduSessionId := p_PDU_SessionId, /* cl. 9.4 M V 1 */ + procedureTransactionIdentifier := p_PTI, /* cl. 9.6 M V 1 */ + messageType := tsc_MT_NG_PDUSessionReleaseCommand, /* cl. 9.7 M V 1 */ + gsmCause := p_Cause, /* cl. 9.11.4.2 M V 1 */ + backOffTimerValue := p_BackOffTimer, /* cl. 9.11.2.5 O TLV 3 IEI=37 */ + eapMessage := p_EAP, /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */ + ngsmCongestionReattemptInd := p_NGSM_CongestionReattemptInd, /* cl. 9.11.4.2A O TLV 3 IEI=61 Jun19 @sic R5s190543 sic@ */ + extdProtocolConfigurationOptions := p_ExtdPCO, /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ + accessType := p_AccessType, /* cl. 9.11.2.1A O TV 1 IEI=D Sep20 @sic R5s201387 Baseline Moving sic@ */ + serviceLvlAA := p_ServiceLvlAA /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */ + } +}; + +/* 24.501 cl. 8.3.15 */ +template (value) NG_NAS_UL_Message_Type +cs_NG_PDU_SESSION_RELEASE_COMPLETE(template (value) NG_PDU_SessionId p_PDU_SessionId, + template (value) ProcedureTransactionIdentifier p_PTI, + template (omit) GMM_GSM_Cause p_Cause := omit, + template (omit) ExtdProtocolConfigOptions p_ExtdPCO := omit) := +{ + pdu_Session_Release_Complete := { + protocolDiscriminator := tsc_EPD_GSM, /* cl. 9.2 M V 1 */ + pduSessionId := p_PDU_SessionId, /* cl. 9.4 M V 1 */ + procedureTransactionIdentifier := p_PTI, /* cl. 9.6 M V 1 */ + messageType := tsc_MT_NG_PDUSessionReleaseComplete, /* cl. 9.7 M V 1 */ + gsmCause := p_Cause, /* cl. 9.11.4.2 O TV 2 IEI=59 */ + extdProtocolConfigurationOptions := p_ExtdPCO /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */ + } +} + } diff --git a/library/NG_NAS_Osmo_Types.ttcn b/library/NG_NAS_Osmo_Types.ttcn index 1e76a98..c152ad6 100644 --- a/library/NG_NAS_Osmo_Types.ttcn +++ b/library/NG_NAS_Osmo_Types.ttcn @@ -37,6 +37,9 @@ const BIT4 c_PayloadContainer_SLPP_Message_Container := '1100'B; const BIT4 c_PayloadContainer_Multiple_Payloads := '1111'B; +const NAS_CauseValue_Type c_5GSM_Cause_RegularDeactivation := '00100100'B; + + /* This is a subset of the msgs in NG_NAS_DL_Message_Type. The subset is formed * by Session Management messages, see 3GPP TS 24.501 clause 6 and clause 8.3. * This is needed to properly decode 3GPP TS 24.501 9.11.3.39 Payload container, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If79cb0c97008e7a9885bb548a3d2e67e41ba170f Gerrit-Change-Number: 40779 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_ng_register_ping4_256

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40786?usp=email ) Change subject: 5gc: Introduce test TC_ng_register_ping4_256 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40786?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: I7282fa3c1a474c4b7dceeb5e358547dcdbd1fea6 Gerrit-Change-Number: 40786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:38:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: Comment out debugging for NGAP/5G-NAS

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?usp=email ) Change subject: library: Comment out debugging for NGAP/5G-NAS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?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: I4250766644742f0fd11ca5e24b1a1a581dc81b4b Gerrit-Change-Number: 40785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:38:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025