- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: Put all io_uring related read and write states into sub structures
by jolly 21 Aug '25

21 Aug '25

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40856?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: Put all io_uring related read and write states into sub structures ...................................................................... Put all io_uring related read and write states into sub structures Related: OS#6705 Change-Id: I3cf4ab6d9aebf5532ad174c90c7b0e9633491c88 --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 3 files changed, 70 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/40856/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40856?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3cf4ab6d9aebf5532ad174c90c7b0e9633491c88 Gerrit-Change-Number: 40856 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: Send multiple read/recvfrom/recvmsg SQEs in advance
by jolly 21 Aug '25

21 Aug '25

Attention is currently required from: laforge, pespin. jolly has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/40494?usp=email ) Change subject: Send multiple read/recvfrom/recvmsg SQEs in advance ...................................................................... Patch Set 14: (1 comment) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/40494/comment/1e5652cb_cfa36a58?… : PS14, Line 630: }; > I'd add osmo_iofd_uring_setup in here as ". […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40494?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id50a8900fa2fe6de553e5025feae7e1e8d501e30 Gerrit-Change-Number: 40494 Gerrit-PatchSet: 14 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Aug 2025 14:26:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: Automatically increase io_uring, if too small.
by jolly 21 Aug '25

21 Aug '25

Attention is currently required from: laforge, pespin. jolly has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/40725?usp=email ) Change subject: Automatically increase io_uring, if too small. ...................................................................... Patch Set 13: (3 comments) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/40725/comment/bf35f55d_44a9dc60?… : PS12, Line 194: /* The current ring is full, so we cannot get SQE for the current ring. */ > And you removed this block, perhaps you wanted to move it up? This check is not required. It did stop, if the ring changed, but there is already an SQE on the old ring. The check above "if (read && ...reads_submitted > 0)" will quit, if the current ring is full and there is already one or more SQEs on the currnet ring. File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/40725/comment/8fa50bbf_264a0aa2?… : PS13, Line 187: /* The current ring is full, subsequent reasd SQEs on different ring are not allowed. */ > typo: read Done https://gerrit.osmocom.org/c/libosmocore/+/40725/comment/3ce5a056_2e785a9e?… : PS13, Line 188: if (read && iofd->u.uring.reads_submitted > 0) > btw, I think something's wrong here. […] The check in line 179 prevents from submitting subsequent SQEs on a new ring. The check here triggers when the old ring is full (we know it after io_uring_get_sqe() fails), but we already have SQEs. We don't want to create a new ring and add subsequent SQE. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9230146acc8d54bfd44834e783c31b37bd64bca Gerrit-Change-Number: 40725 Gerrit-PatchSet: 13 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Aug 2025 14:25:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by jolly 21 Aug '25

21 Aug '25

Attention is currently required from: falconia, pespin. jolly has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (1 comment) File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/d52bd514_75f7513… : PS5, Line 486: msgb_free(new_msg); > > I looked into your RTP patch. The received RTP frame are directly sent to the jitter buffer. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Aug 2025 13:05:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by falconia 21 Aug '25

21 Aug '25

Attention is currently required from: jolly, pespin. falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (3 comments) File include/osmocom/netif/twjit.h: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/dcd4b2b8_4002897… : PS2, Line 137: bool osmo_twjit_got_any_input(struct osmo_twjit *twjit); > I'm fine with either of the two proposed. I'll go with the shorter `osmo_twjit_rr_info_valid()` then. File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/1b794afb_2f3a718… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); > I mean dropping ortp completely. I dislike the idea of maintaing both ortp and twrtp. WOW that is bold! Are you really, truly sure though that twrtp will work as a satisfactory replacement for ortp for all Osmocom users who aren't ThemWi? Considering how I designed twjit for my worldview, and considering evidence from past ML threads suggesting that most people in Osmocom hold views generally opposite to mine regarding how the voice plane should work in a GSM network implementation, I find it hard to believe that non-ThemWi users of OsmoBTS would be happy and content if ortp was suddenly swapped out for twrtp. How do Harald and other senior leaders of Osmocom feel about this issue? Given the magnitude of what is proposed... > Feel free to submit some RFC patch for osmo-bts in gerrit once you want to receive feedback. 1. I'll be doing this work after the present patches get merged in `libosmo-nettf`, not before; 2. I would need to see full consensus of Osmocom community on the question of doing ortp vs twrtp user-selectable choice, or the super-bold approach of twrtp only. With the OsmoBTS=internal abstraction layer implemented in my current branch patches, it is possible to build without having ortp present, in which case that particular `osmo-bts-*` binary will only use twrtp. But both libraries are still supported at source level. File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/6de3a61e_6ec6c4b… : PS5, Line 486: msgb_free(new_msg); > I looked into your RTP patch. The received RTP frame are directly sent to the jitter buffer. I suggest to split it, so the application can decide which frames are sent to the jitter buffer and which are not. Also it could decide not to use a jitter buffer at all. (when just doing RTP forwarding) The ability to use twrtp without twjit (non-delayed unbuffered Rx path) is already there: see `osmo_twrtp_set_raw_rx_cb()` in twrtp patch. If you want to do your split idea, you could create a twrtp instance without twjit, then create multiple "standalone" twjit instances, and have your unbuffered/non-delayed Rx callback function do the routing. The only feature you would lose this way, compared to native twrtp with twjit, is generation of RTCP reception reports based on analytics collected by twjit. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Aug 2025 12:52:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by jolly 21 Aug '25

21 Aug '25

Attention is currently required from: falconia. jolly has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (1 comment) File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/2bd3233b_02edda4… : PS5, Line 486: msgb_free(new_msg); > > Is there a twjit instance for every payload type or one for the complete RTP connection? […] It is ok for me to have a more specific de-jitter process, rather than something that solves all needs. I looked in my own de-jitter code and found the same. (drop sequence of frames with same time stamp) It makes sense, if only a voice stream (without telephone-events) are de-jittered. I looked into your RTP patch. The received RTP frame are directly sent to the jitter buffer. I suggest to split it, so the application can decide which frames are sent to the jitter buffer and which are not. Also it could decide not to use a jitter buffer at all. (when just doing RTP forwarding) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 21 Aug 2025 12:01:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by pespin 21 Aug '25

21 Aug '25

Attention is currently required from: falconia, jolly. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (2 comments) File include/osmocom/netif/twjit.h: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/1191a356_97659d7… : PS2, Line 137: bool osmo_twjit_got_any_input(struct osmo_twjit *twjit); > I have warmed up to your idea of renaming this API, and I would like to include the same rename in m […] I'm fine with either of the two proposed. File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/e240e539_8ae28ef… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); > @pespin@sysmocom. […] I mean dropping ortp completely. I dislike the idea of maintaing both ortp and twrtp. Fine with the other stuff you mentioned. Feel free to submit some RFC patch for osmo-bts in gerrit once you want to receive feedback. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 21 Aug 2025 11:30:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Add tests for UE release context request procedure
by pespin 21 Aug '25

21 Aug '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40893?usp=email ) Change subject: 5gc: Add tests for UE release context request procedure ...................................................................... 5gc: Add tests for UE release context request procedure Change-Id: Icaaeb2923fdcaba47a72ed0aedc5661f68c03774 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml 3 files changed, 72 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index f72fef8..f9a9057 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -330,6 +330,36 @@ vc_conn.done; } +/* 3GPP TS 23.502 4.2.6 AN Release */ +private function f_TC_ue_context_release_no_pdu_session() runs on ConnHdlr { + f_register(); + f_ue_context_release(); +} +testcase TC_ue_context_release_no_pdu_session() runs on MTC_CT { + f_init(); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_ue_context_release_no_pdu_session), pars); + vc_conn.done; +} +private function f_TC_ue_context_release_with_pdu_session() runs on ConnHdlr { + f_register(); + f_pdu_sess_establish(false); + f_sleep(1.0); + f_ue_context_release(); +} +testcase TC_ue_context_release_with_pdu_session() runs on MTC_CT { + f_init(); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_ue_context_release_with_pdu_session), pars); + vc_conn.done; +} + private function f_TC_register_ping4() runs on ConnHdlr { f_register(); f_pdu_sess_establish(); @@ -371,6 +401,8 @@ execute( TC_ng_setup_wrong_tac() ); execute( TC_ng_register() ); execute( TC_periodic_registration_updating() ); + execute( TC_ue_context_release_no_pdu_session() ); + execute( TC_ue_context_release_with_pdu_session() ); execute( TC_ng_register_ping4() ); execute( TC_ng_register_ping4_256() ); } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index dbec212..ccee880 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -313,6 +313,7 @@ return li_resp; } +/* 3GPP TS 23.502 Figure 4.3.2.2.1-1 steps 12-14. */ private altstep as_ngap_handle_InitialCtxReq_withPDUSessionList() runs on ConnHdlr { var NGAP_PDU rx_ngap; var template (present) NGAP_PDU exp_ngap := @@ -336,7 +337,8 @@ } } -function f_pdu_sess_establish() runs on ConnHdlr { +/* 3GPP TS 23.502 4.3.2.2 UE Requested PDU Session Establishment */ +function f_pdu_sess_establish(boolean configure_userplane := true) 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; @@ -364,7 +366,9 @@ log("5GC assigned CN GTPU Address: ", g_pars.ue_pars.sess_pars.cn_gtpu_ip, " TEID: ", g_pars.ue_pars.sess_pars.cn_gtpu_teid); log("5GC assigned UE IP address: ", g_pars.ue_pars.sess_pars.ue_ip); - f_pdu_sess_create_tun(); + if (configure_userplane) { + f_pdu_sess_create_tun(); + } } function f_register() runs on ConnHdlr { @@ -455,13 +459,14 @@ } /* 3GPP TS 38.413 8.3.3 UE Context Release (AMF initiated) */ -private altstep as_ngap_handle_UeContextReleaseCmd() runs on ConnHdlr { +private altstep as_ngap_handle_UeContextReleaseCmd(template (present) Cause exp_cause := ?) runs on ConnHdlr { var NGAP_PDU rx_ngap; var template (present) NGAP_PDU exp_ngap := mw_ngap_initMsg(mw_n2_UEContextReleaseCommand( mw_uE_NGAP_IDs_uE_NGAP_ID_pair( mw_uE_NGAP_ID_pair(g_pars.ue_pars.amf_id, - g_pars.ue_pars.ran_id)))); + g_pars.ue_pars.ran_id)), + p_cause := exp_cause)); [] NGAP.receive(exp_ngap) -> value rx_ngap { NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(g_pars.ue_pars.amf_id, @@ -470,6 +475,31 @@ } } +/* 3GPP TS 38.413 8.3.2 UE Context Release Request (NG-RAN node initiated), + * 3GPP TS 23.502 4.2.6 AN Release */ +function f_ue_context_release(template (value) Cause cause := m_cause_radioNetwork(unspecified)) runs on ConnHdlr { + var template (value) NGAP_PDU tx_pdu; + + if (ispresent(g_pars.ue_pars.sess_pars.cn_gtpu_teid)) { + var template (value) PDUSessionResourceListCxtRelReq li_req; + var template (value) PDUSessionResourceItemCxtRelReq it_req; + it_req := m_pDUSessionResourceItemCxtRelReq(g_pars.ue_pars.sess_pars.id); + li_req := { it_req }; + tx_pdu := m_ngap_initMsg(m_n2_UEContextReleaseRequest_withPDUSessionList( + g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + li_req, + cause)); + } else { + tx_pdu := m_ngap_initMsg(m_n2_UEContextReleaseRequest( + g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + cause)); + } + NGAP.send(tx_pdu); + as_ngap_handle_UeContextReleaseCmd(exp_cause := cause); +} + /* 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 { @@ -525,7 +555,7 @@ } } -function f_pdu_sess_release() runs on ConnHdlr { +function f_pdu_sess_release(boolean configure_userplane := true) 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; @@ -565,7 +595,9 @@ p_PDU_SessionId := cs_NG_PDU_SessionIdTV(pdu_sess_id)); NGAP.send(nas_ul_msg); - f_pdu_sess_delete_tun(); + if (configure_userplane) { + f_pdu_sess_delete_tun(); + } } function f_pdu_sess_create_tun() runs on ConnHdlr { diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index a94eb6f..99ded9c 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -5,6 +5,8 @@ <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_periodic_registration_updating' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_ue_context_release_no_pdu_session' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_ue_context_release_with_pdu_session' 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> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40893?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: Icaaeb2923fdcaba47a72ed0aedc5661f68c03774 Gerrit-Change-Number: 40893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Place PDU Session params into its own subrecord
by pespin 21 Aug '25

21 Aug '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40892?usp=email ) Change subject: 5gc: Place PDU Session params into its own subrecord ...................................................................... 5gc: Place PDU Session params into its own subrecord This way we properly split between layers, plus the fact that we'll probably want to hold several concurrent pdu sessions in each UE in the future. Change-Id: Ibb0c8d3f0901d53e4aa75855e602234410fd00f9 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn 2 files changed, 62 insertions(+), 46 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 608bcf8..f72fef8 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -78,6 +78,20 @@ ping_hostname := mp_ping_hostname } +template (value) PDUSessionParams ts_PDUSessionParams(template (value) PDUSessionID id, + template (value) RunProgParams run_prog_pars, + template (value) OCT4 ran_gtpu_teid) := +{ + id := id, + run_prog_pars := run_prog_pars, + ran_gtpu_ip := mp_local_gtpu_ip, + ran_gtpu_teid := ran_gtpu_teid, + cn_gtpu_ip := omit, + cn_gtpu_teid := omit, + qfi := omit, + ue_ip := omit +}; + template (value) UeParams ts_UeParams(integer idx) := { idx := idx, @@ -88,14 +102,10 @@ apn := mp_apn, ran_id := idx, amf_id := omit, - run_prog_pars := ts_RunProgParams(idx), - ran_gtpu_ip := mp_local_gtpu_ip, - ran_gtpu_teid := int2oct(idx + 1, 4), - cn_gtpu_ip := omit, - cn_gtpu_teid := omit, - qfi := omit, - ue_ip := omit, - guti := omit + guti := omit, + sess_pars := ts_PDUSessionParams(id := 1, + run_prog_pars := ts_RunProgParams(idx), + ran_gtpu_teid := int2oct(idx + 1, 4)) } type component MTC_CT { @@ -324,7 +334,7 @@ f_register(); f_pdu_sess_establish(); f_sleep(1.0); - f_ping4(g_pars.ue_pars.run_prog_pars.ping_hostname); + f_ping4(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); f_pdu_sess_release(); f_deregister(); } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 2f3344b..dbec212 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -65,6 +65,17 @@ OCT32 kamf }; +type record PDUSessionParams { + PDUSessionID id, + RunProgParams run_prog_pars, + charstring ran_gtpu_ip, + OCT4 ran_gtpu_teid, + charstring cn_gtpu_ip optional, + OCT4 cn_gtpu_teid optional, + OCT1 qfi optional, + charstring ue_ip optional +}; + /* parameters of emulated UE */ type record UeParams { integer idx, @@ -75,14 +86,8 @@ charstring apn, RAN_UE_NGAP_ID ran_id, AMF_UE_NGAP_ID amf_id optional, - RunProgParams run_prog_pars, - charstring ran_gtpu_ip, - OCT4 ran_gtpu_teid, - charstring cn_gtpu_ip optional, - OCT4 cn_gtpu_teid optional, - OCT1 qfi optional, - charstring ue_ip optional, - octetstring guti optional + octetstring guti optional, + PDUSessionParams sess_pars }; type record RunProgParams { @@ -277,15 +282,15 @@ for (var integer i := 0; i < lengthof(setup_req_transf.protocolIEs); i := i + 1) { if (setup_req_transf.protocolIEs[i].id == id_UL_NGU_UP_TNLInformation) { var UPTransportLayerInformation utli := setup_req_transf.protocolIEs[i].value_.uPTransportLayerInformation; - g_pars.ue_pars.cn_gtpu_ip := f_inet_ntoa(bit2oct(utli.gTPTunnel.transportLayerAddress)); - g_pars.ue_pars.cn_gtpu_teid := utli.gTPTunnel.gTP_TEID; + g_pars.ue_pars.sess_pars.cn_gtpu_ip := f_inet_ntoa(bit2oct(utli.gTPTunnel.transportLayerAddress)); + g_pars.ue_pars.sess_pars.cn_gtpu_teid := utli.gTPTunnel.gTP_TEID; } } /* Prepare Response for it: */ utla := m_uPTransportLayerInformation_gTPTunnel( - m_gTPTunnel(p_tla := oct2bit(f_inet_addr(g_pars.ue_pars.ran_gtpu_ip)), - p_gtp_teid := g_pars.ue_pars.ran_gtpu_teid)); + m_gTPTunnel(p_tla := oct2bit(f_inet_addr(g_pars.ue_pars.sess_pars.ran_gtpu_ip)), + p_gtp_teid := g_pars.ue_pars.sess_pars.ran_gtpu_teid)); qos := m_qosFlowPerTNLInformation(utla, { m_associatedQosFlowItem(1) }); setup_resp_transf := valueof(m_pDUSessionResourceSetupResponseTransfer(qos)); setup_trans_enc := enc_NGAP_PDUSessionResourceSetupResponseTransfer(setup_resp_transf) @@ -335,15 +340,16 @@ 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 := int2oct(g_pars.ue_pars.sess_pars.id, 1); - nas_ul_msg := cs_NG_PDU_SESSION_ESTABLISHMENT_REQUEST(cs_NG_PDU_SessionIdV('01'O), '01'O, + nas_ul_msg := cs_NG_PDU_SESSION_ESTABLISHMENT_REQUEST(cs_NG_PDU_SessionIdV(pdu_sess_id), '01'O, p_IntegrityProtMaxDataRate := cs_IntegrityProtMaxDataRateV('FF'O, 'FF'O), p_PDU_SessionType := cs_PDU_SessionTypeTV('001'B), /* IPv4 */ p_SSC_Mode := cs_SSC_ModeTV('001'B)); 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('01'O), + 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); @@ -353,10 +359,10 @@ 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); - g_pars.ue_pars.qfi := inner_nas.pdu_Session_Establishment_Accept.authorizedQoSRules.listofQoSRules[0].identifier; - 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); + g_pars.ue_pars.sess_pars.qfi := inner_nas.pdu_Session_Establishment_Accept.authorizedQoSRules.listofQoSRules[0].identifier; + g_pars.ue_pars.sess_pars.ue_ip := f_inet_ntoa(inner_nas.pdu_Session_Establishment_Accept.pduAddress.adressInfo); + log("5GC assigned CN GTPU Address: ", g_pars.ue_pars.sess_pars.cn_gtpu_ip, " TEID: ", g_pars.ue_pars.sess_pars.cn_gtpu_teid); + log("5GC assigned UE IP address: ", g_pars.ue_pars.sess_pars.ue_ip); f_pdu_sess_create_tun(); } @@ -472,8 +478,8 @@ nas_cause := oct2bit(cmd.pDUSessionResourceReleaseCommandTransfer); - g_pars.ue_pars.cn_gtpu_ip := omit; - g_pars.ue_pars.cn_gtpu_teid := omit; + g_pars.ue_pars.sess_pars.cn_gtpu_ip := omit; + g_pars.ue_pars.sess_pars.cn_gtpu_teid := omit; /* Prepare Response for it: */ resp := valueof(m_pDUSessionResourceReleasedItemRelRes(cmd.pDUSessionID, bit2oct(nas_cause))); @@ -523,9 +529,9 @@ 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; + var OCT1 pdu_sess_id := int2oct(g_pars.ue_pars.sess_pars.id, 1); 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)); @@ -548,8 +554,8 @@ log2str("Unexpected decoded NAS Payload Container ", inner_nas)); } - g_pars.ue_pars.qfi := omit; - g_pars.ue_pars.ue_ip := omit; + g_pars.ue_pars.sess_pars.qfi := omit; + g_pars.ue_pars.sess_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)); @@ -568,18 +574,18 @@ var template (value) UECUPS_GtpExtHdr_PduSessContainer pdu_sess_cont; pdu_sess_cont := ts_UECUPS_GtpExtHdr_PduSessContainer(UECUPS_GtpExtHdr_PduSessContainer_Type_ul_pdu_sess_info, - oct2int(g_pars.ue_pars.qfi)); + oct2int(g_pars.ue_pars.sess_pars.qfi)); gtp_ext_hdr := ts_UECUPS_GtpExtHdr(pdu_session_container := pdu_sess_cont); uecups_create := ts_UECUPS_CreateTun( - tx_teid := oct2int(g_pars.ue_pars.cn_gtpu_teid), - rx_teid := oct2int(g_pars.ue_pars.ran_gtpu_teid), + tx_teid := oct2int(g_pars.ue_pars.sess_pars.cn_gtpu_teid), + rx_teid := oct2int(g_pars.ue_pars.sess_pars.ran_gtpu_teid), user_addr_type := IPV4, - user_addr := f_inet_addr(g_pars.ue_pars.ue_ip), - local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.ran_gtpu_ip))), - remote_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.cn_gtpu_ip))), - tun_dev_name := g_pars.ue_pars.run_prog_pars.tun_dev_name, - tun_netns_name := g_pars.ue_pars.run_prog_pars.tun_netns_name, + user_addr := f_inet_addr(g_pars.ue_pars.sess_pars.ue_ip), + local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.sess_pars.ran_gtpu_ip))), + remote_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.sess_pars.cn_gtpu_ip))), + tun_dev_name := g_pars.ue_pars.sess_pars.run_prog_pars.tun_dev_name, + tun_netns_name := g_pars.ue_pars.sess_pars.run_prog_pars.tun_netns_name, gtp_ext_hdr := gtp_ext_hdr ); @@ -590,8 +596,8 @@ function f_pdu_sess_delete_tun() runs on ConnHdlr { var template (value) UECUPS_DestroyTun uecups_destroy; uecups_destroy := ts_UECUPS_DestroyTun( - local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.ran_gtpu_ip))), - rx_teid := oct2int(g_pars.ue_pars.ran_gtpu_teid) + local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(g_pars.ue_pars.sess_pars.ran_gtpu_ip))), + rx_teid := oct2int(g_pars.ue_pars.sess_pars.ran_gtpu_teid) ); f_gtp1u_destroy_tunnel(uecups_destroy); } @@ -601,8 +607,8 @@ var template (value) UECUPS_StartProgram sprog := ts_UECUPS_StartProgram( command := command, environment := {}, - run_as_user := g_pars.ue_pars.run_prog_pars.run_as_user, - tun_netns_name := g_pars.ue_pars.run_prog_pars.tun_netns_name + run_as_user := g_pars.ue_pars.sess_pars.run_prog_pars.run_as_user, + tun_netns_name := g_pars.ue_pars.sess_pars.run_prog_pars.tun_netns_name ); return valueof(sprog); } @@ -610,7 +616,7 @@ private function f_run_prog_unique_log_path() runs on ConnHdlr return charstring { var charstring id := testcasename() & "-" & hex2str(g_pars.ue_pars.imsi) & "-" & int2str(g_start_prog_count); - var charstring prefix := g_pars.ue_pars.run_prog_pars.log_path_prefix & "/" & id; + var charstring prefix := g_pars.ue_pars.sess_pars.run_prog_pars.log_path_prefix & "/" & id; g_start_prog_count := g_start_prog_count + 1; return prefix; } @@ -620,7 +626,7 @@ { /* command will be filled in by f_gtp1u_ping4() below: */ var UECUPS_StartProgram sprog := f_run_prog_init(""); - f_gtp1u_ping4(sprog, host, interval, count, g_pars.ue_pars.ue_ip, + f_gtp1u_ping4(sprog, host, interval, count, g_pars.ue_pars.sess_pars.ue_ip, redirect_output := true, redirect_output_path_prefix := f_run_prog_unique_log_path()); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40892?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: Ibb0c8d3f0901d53e4aa75855e602234410fd00f9 Gerrit-Change-Number: 40892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: ngap: Add missing mandatory IE Cause to m_n2_UEContextReleaseRequest
by pespin 21 Aug '25

21 Aug '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40889?usp=email ) Change subject: ngap: Add missing mandatory IE Cause to m_n2_UEContextReleaseRequest ...................................................................... ngap: Add missing mandatory IE Cause to m_n2_UEContextReleaseRequest Change-Id: Ib7d87f957e469a23448e35fd82a697d1698c7da7 --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index 3dec8ef..d6e0bd8 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -1772,7 +1772,8 @@ template (value) InitiatingMessage m_n2_UEContextReleaseRequest( 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) PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq + in template (value) PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq, + in template (value) Cause p_cause ) := { procedureCode := id_UEContextReleaseRequest, criticality := ignore, @@ -1793,6 +1794,11 @@ id := id_PDUSessionResourceListCxtRelReq, criticality := reject, value_ := { PDUSessionResourceListCxtRelReq := p_pDUSessionResourceListCxtRelReq } + }, + { + id := id_Cause, + criticality := ignore, + value_ := { Cause := p_cause } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40889?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: Ib7d87f957e469a23448e35fd82a697d1698c7da7 Gerrit-Change-Number: 40889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log