March 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-uecups[master]: cups_client: SPlit Tx of json str into its own function
by fixeria 20 Mar '26

20 Mar '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42455?usp=email ) Change subject: cups_client: SPlit Tx of json str into its own function ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File daemon/cups_client.c: https://gerrit.osmocom.org/c/osmo-uecups/+/42455/comment/738b909b_34605145?… : PS1, Line 96: 0 `-ENOMEM`? -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42455?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: I505bf2eeea998a749e55f8f3b05c5013b5761297 Gerrit-Change-Number: 42455 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 20:02:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce tests TC_ng_register_ping6(_256)
by fixeria 20 Mar '26

20 Mar '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?usp=email ) Change subject: 5gc: Introduce tests TC_ng_register_ping6(_256) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?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: Iedf3697265b91bdda85e8d32402345ea8d58dc9f Gerrit-Change-Number: 42460 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 19:57:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups
by fixeria 20 Mar '26

20 Mar '26

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?usp=email ) Change subject: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?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: Ic368383ea65161297e57a298a12c7b4adc927142 Gerrit-Change-Number: 42459 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 19:50:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups
by pespin 20 Mar '26

20 Mar '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?usp=email ) Change subject: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Note: commit has in deps/Makefile needs to be adapter to whatever commit hash ends up merged in https://gerrit.osmocom.org/c/osmo-uecups/+/42457/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?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: Ic368383ea65161297e57a298a12c7b4adc927142 Gerrit-Change-Number: 42459 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 20 Mar 2026 15:43:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce tests TC_ng_register_ping6(_256)
by pespin 20 Mar '26

20 Mar '26

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?usp=email ) Change subject: 5gc: Introduce tests TC_ng_register_ping6(_256) ...................................................................... 5gc: Introduce tests TC_ng_register_ping6(_256) Change-Id: Iedf3697265b91bdda85e8d32402345ea8d58dc9f --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml M 5gc/open5gs/open5gs-upf.yaml M 5gc/testenv.sh 5 files changed, 109 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/42460/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedf3697265b91bdda85e8d32402345ea8d58dc9f Gerrit-Change-Number: 42460 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups
by pespin 20 Mar '26

20 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?usp=email ) Change subject: GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups ...................................................................... GTPv1U_Emulation: Support IPv6 SLAAC with osmo-uecups Depends: osmo-uecups.git Change-Id I917b5c70f143d48b55b4e270e24594d1a36f71aa Change-Id: Ic368383ea65161297e57a298a12c7b4adc927142 --- M deps/Makefile M library/GTPv1U_Emulation.ttcnpp 2 files changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/42459/1 diff --git a/deps/Makefile b/deps/Makefile index c125a15..3a7b822 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -124,7 +124,7 @@ titan.TestPorts.UDPasp_commit= 54176e95850654e5e8b0ffa2f1b5f35c412b949c titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 -osmo-uecups_commit= fdff5ae0b7addf07c368adbe31610d4e57dac273 +osmo-uecups_commit= 2f340548a6ac636603e0b01d8c4884e958d354f8 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) clean: $(foreach dir,$(ALL_REPOS),$(dir)/clean) diff --git a/library/GTPv1U_Emulation.ttcnpp b/library/GTPv1U_Emulation.ttcnpp index 51fc5a1..6146147 100644 --- a/library/GTPv1U_Emulation.ttcnpp +++ b/library/GTPv1U_Emulation.ttcnpp @@ -245,6 +245,12 @@ /* FIXME: remove from table */ repeat; } +/* handle incoming ipv6_slaac_ind; dispatch to whatever component started the process */ +[] UECUPS.receive(tr_UECUPS_RecvFrom_R({ipv6_slaac_ind:=?})) -> value rx { + vc_conn := f_comp_by_teid(int2oct(rx.msg.ipv6_slaac_ind.rx_teid, 4)); + CLIENT.send(rx.msg.ipv6_slaac_ind) to vc_conn; + repeat; + } } #endif @@ -257,6 +263,7 @@ var UECUPS_CreateTun gtc; var UECUPS_DestroyTun gtd; var UECUPS_StartProgram sprog; + var UECUPS_IPv6SLAAC ipv6slaac; #endif f_init(cfg); @@ -306,6 +313,10 @@ } CLIENT_PROC.reply(GTP1UEM_start_program:{sprog} value rx_uecups.start_program_res) to vc_conn; } + [] CLIENT_PROC.getcall(GTP1UEM_ipv6_slaac:{?}) -> param(ipv6slaac) sender vc_conn { + rx_uecups := f_uecups_xceive({ipv6_slaac := ipv6slaac}, {ipv6_slaac_res:={result:=OK}}); + CLIENT_PROC.reply(GTP1UEM_ipv6_slaac:{ipv6slaac} value rx_uecups.ipv6_slaac_res) to vc_conn; + } #endif } } @@ -318,7 +329,8 @@ type port GTP1UEM_PT message { inout Gtp1uUnitdata #ifdef GTP1U_EMULATION_HAVE_UECUPS - , UECUPS_ProgramTermInd + , UECUPS_ProgramTermInd, + UECUPS_IPv6SLAACInd #endif ; } with { extension "internal" }; @@ -329,12 +341,16 @@ signature GTP1UEM_create_tunnel(UECUPS_CreateTun gtc); signature GTP1UEM_destroy_tunnel(UECUPS_DestroyTun gtd); signature GTP1UEM_start_program(UECUPS_StartProgram sprog) return UECUPS_StartProgramRes; +signature GTP1UEM_ipv6_slaac(UECUPS_IPv6SLAAC ipv6slaac) return UECUPS_IPv6SLAACRes; #endif type port GTP1UEM_PROC_PT procedure { inout GTP1UEM_register_teid, GTP1UEM_allocate_teid #ifdef GTP1U_EMULATION_HAVE_UECUPS - , GTP1UEM_create_tunnel, GTP1UEM_destroy_tunnel, GTP1UEM_start_program + , GTP1UEM_create_tunnel, + GTP1UEM_destroy_tunnel, + GTP1UEM_start_program, + GTP1UEM_ipv6_slaac #endif ; } with { extension "internal" }; @@ -390,6 +406,13 @@ return res; } +function f_gtp1u_ipv6_slaac(template (value) UECUPS_IPv6SLAAC ipv6slaac, integer port_idx := 0) +runs on GTP1U_ConnHdlr { + GTP1U_PROC[port_idx].call(GTP1UEM_ipv6_slaac:{valueof(ipv6slaac)}) { + [] GTP1U_PROC[port_idx].getreply(GTP1UEM_ipv6_slaac:{ipv6slaac}); + } +} + /*********************************************************************** * High level APIs for user convenience ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42459?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: Ic368383ea65161297e57a298a12c7b4adc927142 Gerrit-Change-Number: 42459 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce tests TC_ng_register_ping6(_256)
by pespin 20 Mar '26

20 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?usp=email ) Change subject: 5gc: Introduce tests TC_ng_register_ping6(_256) ...................................................................... 5gc: Introduce tests TC_ng_register_ping6(_256) Change-Id: Iedf3697265b91bdda85e8d32402345ea8d58dc9f --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml M 5gc/open5gs/open5gs-upf.yaml M 5gc/testenv.sh 5 files changed, 109 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/42460/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index e90369f..c58d411 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -65,6 +65,7 @@ charstring mp_apn := "internet"; charstring mp_local_gtpu_ip := "127.0.0.20"; charstring mp_ping_hostname := "10.45.0.1"; + charstring mp_ping_hostname6 := "cafe::1"; charstring mp_run_prog_log_path := "/tmp"; charstring mp_run_prog_as_user := "osmocom"; @@ -90,7 +91,8 @@ cn_gtpu_ip := omit, cn_gtpu_teid := omit, qos_rules := omit, - ue_ip := omit + ue_ip := omit, + ipv6_interface_id := omit }; template (value) UeParams ts_UeParams(integer idx) := @@ -427,6 +429,42 @@ } } +private function f_TC_register_ping6() runs on ConnHdlr { + f_register(); + f_pdu_sess_establish(pdu_sess_type := c_PDU_SessionType_IPv6); + f_sleep(1.0); + f_ping4(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); + f_pdu_sess_release(); + f_deregister(); +} +testcase TC_ng_register_ping6() runs on MTC_CT { + f_init(); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + pars.ue_pars.sess_pars.run_prog_pars.ping_hostname := mp_ping_hostname6; + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_register_ping6), pars); + vc_conn.done; +} +testcase TC_ng_register_ping6_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); + pars.ue_pars.sess_pars.run_prog_pars.ping_hostname := mp_ping_hostname6; + vc_conn[i] := f_start_handler_with_pars(refers(f_TC_register_ping6), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + /* 3GPP TS 23.502 4.2.3.2 UE Triggered Service Request. * UE signals the active session as active, and it has UL data for it */ private function f_TC_ue_service_request_cm_idle_ul_data() runs on ConnHdlr { @@ -971,6 +1009,9 @@ execute( TC_ng_register_ping4() ); execute( TC_ng_register_ping4_256() ); + execute( TC_ng_register_ping6() ); + execute( TC_ng_register_ping6_256() ); + execute( TC_ue_service_request_cm_idle_ul_data() ); execute( TC_ue_service_request_cm_idle_inact_sess() ); execute( TC_ue_service_request_cm_idle_unknown_sess_active() ); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 8937465..cf56caa 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -73,7 +73,8 @@ charstring cn_gtpu_ip optional, OCT4 cn_gtpu_teid optional, QoS_RuleList qos_rules optional, - charstring ue_ip optional + charstring ue_ip optional, + octetstring ipv6_interface_id optional }; /* parameters of emulated UE */ @@ -525,6 +526,23 @@ } } +private function f_perform_ipv6_slaac() runs on ConnHdlr +{ + var UECUPS_IPv6SLAACInd ipv6slaac_ind; + var template (value) UECUPS_IPv6SLAAC ipv6slaac; + ipv6slaac := ts_UECUPS_IPv6SLAAC( + 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_ipv6_slaac(ipv6slaac); + GTP1U[0].receive(UECUPS_IPv6SLAACInd:?) -> value ipv6slaac_ind; + log("5GC assigned IPv6 global prefix: ", ipv6slaac_ind.ipv6_prefix, " -> ", f_inet6_ntoa(ipv6slaac_ind.ipv6_prefix & '0000000000000000'O)); + + /* Use the first global IPv6 address in the IPv6 prefix picked by osmo-uecups: */ + g_pars.ue_pars.sess_pars.ue_ip := f_inet6_ntoa(ipv6slaac_ind.ipv6_user_addr); + log("Using IPv6 global address: ", g_pars.ue_pars.sess_pars.ue_ip); +} + /* 3GPP TS 23.502 4.3.2.2 UE Requested PDU Session Establishment */ function f_pdu_sess_establish(BIT3 request_type := c_RequestType_initial_request, BIT3 pdu_sess_type := c_PDU_SessionType_IPv4, @@ -553,12 +571,30 @@ 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.sess_pars.qos_rules := inner_nas.pdu_Session_Establishment_Accept.authorizedQoSRules.listofQoSRules; - 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); - - if (configure_userplane) { - f_pdu_sess_create_tun(); + select (pdu_sess_type) { + case (c_PDU_SessionType_IPv4) { + g_pars.ue_pars.sess_pars.ue_ip := f_inet_ntoa(inner_nas.pdu_Session_Establishment_Accept.pduAddress.adressInfo); + log("5GC assigned UE IPv4 address: ", g_pars.ue_pars.sess_pars.ue_ip); + if (configure_userplane) { + f_pdu_sess_create_tun(IPV4); + } + } + case (c_PDU_SessionType_IPv6) { + g_pars.ue_pars.sess_pars.ipv6_interface_id := inner_nas.pdu_Session_Establishment_Accept.pduAddress.adressInfo + log("5GC assigned IPv6 Interface Id: ", g_pars.ue_pars.sess_pars.ipv6_interface_id); + /* Use the link-local address for now: */ + var octetstring ll_addr := 'FE80000000000000'O & g_pars.ue_pars.sess_pars.ipv6_interface_id; + g_pars.ue_pars.sess_pars.ue_ip := f_inet6_ntoa(ll_addr); + log("5GC assigned IPv6 link-local Address: ", g_pars.ue_pars.sess_pars.ue_ip); + if (configure_userplane) { + f_pdu_sess_create_tun(IPV6); + f_perform_ipv6_slaac(); + } + } + case (?) { + setverdict(fail, "PDU Session Type not implemented"); + } } } @@ -1270,20 +1306,34 @@ } } -function f_pdu_sess_create_tun() runs on ConnHdlr { +function f_pdu_sess_create_tun(template (value) UECUPS_AddrType user_addr_type := IPV4) runs on ConnHdlr { var template (value) UECUPS_GtpExtHdr gtp_ext_hdr; var template (value) UECUPS_CreateTun uecups_create; var template (value) UECUPS_GtpExtHdr_PduSessContainer pdu_sess_cont; + var template (value) OCT4_16n user_addr; + + /* First of all, register the local TEID in the GTPv1U_Emulation: */ + f_gtp1u_register_teid(g_pars.ue_pars.sess_pars.ran_gtpu_teid); pdu_sess_cont := ts_UECUPS_GtpExtHdr_PduSessContainer(UECUPS_GtpExtHdr_PduSessContainer_Type_ul_pdu_sess_info, oct2int(g_pars.ue_pars.sess_pars.qos_rules[0].identifier)); gtp_ext_hdr := ts_UECUPS_GtpExtHdr(pdu_session_container := pdu_sess_cont); + select (valueof(user_addr_type)) { + case (IPV4) { + user_addr := f_inet_addr(g_pars.ue_pars.sess_pars.ue_ip); + } + case (IPV6) { + //user_addr := g_pars.ue_pars.sess_pars.ipv6_interface_id; + user_addr := f_inet6_addr(g_pars.ue_pars.sess_pars.ue_ip); + } + } + uecups_create := ts_UECUPS_CreateTun( 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.sess_pars.ue_ip), + user_addr_type := user_addr_type, + user_addr := user_addr, 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, diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index bc47001..9827df5 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -10,6 +10,8 @@ <testcase classname='C5G_Tests' name='TC_pdu_sess_modification' 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'/> + <testcase classname='C5G_Tests' name='TC_ng_register_ping6' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_ng_register_ping6_256' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ue_service_request_cm_idle_ul_data' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ue_service_request_cm_idle_inact_sess' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ue_service_request_cm_idle_unknown_sess_active' time='MASKED'/> diff --git a/5gc/open5gs/open5gs-upf.yaml b/5gc/open5gs/open5gs-upf.yaml index c6c86d4..29c88a6 100644 --- a/5gc/open5gs/open5gs-upf.yaml +++ b/5gc/open5gs/open5gs-upf.yaml @@ -22,8 +22,8 @@ gateway: 10.45.0.1 dnn: internet dev: ogstun46 - - subnet: cafe::/64 - gateway: cafe::1 + - subnet: 2001:db8:cafe::/48 + gateway: 2001:db8:cafe::1 dnn: internet dev: ogstun46 metrics: diff --git a/5gc/testenv.sh b/5gc/testenv.sh index 25e1b71..b12a2c3 100755 --- a/5gc/testenv.sh +++ b/5gc/testenv.sh @@ -38,6 +38,10 @@ sudo ip link set ogstun4 up sudo ip link set ogstun6 up sudo ip link set ogstun46 up + + # The IPv4 route is added automatically when setting the interface addr above: + sudo ip route add "10.45.0.0/16" dev "ogstun46" || true + sudo ip -6 route add "2001:db8:cafe::/48" dev "ogstun46" || true } del_tun() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42460?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: Iedf3697265b91bdda85e8d32402345ea8d58dc9f Gerrit-Change-Number: 42460 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-uecups[master]: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel...
by pespin 20 Mar '26

20 Mar '26

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42458?usp=email ) Change subject: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel IPv6 global info ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1570ccf5f98ac98c1af467c48f42b6b54ac3911d Gerrit-Change-Number: 42458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[M] Change in osmo-uecups[master]: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel...
by pespin 20 Mar '26

20 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42458?usp=email ) Change subject: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel IPv6 global info ...................................................................... cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel IPv6 global info Change-Id: I1570ccf5f98ac98c1af467c48f42b6b54ac3911d --- M daemon/cups_client.c M daemon/gtp_endpoint.c M daemon/internal.h M ttcn3/UECUPS_Types.ttcn 4 files changed, 158 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/58/42458/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index e283f23..f7c6f1a 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -133,6 +133,92 @@ return jret; } +json_t *gen_uecups_ep(const struct gtp_endpoint *ep) +{ + json_t *jret = json_object(); + char *addr_type; + char ip_str[32+1]; + uint16_t port; + + switch (ep->bind_addr.u.sa.sa_family) { + case AF_INET: + addr_type = "IPV4"; + osmo_hexdump_buf(ip_str, sizeof(ip_str), + (const unsigned char *)&ep->bind_addr.u.sin.sin_addr, + sizeof(ep->bind_addr.u.sin.sin_addr), + "", true); + break; + case AF_INET6: + addr_type = "IPV6"; + osmo_hexdump_buf(ip_str, sizeof(ip_str), + (const unsigned char *)&ep->bind_addr.u.sin6.sin6_addr, + sizeof(ep->bind_addr.u.sin6.sin6_addr), + "", true); + break; + default: + OSMO_ASSERT(0); + } + port = osmo_sockaddr_port(&ep->bind_addr.u.sa); + + json_object_set_new(jret, "addr_type", json_string(addr_type)); + json_object_set_new(jret, "ip", json_string(ip_str)); + json_object_set_new(jret, "Port", json_integer(port)); + + return jret; +} + +void cc_ipv6_slaac_ind(const struct gtp_tunnel *t) +{ + struct gtp_endpoint *ep = t->gtp_ep; + struct cups_client *cc; + json_t *jtx = json_object(); + json_t *jslaac_ind = json_object(); + json_t *jep; + char *json_str = NULL; + unsigned int json_strlen; + char ipv6_str[32+1]; + + LOGP(DUECUPS, LOGL_INFO, "ipv6_slaac_ind\n"); + + OSMO_ASSERT(jtx); + OSMO_ASSERT(jslaac_ind); + + json_object_set_new(jtx, "ipv6_slaac_ind", jslaac_ind); + + jep = gen_uecups_ep(ep); + if (!jep) + goto free_ret; + json_object_set_new(jslaac_ind, "local_gtp_ep", jep); + + json_object_set_new(jslaac_ind, "rx_teid", json_integer(t->rx_teid)); + + osmo_hexdump_buf(ipv6_str, sizeof(ipv6_str), + (const unsigned char *)&t->user_addr_ipv6_prefix.u.sin6.sin6_addr, + 8, "", true); + json_object_set_new(jslaac_ind, "ipv6_prefix", json_string(ipv6_str)); + + osmo_hexdump_buf(ipv6_str, sizeof(ipv6_str), + (const unsigned char *)&t->user_addr.u.sin6.sin6_addr, + sizeof(t->user_addr.u.sin6.sin6_addr), + "", true); + json_object_set_new(jslaac_ind, "ipv6_user_addr", json_string(ipv6_str)); + + json_str = json_dumps(jtx, JSON_SORT_KEYS); + if (!json_str) { + LOGT(t, LOGL_ERROR, "Error encoding JSON\n"); + goto free_ret; + } + json_strlen = strlen(json_str); + + llist_for_each_entry(cc, &t->d->cups_clients, list) + cups_client_tx_json_str(cc, json_str, json_strlen); + +free_ret: + if (jtx) + json_decref(jtx); + free(json_str); +} + static int parse_ep(struct osmo_sockaddr *out, json_t *in) { json_t *jaddr_type, *jport, *jip; @@ -525,6 +611,38 @@ return 0; } +static int cups_client_handle_ipv6_slaac(struct cups_client *cc, json_t *cmd) +{ + struct osmo_sockaddr local_ep_addr; + json_t *jlocal_gtp_ep, *jrx_teid; + uint32_t rx_teid; + int rc; + + jlocal_gtp_ep = json_object_get(cmd, "local_gtp_ep"); + jrx_teid = json_object_get(cmd, "rx_teid"); + + if (!jlocal_gtp_ep || !jrx_teid) + return -EINVAL; + + if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) + return -EINVAL; + + rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); + if (rc < 0) + return rc; + rx_teid = json_integer_value(jrx_teid); + + rc = gtp_tunnel_tx_icmpv6_rs(g_daemon, &local_ep_addr, rx_teid); + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Failed to start IPv6 SLAAC\n"); + cups_client_tx_json(cc, gen_uecups_result("ipv6_slaac_res", "ERR_IPv6_SLAAC_FAILED")); + } else { + cups_client_tx_json(cc, gen_uecups_result("ipv6_slaac_res", "OK")); + } + + return 0; +} + static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) { void *iter; @@ -549,6 +667,8 @@ rc = cups_client_handle_start_program(cc, cmd); } else if (!strcmp(key, "reset_all_state")) { rc = cups_client_handle_reset_all_state(cc, cmd); + } else if (!strcmp(key, "ipv6_slaac")) { + rc = cups_client_handle_ipv6_slaac(cc, cmd); } else { LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); return -EINVAL; diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 8d3c2b0..29422a1 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -86,6 +86,9 @@ inet_ntop(AF_INET6, &t->user_addr.u.sin6.sin6_addr, &ip6strbuf[1][0], sizeof(ip6strbuf[1])), strerror(-rc)); } + + /* Notify cups_client about the new available IPv6 prefix and global address: */ + cc_ipv6_slaac_ind(t); } } } diff --git a/daemon/internal.h b/daemon/internal.h index 2394e2c..5d4b832 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -155,6 +155,7 @@ struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d); void child_terminated(struct gtp_daemon *d, int pid, int status); +void cc_ipv6_slaac_ind(const struct gtp_tunnel *t); json_t *gen_uecups_result(const char *name, const char *res); int cups_client_tx_json(struct cups_client *cc, json_t *jtx); diff --git a/ttcn3/UECUPS_Types.ttcn b/ttcn3/UECUPS_Types.ttcn index 29fa738..45466c8 100644 --- a/ttcn3/UECUPS_Types.ttcn +++ b/ttcn3/UECUPS_Types.ttcn @@ -101,6 +101,27 @@ UECUPS_Result result }; +/* Perform IPv6 SLAAC on GTP-U tunnel to obtain IPv6 global IPv6 address for the UE */ +type record UECUPS_IPv6SLAAC { + /* local GTP endpoint + TEID are sufficient for unique identification */ + UECUPS_SockAddr local_gtp_ep, + uint32_t rx_teid +}; + +type record UECUPS_IPv6SLAACRes { + UECUPS_Result result +}; + +/* Daemon informs us that IPv6 SLAAC was terminated */ +type record UECUPS_IPv6SLAACInd { + /* local GTP endpoint + TEID are sufficient for unique identification */ + UECUPS_SockAddr local_gtp_ep, + uint32_t rx_teid, + OCT8 ipv6_prefix, + OCT16 ipv6_user_addr +}; + + type union PDU_UECUPS { UECUPS_CreateTun create_tun, UECUPS_CreateTunRes create_tun_res, @@ -113,7 +134,11 @@ UECUPS_ProgramTermInd program_term_ind, UeCUPS_ResetAllState reset_all_state, - UeCUPS_ResetAllStateRes reset_all_state_res + UeCUPS_ResetAllStateRes reset_all_state_res, + + UECUPS_IPv6SLAAC ipv6_slaac, + UECUPS_IPv6SLAACRes ipv6_slaac_res, + UECUPS_IPv6SLAACInd ipv6_slaac_ind }; @@ -202,4 +227,12 @@ tun_netns_name := tun_netns_name }; +template (value) UECUPS_IPv6SLAAC +ts_UECUPS_IPv6SLAAC(template (value) UECUPS_SockAddr local_gtp_ep, + template (value) uint32_t rx_teid) +:= { + local_gtp_ep := local_gtp_ep, + rx_teid := rx_teid +}; + } with { encode "JSON" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1570ccf5f98ac98c1af467c48f42b6b54ac3911d Gerrit-Change-Number: 42458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-uecups[master]: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel...
by pespin 20 Mar '26

20 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42457?usp=email ) Change subject: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel IPv6 global info ...................................................................... cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel IPv6 global info Change-Id: I917b5c70f143d48b55b4e270e24594d1a36f71aa --- M daemon/cups_client.c M daemon/gtp_endpoint.c M daemon/internal.h M ttcn3/UECUPS_Types.ttcn 4 files changed, 158 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/57/42457/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index e283f23..f7c6f1a 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -133,6 +133,92 @@ return jret; } +json_t *gen_uecups_ep(const struct gtp_endpoint *ep) +{ + json_t *jret = json_object(); + char *addr_type; + char ip_str[32+1]; + uint16_t port; + + switch (ep->bind_addr.u.sa.sa_family) { + case AF_INET: + addr_type = "IPV4"; + osmo_hexdump_buf(ip_str, sizeof(ip_str), + (const unsigned char *)&ep->bind_addr.u.sin.sin_addr, + sizeof(ep->bind_addr.u.sin.sin_addr), + "", true); + break; + case AF_INET6: + addr_type = "IPV6"; + osmo_hexdump_buf(ip_str, sizeof(ip_str), + (const unsigned char *)&ep->bind_addr.u.sin6.sin6_addr, + sizeof(ep->bind_addr.u.sin6.sin6_addr), + "", true); + break; + default: + OSMO_ASSERT(0); + } + port = osmo_sockaddr_port(&ep->bind_addr.u.sa); + + json_object_set_new(jret, "addr_type", json_string(addr_type)); + json_object_set_new(jret, "ip", json_string(ip_str)); + json_object_set_new(jret, "Port", json_integer(port)); + + return jret; +} + +void cc_ipv6_slaac_ind(const struct gtp_tunnel *t) +{ + struct gtp_endpoint *ep = t->gtp_ep; + struct cups_client *cc; + json_t *jtx = json_object(); + json_t *jslaac_ind = json_object(); + json_t *jep; + char *json_str = NULL; + unsigned int json_strlen; + char ipv6_str[32+1]; + + LOGP(DUECUPS, LOGL_INFO, "ipv6_slaac_ind\n"); + + OSMO_ASSERT(jtx); + OSMO_ASSERT(jslaac_ind); + + json_object_set_new(jtx, "ipv6_slaac_ind", jslaac_ind); + + jep = gen_uecups_ep(ep); + if (!jep) + goto free_ret; + json_object_set_new(jslaac_ind, "local_gtp_ep", jep); + + json_object_set_new(jslaac_ind, "rx_teid", json_integer(t->rx_teid)); + + osmo_hexdump_buf(ipv6_str, sizeof(ipv6_str), + (const unsigned char *)&t->user_addr_ipv6_prefix.u.sin6.sin6_addr, + 8, "", true); + json_object_set_new(jslaac_ind, "ipv6_prefix", json_string(ipv6_str)); + + osmo_hexdump_buf(ipv6_str, sizeof(ipv6_str), + (const unsigned char *)&t->user_addr.u.sin6.sin6_addr, + sizeof(t->user_addr.u.sin6.sin6_addr), + "", true); + json_object_set_new(jslaac_ind, "ipv6_user_addr", json_string(ipv6_str)); + + json_str = json_dumps(jtx, JSON_SORT_KEYS); + if (!json_str) { + LOGT(t, LOGL_ERROR, "Error encoding JSON\n"); + goto free_ret; + } + json_strlen = strlen(json_str); + + llist_for_each_entry(cc, &t->d->cups_clients, list) + cups_client_tx_json_str(cc, json_str, json_strlen); + +free_ret: + if (jtx) + json_decref(jtx); + free(json_str); +} + static int parse_ep(struct osmo_sockaddr *out, json_t *in) { json_t *jaddr_type, *jport, *jip; @@ -525,6 +611,38 @@ return 0; } +static int cups_client_handle_ipv6_slaac(struct cups_client *cc, json_t *cmd) +{ + struct osmo_sockaddr local_ep_addr; + json_t *jlocal_gtp_ep, *jrx_teid; + uint32_t rx_teid; + int rc; + + jlocal_gtp_ep = json_object_get(cmd, "local_gtp_ep"); + jrx_teid = json_object_get(cmd, "rx_teid"); + + if (!jlocal_gtp_ep || !jrx_teid) + return -EINVAL; + + if (!json_is_object(jlocal_gtp_ep) || !json_is_integer(jrx_teid)) + return -EINVAL; + + rc = parse_ep(&local_ep_addr, jlocal_gtp_ep); + if (rc < 0) + return rc; + rx_teid = json_integer_value(jrx_teid); + + rc = gtp_tunnel_tx_icmpv6_rs(g_daemon, &local_ep_addr, rx_teid); + if (rc < 0) { + LOGCC(cc, LOGL_NOTICE, "Failed to start IPv6 SLAAC\n"); + cups_client_tx_json(cc, gen_uecups_result("ipv6_slaac_res", "ERR_IPv6_SLAAC_FAILED")); + } else { + cups_client_tx_json(cc, gen_uecups_result("ipv6_slaac_res", "OK")); + } + + return 0; +} + static int cups_client_handle_json(struct cups_client *cc, json_t *jroot) { void *iter; @@ -549,6 +667,8 @@ rc = cups_client_handle_start_program(cc, cmd); } else if (!strcmp(key, "reset_all_state")) { rc = cups_client_handle_reset_all_state(cc, cmd); + } else if (!strcmp(key, "ipv6_slaac")) { + rc = cups_client_handle_ipv6_slaac(cc, cmd); } else { LOGCC(cc, LOGL_NOTICE, "Unknown command '%s' received\n", key); return -EINVAL; diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 8d3c2b0..29422a1 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -86,6 +86,9 @@ inet_ntop(AF_INET6, &t->user_addr.u.sin6.sin6_addr, &ip6strbuf[1][0], sizeof(ip6strbuf[1])), strerror(-rc)); } + + /* Notify cups_client about the new available IPv6 prefix and global address: */ + cc_ipv6_slaac_ind(t); } } } diff --git a/daemon/internal.h b/daemon/internal.h index 2394e2c..5d4b832 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -155,6 +155,7 @@ struct osmo_stream_srv_link *cups_srv_link_create(struct gtp_daemon *d); void child_terminated(struct gtp_daemon *d, int pid, int status); +void cc_ipv6_slaac_ind(const struct gtp_tunnel *t); json_t *gen_uecups_result(const char *name, const char *res); int cups_client_tx_json(struct cups_client *cc, json_t *jtx); diff --git a/ttcn3/UECUPS_Types.ttcn b/ttcn3/UECUPS_Types.ttcn index 29fa738..45466c8 100644 --- a/ttcn3/UECUPS_Types.ttcn +++ b/ttcn3/UECUPS_Types.ttcn @@ -101,6 +101,27 @@ UECUPS_Result result }; +/* Perform IPv6 SLAAC on GTP-U tunnel to obtain IPv6 global IPv6 address for the UE */ +type record UECUPS_IPv6SLAAC { + /* local GTP endpoint + TEID are sufficient for unique identification */ + UECUPS_SockAddr local_gtp_ep, + uint32_t rx_teid +}; + +type record UECUPS_IPv6SLAACRes { + UECUPS_Result result +}; + +/* Daemon informs us that IPv6 SLAAC was terminated */ +type record UECUPS_IPv6SLAACInd { + /* local GTP endpoint + TEID are sufficient for unique identification */ + UECUPS_SockAddr local_gtp_ep, + uint32_t rx_teid, + OCT8 ipv6_prefix, + OCT16 ipv6_user_addr +}; + + type union PDU_UECUPS { UECUPS_CreateTun create_tun, UECUPS_CreateTunRes create_tun_res, @@ -113,7 +134,11 @@ UECUPS_ProgramTermInd program_term_ind, UeCUPS_ResetAllState reset_all_state, - UeCUPS_ResetAllStateRes reset_all_state_res + UeCUPS_ResetAllStateRes reset_all_state_res, + + UECUPS_IPv6SLAAC ipv6_slaac, + UECUPS_IPv6SLAACRes ipv6_slaac_res, + UECUPS_IPv6SLAACInd ipv6_slaac_ind }; @@ -202,4 +227,12 @@ tun_netns_name := tun_netns_name }; +template (value) UECUPS_IPv6SLAAC +ts_UECUPS_IPv6SLAAC(template (value) UECUPS_SockAddr local_gtp_ep, + template (value) uint32_t rx_teid) +:= { + local_gtp_ep := local_gtp_ep, + rx_teid := rx_teid +}; + } with { encode "JSON" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42457?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I917b5c70f143d48b55b4e270e24594d1a36f71aa Gerrit-Change-Number: 42457 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026