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

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

21 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

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

21 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

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

21 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-uecups[master]: cups_client: Add commands to perform IPv6 SLAAC and obtain GTP tunnel...
by pespin 21 Mar '26

21 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 21 Mar '26

21 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

[L] Change in osmo-uecups[master]: Implement logic to perform IPv6 SLAAC in GTPU tunnel
by pespin 21 Mar '26

21 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42456?usp=email ) Change subject: Implement logic to perform IPv6 SLAAC in GTPU tunnel ...................................................................... Implement logic to perform IPv6 SLAAC in GTPU tunnel The IPv6 SLAAC prcoedure is not yet triggered in this patch; it will be triggered by cups_client's new command in follow-up patch. Change-Id: I837a4d7ec7c134412ab4a2e09909670e81ecbeea --- M daemon/Makefile.am A daemon/checksum.c A daemon/checksum.h M daemon/gtp_endpoint.c M daemon/gtp_tunnel.c A daemon/icmpv6.c A daemon/icmpv6.h M daemon/internal.h M daemon/main.c M daemon/tun_device.c 10 files changed, 605 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/56/42456/1 diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 89afe7a..fe8b027 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -26,7 +26,9 @@ $(NULL) noinst_HEADERS = \ + checksum.h \ gtp.h \ + icmpv6.h \ internal.h \ $(NULL) @@ -35,6 +37,7 @@ $(NULL) osmo_uecups_daemon_SOURCES = \ + checksum.c \ cups_client.c \ utility.c \ tun_device.c \ @@ -42,5 +45,6 @@ gtp_endpoint.c \ gtp_tunnel.c \ daemon_vty.c \ + icmpv6.c \ main.c \ $(NULL) diff --git a/daemon/checksum.c b/daemon/checksum.c new file mode 100644 index 0000000..4b23897 --- /dev/null +++ b/daemon/checksum.c @@ -0,0 +1,211 @@ +/* + * + * INET An implementation of the TCP/IP protocol suite for the LINUX + * operating system. INET is implemented using the BSD Socket + * interface as the means of communication with the user level. + * + * IP/TCP/UDP checksumming routines + * + * Authors: Jorge Cwik, <jorge(a)laser.satlink.net> + * Arnt Gulbrandsen, <agulbra(a)nvg.unit.no> + * Tom May, <ftom(a)netcom.com> + * Andreas Schwab, <schwab(a)issan.informatik.uni-dortmund.de> + * Lots of code moved from tcp.c and ip.c; see those files + * for more names. + * + * 03/02/96 Jes Sorensen, Andreas Schwab, Roman Hodek: + * Fixed some nasty bugs, causing some horrible crashes. + * A: At some points, the sum (%0) was used as + * length-counter instead of the length counter + * (%1). Thanks to Roman Hodek for pointing this out. + * B: GCC seems to mess up if one uses too many + * data-registers to hold input values and one tries to + * specify d0 and d1 as scratch registers. Letting gcc + * choose these registers itself solves the problem. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +/* Revised by Kenneth Albanowski for m68knommu. Basic problem: unaligned access + kills, so most of the assembly has to go. */ + +#if defined(__FreeBSD__) +#define _KERNEL /* needed on FreeBSD 10.x for s6_addr32 */ +#include <sys/types.h> +#include <netinet/in.h> +#include <sys/endian.h> +#endif + +#include "checksum.h" +#include <arpa/inet.h> + +static inline unsigned short from32to16(unsigned int x) +{ + /* add up 16-bit and 16-bit for 16+c bit */ + x = (x & 0xffff) + (x >> 16); + /* add up carry.. */ + x = (x & 0xffff) + (x >> 16); + return x; +} + +static unsigned int do_csum(const unsigned char *buff, int len) +{ + int odd; + unsigned int result = 0; + + if (len <= 0) + goto out; + odd = 1 & (unsigned long) buff; + if (odd) { +#if BYTE_ORDER == LITTLE_ENDIAN + result += (*buff << 8); +#else + result = *buff; +#endif + len--; + buff++; + } + if (len >= 2) { + if (2 & (unsigned long) buff) { + result += *(unsigned short *) buff; + len -= 2; + buff += 2; + } + if (len >= 4) { + const unsigned char *end = buff + ((unsigned)len & ~3); + unsigned int carry = 0; + do { + unsigned int w = *(unsigned int *) buff; + buff += 4; + result += carry; + result += w; + carry = (w > result); + } while (buff < end); + result += carry; + result = (result & 0xffff) + (result >> 16); + } + if (len & 2) { + result += *(unsigned short *) buff; + buff += 2; + } + } + if (len & 1) +#if BYTE_ORDER == LITTLE_ENDIAN + result += *buff; +#else + result += (*buff << 8); +#endif + result = from32to16(result); + if (odd) + result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); +out: + return result; +} + +/* + * This is a version of ip_compute_csum() optimized for IP headers, + * which always checksum on 4 octet boundaries. + */ +uint16_t ip_fast_csum(const void *iph, unsigned int ihl) +{ + return (uint16_t)~do_csum(iph, ihl*4); +} + +/* + * computes the checksum of a memory block at buff, length len, + * and adds in "sum" (32-bit) + * + * returns a 32-bit number suitable for feeding into itself + * or csum_tcpudp_magic + * + * this function must be called with even lengths, except + * for the last fragment, which may be odd + * + * it's best to have buff aligned on a 32-bit boundary + */ +uint32_t csum_partial(const void *buff, int len, uint32_t wsum) +{ + unsigned int sum = (unsigned int)wsum; + unsigned int result = do_csum(buff, len); + + /* add in old sum, and carry.. */ + result += sum; + if (sum > result) + result += 1; + return (uint32_t)result; +} + +/* + * this routine is used for miscellaneous IP-like checksums, mainly + * in icmp.c + */ +uint16_t ip_compute_csum(const void *buff, int len) +{ + return (uint16_t)~do_csum(buff, len); +} + +uint16_t csum_ipv6_magic(const struct in6_addr *saddr, + const struct in6_addr *daddr, + uint32_t len, uint8_t proto, uint32_t csum) +{ + int carry; + uint32_t ulen; + uint32_t uproto; + uint32_t sum = (uint32_t)csum; + + sum += (uint32_t)saddr->s6_addr32[0]; + carry = (sum < (uint32_t)saddr->s6_addr32[0]); + sum += carry; + + sum += (uint32_t)saddr->s6_addr32[1]; + carry = (sum < (uint32_t)saddr->s6_addr32[1]); + sum += carry; + + sum += (uint32_t)saddr->s6_addr32[2]; + carry = (sum < (uint32_t)saddr->s6_addr32[2]); + sum += carry; + + sum += (uint32_t)saddr->s6_addr32[3]; + carry = (sum < (uint32_t)saddr->s6_addr32[3]); + sum += carry; + + sum += (uint32_t)daddr->s6_addr32[0]; + carry = (sum < (uint32_t)daddr->s6_addr32[0]); + sum += carry; + + sum += (uint32_t)daddr->s6_addr32[1]; + carry = (sum < (uint32_t)daddr->s6_addr32[1]); + sum += carry; + + sum += (uint32_t)daddr->s6_addr32[2]; + carry = (sum < (uint32_t)daddr->s6_addr32[2]); + sum += carry; + + sum += (uint32_t)daddr->s6_addr32[3]; + carry = (sum < (uint32_t)daddr->s6_addr32[3]); + sum += carry; + + ulen = (uint32_t)htonl((uint32_t) len); + sum += ulen; + carry = (sum < ulen); + sum += carry; + + uproto = (uint32_t)htonl(proto); + sum += uproto; + carry = (sum < uproto); + sum += carry; + + return csum_fold((uint32_t)sum); +} + +/* fold a partial checksum */ +uint16_t csum_fold(uint32_t csum) +{ + uint32_t sum = (uint32_t)csum; + sum = (sum & 0xffff) + (sum >> 16); + sum = (sum & 0xffff) + (sum >> 16); + return (uint16_t)~sum; +} diff --git a/daemon/checksum.h b/daemon/checksum.h new file mode 100644 index 0000000..4b22431 --- /dev/null +++ b/daemon/checksum.h @@ -0,0 +1,13 @@ +#pragma once +#include <stdint.h> +#include <netinet/in.h> + +uint16_t ip_fast_csum(const void *iph, unsigned int ihl); +uint32_t csum_partial(const void *buff, int len, uint32_t wsum); +uint16_t ip_compute_csum(const void *buff, int len); + +uint16_t csum_ipv6_magic(const struct in6_addr *saddr, + const struct in6_addr *daddr, + uint32_t len, uint8_t proto, uint32_t csum); + +uint16_t csum_fold(uint32_t csum); diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 3340aee..8d3c2b0 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -13,6 +13,9 @@ #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> +#include <arpa/inet.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> #include <pthread.h> @@ -22,6 +25,7 @@ #include <osmocom/core/logging.h> #include "gtp.h" +#include "icmpv6.h" #include "internal.h" #define LOGEP(ep, lvl, fmt, args ...) \ @@ -41,6 +45,51 @@ * GTP Endpoint (UDP socket) ***********************************************************************/ +static void handle_router_adv(struct gtp_tunnel *t, struct ip6_hdr *ip6h, struct icmpv6_radv_hdr *ra, size_t ra_len) +{ + struct icmpv6_opt_hdr *opt_hdr; + struct icmpv6_opt_prefix *opt_prefix; + int rc; + struct in6_addr rm; + char ip6strbuf[2][INET6_ADDRSTRLEN]; + memset(&rm, 0, sizeof(rm)); + + LOGT(t, LOGL_INFO, "Received ICMPv6 Router Advertisement\n"); + + foreach_icmpv6_opt(ra, ra_len, opt_hdr) { + if (opt_hdr->type == ICMPv6_OPT_TYPE_PREFIX_INFO) { + opt_prefix = (struct icmpv6_opt_prefix *)opt_hdr; + size_t prefix_len_bytes = (opt_prefix->prefix_len + 7)/8; + LOGT(t, LOGL_DEBUG, "Parsing OPT Prefix info (prefix_len=%u): %s\n", + opt_prefix->prefix_len, + osmo_hexdump((const unsigned char *)opt_prefix->prefix, prefix_len_bytes)); + + memcpy(&t->user_addr_ipv6_prefix.u.sin6.sin6_addr, + opt_prefix->prefix, + prefix_len_bytes); + memset(&((uint8_t *)&t->user_addr_ipv6_prefix.u.sin6.sin6_addr)[prefix_len_bytes], + 0, 16 - prefix_len_bytes); + + /* Pick second address in the prefix: */ + memcpy(&t->user_addr.u.sin6.sin6_addr, + &t->user_addr_ipv6_prefix.u.sin6.sin6_addr, + sizeof(t->user_addr_ipv6_prefix.u.sin6.sin6_addr)); + ((uint8_t *)&t->user_addr.u.sin6.sin6_addr)[15] = 2; + + LOGT(t, LOGL_INFO, "Adding global IPv6 prefix %s/%u address %s\n", + inet_ntop(AF_INET6, &t->user_addr_ipv6_prefix.u.sin6.sin6_addr, &ip6strbuf[0][0], sizeof(ip6strbuf[0])), + opt_prefix->prefix_len, + inet_ntop(AF_INET6, &t->user_addr.u.sin6.sin6_addr, &ip6strbuf[1][0], sizeof(ip6strbuf[1]))); + + if ((rc = osmo_netdev_add_addr(t->tun_dev->netdev, &t->user_addr, 64)) < 0) { + LOGT(t, LOGL_ERROR, "Cannot add global IPv6 user addr %s to tun device: %s\n", + inet_ntop(AF_INET6, &t->user_addr.u.sin6.sin6_addr, &ip6strbuf[1][0], sizeof(ip6strbuf[1])), + strerror(-rc)); + } + } + } +} + static void handle_gtp1u(struct gtp_endpoint *ep, const uint8_t *buffer, unsigned int nread) { struct gtp_daemon *d = ep->d; @@ -50,6 +99,7 @@ int rc, outfd; uint32_t teid; uint16_t gtp_len; + char ip6strbuf[200]; if (nread < sizeof(*gtph)) { LOGEP_NC(ep, LOGL_NOTICE, "Short read: %u < %lu\n", nread, sizeof(*gtph)); @@ -114,6 +164,54 @@ return; } outfd = t->tun_dev->fd; + + struct iphdr *iph = (struct iphdr *)payload; + struct ip6_hdr *ip6h; + struct icmpv6_radv_hdr *ra; + switch (iph->version) { + case 4: + if (t->user_addr.u.sa.sa_family != AF_INET) { + LOGT(t, LOGL_NOTICE, "Rx GTPU payload for unexpected IPv4 %s in non-IPv4 PDP Context\n", + inet_ntop(AF_INET, &iph->daddr, ip6strbuf, sizeof(ip6strbuf))); + goto unlock_ret; + } + if (memcmp(&iph->daddr, &t->user_addr.u.sin.sin_addr, 4) != 0) { + LOGT(t, LOGL_NOTICE, "Rx GTPU payload for unknown dst IP addr %s\n", + inet_ntop(AF_INET, &iph->daddr, ip6strbuf, sizeof(ip6strbuf))); + goto unlock_ret; + } + break; + case 6: + ip6h = (struct ip6_hdr *)payload; + if (t->user_addr.u.sa.sa_family != AF_INET6) { + LOGT(t, LOGL_NOTICE, "Rx GTPU payload for unexpected IPv6 %s in non-IPv6 PDP Context\n", + inet_ntop(AF_INET6, &ip6h->ip6_dst, ip6strbuf, sizeof(ip6strbuf))); + goto unlock_ret; + } + if (IN6_IS_ADDR_LINKLOCAL(&ip6h->ip6_dst)) { + if (memcmp(&ip6h->ip6_dst, &t->user_addr_ipv6_ll.u.sin6.sin6_addr, 16) != 0) { + LOGT(t, LOGL_NOTICE, "Rx GTPU payload for unknown link-local dst IP addr %s\n", + inet_ntop(AF_INET6, &ip6h->ip6_dst, ip6strbuf, sizeof(ip6strbuf))); + goto unlock_ret; + } + if ((ra = icmpv6_validate_router_adv(payload, gtp_len))) { + size_t ra_len = (uint8_t *)ra - (uint8_t *)payload; + handle_router_adv(t, (struct ip6_hdr *)payload, ra, ra_len); + goto unlock_ret; + } + /* Match by global IPv6 /64 prefix allocated through SLAAC: */ + } else if (memcmp(&ip6h->ip6_dst, &t->user_addr.u.sin6.sin6_addr, 8) != 0) { + LOGT(t, LOGL_NOTICE, "Rx GTPU payload for unknown global dst IP addr %s\n", + inet_ntop(AF_INET6, &ip6h->ip6_dst, ip6strbuf, sizeof(ip6strbuf))); + goto unlock_ret; + } + break; + default: + LOGT(t, LOGL_NOTICE, "Rx GTPU payload with unknown IP version %d\n", iph->version); + goto unlock_ret; + } + + outfd = t->tun_dev->fd; pthread_rwlock_unlock(&d->rwlock); /* 3) write to TUN device */ @@ -122,6 +220,11 @@ LOGEP_NC(ep, LOGL_FATAL, "Error writing to tun device %s\n", strerror(errno)); exit(1); } + return; + +unlock_ret: + pthread_rwlock_unlock(&d->rwlock); + return; } /* One thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) diff --git a/daemon/gtp_tunnel.c b/daemon/gtp_tunnel.c index 4c6b2c5..8447614 100644 --- a/daemon/gtp_tunnel.c +++ b/daemon/gtp_tunnel.c @@ -14,10 +14,9 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> -#include "internal.h" +#include "icmpv6.h" -#define LOGT(t, lvl, fmt, args ...) \ - LOGP(DGT, lvl, "%s: " fmt, (t)->name, ## args) +#include "internal.h" /*********************************************************************** * GTP Tunnel @@ -58,7 +57,8 @@ t->rx_teid = cpars->rx_teid; t->tx_teid = cpars->tx_teid; memcpy(&t->exthdr, &cpars->exthdr, sizeof(t->exthdr)); - memcpy(&t->user_addr, &cpars->user_addr, sizeof(t->user_addr)); + memcpy(&t->user_addr_ipv6_ll, &cpars->user_addr, sizeof(t->user_addr)); + memcpy(&t->user_addr, &t->user_addr_ipv6_ll, sizeof(t->user_addr_ipv6_ll)); memcpy(&t->remote_udp, &cpars->remote_udp, sizeof(t->remote_udp)); if ((rc = osmo_netdev_add_addr(t->tun_dev->netdev, &t->user_addr, 32)) < 0) { @@ -173,3 +173,40 @@ return rc; } + +/* Called with d->rwlock locked, tx_gtp1u_pk() will unlock. */ +static int _gtp_tunnel_tx_icmpv6_rs(struct gtp_tunnel *t) +{ + struct msgb *msg; + int rc; + + OSMO_ASSERT(t->user_addr.u.sa.sa_family == AF_INET6); + + msg = icmpv6_construct_rs(&t->user_addr.u.sin6.sin6_addr); + + pthread_rwlock_rdlock(&t->d->rwlock); + rc = tx_gtp1u_pkt(t, msg->head, msgb_data(msg), msgb_length(msg)); + /* pthread_rwlock_unlock() was called inside tx_gtp1u_pkt(). */ + if (rc < 0) + LOGT(t, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); + msgb_free(msg); + return 0; +} + +int gtp_tunnel_tx_icmpv6_rs(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr, uint32_t rx_teid) +{ + struct gtp_endpoint *ep; + + pthread_rwlock_wrlock(&d->rwlock); + ep = _gtp_endpoint_find(d, bind_addr); + if (ep) { + /* find tunnel for rx TEID within endpoint */ + struct gtp_tunnel *t = _gtp_tunnel_find_r(d, rx_teid, ep); + if (t) { + return _gtp_tunnel_tx_icmpv6_rs(t); + /* pthread_rwlock_unlock() was called inside _gtp_tunnel_tx_icmpv6_rs()->tx_gtp1u_pkt(). */ + } + } + pthread_rwlock_unlock(&d->rwlock); + return -ENOENT; +} diff --git a/daemon/icmpv6.c b/daemon/icmpv6.c new file mode 100644 index 0000000..39e80b9 --- /dev/null +++ b/daemon/icmpv6.c @@ -0,0 +1,117 @@ +/* Minimal ICMPv6 code for generating router advertisements as required by + * relevant 3GPP specs for a GGSN with IPv6 PDP contexts */ + +/* (C) 2017 by Harald Welte <laforge(a)gnumonks.org> + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + */ + +#include <stdint.h> +#include <stdbool.h> +#include <string.h> +#include <netinet/in.h> +#if defined(__FreeBSD__) +#include <sys/types.h> /* FreeBSD 10.x needs this before ip6.h */ +#include <sys/endian.h> +#endif +#include <netinet/ip6.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/socket.h> + +#include "checksum.h" +#include "icmpv6.h" +#include "internal.h" + +/* 29.061 11.2.1.3.4 IPv6 Router Configuration Variables in GGSN */ +#define GGSN_MaxRtrAdvInterval 21600 /* 6 hours */ +#define GGSN_MinRtrAdvInterval 16200 /* 4.5 hours */ +#define GGSN_AdvValidLifetime 0xffffffff /* infinite */ +#define GGSN_AdvPreferredLifetime 0xffffffff /* infinite */ + +/* RFC3307 link-local scope multicast address */ +const struct in6_addr all_router_mcast_addr = { + .s6_addr = { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 } +}; + +/* Prepends the ipv6 header and returns checksum content */ +uint16_t icmpv6_prepend_ip6hdr(struct msgb *msg, const struct in6_addr *saddr, + const struct in6_addr *daddr) +{ + uint32_t len; + uint16_t skb_csum; + struct ip6_hdr *i6h; + + /* checksum */ + skb_csum = csum_partial(msgb_data(msg), msgb_length(msg), 0); + len = msgb_length(msg); + skb_csum = csum_ipv6_magic(saddr, daddr, len, IPPROTO_ICMPV6, skb_csum); + + /* Push IPv6 header in front of ICMPv6 packet */ + i6h = (struct ip6_hdr *) msgb_push(msg, sizeof(*i6h)); + /* 4 bits version, 8 bits TC, 20 bits flow-ID */ + i6h->ip6_ctlun.ip6_un1.ip6_un1_flow = htonl(0x60000000); + i6h->ip6_ctlun.ip6_un1.ip6_un1_plen = htons(len); + i6h->ip6_ctlun.ip6_un1.ip6_un1_nxt = IPPROTO_ICMPV6; + i6h->ip6_ctlun.ip6_un1.ip6_un1_hlim = 255; + i6h->ip6_src = *saddr; + i6h->ip6_dst = *daddr; + return skb_csum; +} + +/*! construct a RFC4861 compliant ICMPv6 router soliciation + * \param[in] saddr Source IPv6 address for router advertisement + * \param[in] daddr Destination IPv6 address for router advertisement IPv6 header + * \param[in] prefix The single prefix to be advertised (/64 implied!) + * \returns callee-allocated message buffer containing router advertisement */ +struct msgb *icmpv6_construct_rs(const struct in6_addr *saddr) +{ + struct msgb *msg = msgb_alloc_headroom(512, 128, "IPv6 RS"); + struct icmpv6_rsol_hdr *rs; + OSMO_ASSERT(msg); + rs = (struct icmpv6_rsol_hdr *) msgb_put(msg, sizeof(*rs)); + rs->hdr.type = 133; /* see RFC4861 4.1 */ + rs->hdr.code = 0; /* see RFC4861 4.1 */ + rs->hdr.csum = 0; /* updated below */ + rs->reserved = 0; /* see RFC4861 4.1 */ + + rs->hdr.csum = icmpv6_prepend_ip6hdr(msg, saddr, &all_router_mcast_addr); + + return msg; +} + +/* Validate an ICMPv6 router advertisement according to RFC4861 6.1.2. + Returns pointer packet header on success, NULL otherwise. */ +struct icmpv6_radv_hdr *icmpv6_validate_router_adv(const uint8_t *pack, unsigned len) +{ + const struct ip6_hdr *ip6h = (struct ip6_hdr *)pack; + const struct icmpv6_hdr *ic6h = (struct icmpv6_hdr *) (pack + sizeof(*ip6h)); + + /* ICMP length (derived from IP length) is 16 or more octets */ + if (len < sizeof(*ip6h) + 16) + return NULL; + + if (ic6h->type != 134) /* router advertismenet type */ + return NULL; + + /*Routers must use their link-local address */ + if (!IN6_IS_ADDR_LINKLOCAL(&ip6h->ip6_src)) + return NULL; + /* Hop limit field must have 255 */ + if (ip6h->ip6_ctlun.ip6_un1.ip6_un1_hlim != 255) + return NULL; + /* ICMP Code is 0 */ + if (ic6h->code != 0) + return NULL; + /* ICMP length (derived from IP length) is 16 or more octets */ + if (ip6h->ip6_ctlun.ip6_un1.ip6_un1_plen < 16) + return NULL; + /* FIXME: All included options have a length > 0 */ + /* FIXME: If IP source is unspecified, no source link-layer addr option */ + return (struct icmpv6_radv_hdr *)ic6h; +} diff --git a/daemon/icmpv6.h b/daemon/icmpv6.h new file mode 100644 index 0000000..751f0a9 --- /dev/null +++ b/daemon/icmpv6.h @@ -0,0 +1,100 @@ +#pragma once + +#include <stdbool.h> +#include <netinet/in.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/endian.h> + +#include "gtp.h" + +#define ICMPv6_OPT_TYPE_PREFIX_INFO 0x03 + +#define foreach_icmpv6_opt(icmpv6_pkt, icmpv6_len, opt_hdr) \ + for (opt_hdr = (struct icmpv6_opt_hdr *)(icmpv6_pkt)->options; \ + (uint8_t *)(opt_hdr) + sizeof(struct icmpv6_opt_hdr) <= (((uint8_t *)(icmpv6_pkt)) + (icmpv6_len)); \ + opt_hdr = (struct icmpv6_opt_hdr *)((uint8_t *)(opt_hdr) + (opt_hdr)->len) \ + ) + +struct icmpv6_hdr { + uint8_t type; + uint8_t code; + uint16_t csum; +} __attribute__ ((packed)); + +struct icmpv6_echo_hdr { + struct icmpv6_hdr hdr; + uint16_t ident; /* Identifier */ + uint16_t seq; /* Sequence number */ + uint8_t data[0]; /* Data */ +} __attribute__ ((packed)); + +/* RFC4861 Section 4.1 */ +struct icmpv6_rsol_hdr { + struct icmpv6_hdr hdr; + uint32_t reserved; + uint8_t options[0]; +} __attribute__ ((packed)); + +/* RFC4861 Section 4.2 */ +struct icmpv6_radv_hdr { + struct icmpv6_hdr hdr; + uint8_t cur_ho_limit; +#if OSMO_IS_LITTLE_ENDIAN + uint8_t res:6, + m:1, + o:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */ + uint8_t o:1, m:1, res:6; +#endif + uint16_t router_lifetime; + uint32_t reachable_time; + uint32_t retrans_timer; + uint8_t options[0]; +} __attribute__ ((packed)); + + +/* RFC4861 Section 4.6 */ +struct icmpv6_opt_hdr { + uint8_t type; + /* length in units of 8 octets, including type+len! */ + uint8_t len; + uint8_t data[0]; +} __attribute__ ((packed)); + +/* RFC4861 Section 4.6.2 */ +struct icmpv6_opt_prefix { + struct icmpv6_opt_hdr hdr; + uint8_t prefix_len; +#if OSMO_IS_LITTLE_ENDIAN + uint8_t res:6, + a:1, + l:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */ + uint8_t l:1, a:1, res:6; +#endif + uint32_t valid_lifetime; + uint32_t preferred_lifetime; + uint32_t res2; + uint8_t prefix[16]; +} __attribute__ ((packed)); + +/* RFC4861 Section 4.6.4 */ +struct icmpv6_opt_mtu { + struct icmpv6_opt_hdr hdr; + uint16_t reserved; + uint32_t mtu; +} __attribute__ ((packed)); + +uint16_t icmpv6_prepend_ip6hdr(struct msgb *msg, const struct in6_addr *saddr, + const struct in6_addr *daddr); + +struct msgb *icmpv6_construct_rs(const struct in6_addr *saddr); + +struct icmpv6_radv_hdr *icmpv6_validate_router_adv(const uint8_t *pack, unsigned len); + + +/* RFC3307 link-local scope multicast address */ +extern const struct in6_addr all_router_mcast_addr; diff --git a/daemon/internal.h b/daemon/internal.h index ae2356b..2394e2c 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -14,6 +14,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> #include <osmocom/core/netdev.h> +#include <osmocom/core/logging.h> #include <osmocom/netif/stream.h> @@ -35,6 +36,7 @@ DEP, DGT, DUECUPS, + DICMP6, }; @@ -43,6 +45,7 @@ ***********************************************************************/ struct gtp_daemon; +struct gtp_tunnel; /* local UDP socket for GTP communication */ struct gtp_endpoint { @@ -199,6 +202,8 @@ uint32_t rx_teid; /* End user Address (inner IP) */ + struct osmo_sockaddr user_addr_ipv6_ll; + struct osmo_sockaddr user_addr_ipv6_prefix; struct osmo_sockaddr user_addr; /* Remote UDP IP/Port*/ @@ -241,7 +246,12 @@ void _gtp_tunnel_destroy(struct gtp_tunnel *t); bool gtp_tunnel_destroy(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr, uint32_t rx_teid); +int gtp_tunnel_tx_icmpv6_rs(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr, uint32_t rx_teid); +int tx_gtp1u_pkt(struct gtp_tunnel *t, uint8_t *base_buffer, const uint8_t *payload, unsigned int payload_len); + +#define LOGT(t, lvl, fmt, args ...) \ + LOGP(DGT, lvl, "%s: " fmt, (t)->name, ## args) /*********************************************************************** * GTP Daemon diff --git a/daemon/main.c b/daemon/main.c index b00e5d3..c604f02 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -100,7 +100,11 @@ .description = "UE Control User Plane Separation", .enabled = 1, .loglevel = LOGL_DEBUG, }, - + [DICMP6] = { + .name = "DICMP6", + .description = "ICMPv6 (SLAAC) PDU Session setup", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, }; static const struct log_info log_info = { diff --git a/daemon/tun_device.c b/daemon/tun_device.c index c12c694..1178c7a 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -139,7 +139,7 @@ } /* Note: This function is called with d->rwlock locked, and it's responsible of unlocking it before returning. */ -static int tx_gtp1u_pkt(struct gtp_tunnel *t, uint8_t *base_buffer, const uint8_t *payload, unsigned int payload_len) +int tx_gtp1u_pkt(struct gtp_tunnel *t, uint8_t *base_buffer, const uint8_t *payload, unsigned int payload_len) { struct gtp1_header *gtph; unsigned int head_len = payload - base_buffer; -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42456?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: I837a4d7ec7c134412ab4a2e09909670e81ecbeea Gerrit-Change-Number: 42456 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 21 Mar '26

21 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

[S] Change in osmo-uecups[master]: cups_client: Log error decoding EUA
by fixeria 21 Mar '26

21 Mar '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42454?usp=email ) Change subject: cups_client: Log error decoding EUA ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42454?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: I98c7841da0f2662291aab5180f6113cb5fca4867 Gerrit-Change-Number: 42454 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 14:58:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: tun: Fix typo in log line and comment
by pespin 21 Mar '26

21 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/42453?usp=email ) Change subject: tun: Fix typo in log line and comment ...................................................................... tun: Fix typo in log line and comment Change-Id: I2f7ec968035193e00652dc27217f46e0719e56e8 --- M src/core/tun.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/core/tun.c b/src/core/tun.c index 537caf9..4e2a902 100644 --- a/src/core/tun.c +++ b/src/core/tun.c @@ -305,11 +305,11 @@ * iface with a given name above and attempting to retrieve its ifindex based * on that name. Someone (ie udev) could have the iface renamed in * between here. It's a pity that TUNSETIFF doesn't copy back to us the - * newly allocated ifinidex as it does with ifname) + * newly allocated ifindex as it does with ifname) */ tundev->ifindex = if_nametoindex(tundev->dev_name); if (tundev->ifindex == 0) { - LOGTUN(tundev, LOGL_ERROR, "Unable to find ifinidex for dev %s\n", + LOGTUN(tundev, LOGL_ERROR, "Unable to find ifindex for dev %s\n", tundev->dev_name); rc = -ENODEV; goto close_ret; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/42453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2f7ec968035193e00652dc27217f46e0719e56e8 Gerrit-Change-Number: 42453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: tun: Fix typo in log line and comment
by osmith 21 Mar '26

21 Mar '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/42453?usp=email ) Change subject: tun: Fix typo in log line and comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/42453?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: I2f7ec968035193e00652dc27217f46e0719e56e8 Gerrit-Change-Number: 42453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 13:37:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026