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

21 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42455?usp=email ) Change subject: cups_client: SPlit Tx of json str into its own function ...................................................................... cups_client: SPlit Tx of json str into its own function This helper can be used in the future to submit a str multiple times (eg. to multiple cups clients) without having to re-allocate the content. Change-Id: I505bf2eeea998a749e55f8f3b05c5013b5761297 --- M daemon/cups_client.c 1 file changed, 22 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/55/42455/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index acadcd5..e283f23 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -85,13 +85,30 @@ talloc_free(sproc); } +static int cups_client_tx_json_str(struct cups_client *cc, const char *json_str, unsigned int json_strlen) +{ + struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); + char *out; + LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); + + if (json_strlen > msgb_tailroom(msg)) { + LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); + return 0; + } + + out = (char *)msgb_put(msg, json_strlen); + memcpy(out, json_str, json_strlen); + osmo_stream_srv_send(cc->srv, msg); + + return 0; +} + /* Send JSON to a given client/connection */ int cups_client_tx_json(struct cups_client *cc, json_t *jtx) { - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Tx JSON"); char *json_str = json_dumps(jtx, JSON_SORT_KEYS); - char *out; - int json_strlen; + unsigned int json_strlen; + int rc; json_decref(jtx); if (!json_str) { @@ -100,20 +117,9 @@ } json_strlen = strlen(json_str); - LOGCC(cc, LOGL_DEBUG, "JSON Tx '%s'\n", json_str); - - if (json_strlen > msgb_tailroom(msg)) { - LOGCC(cc, LOGL_ERROR, "Not enough room for JSON in msgb\n"); - free(json_str); - return 0; - } - - out = (char *)msgb_put(msg, json_strlen); - memcpy(out, json_str, json_strlen); + rc = cups_client_tx_json_str(cc, json_str, json_strlen); free(json_str); - osmo_stream_srv_send(cc->srv, msg); - - return 0; + return rc; } json_t *gen_uecups_result(const char *name, const char *res) -- 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: newchange 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>

1 0

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

21 Mar '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42454?usp=email ) Change subject: cups_client: Log error decoding EUA ...................................................................... cups_client: Log error decoding EUA Change-Id: I98c7841da0f2662291aab5180f6113cb5fca4867 --- M daemon/cups_client.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/54/42454/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index 578719b..acadcd5 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -188,18 +188,24 @@ if (!strcmp(addr_type, "IPV4")) { struct sockaddr_in *sin = &out->u.sin; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) + if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) { + LOGP(DUECUPS, LOGL_NOTICE, "Failed parsing EUA %s type %s\n", ip, addr_type); return -EINVAL; + } memcpy(&sin->sin_addr, buf, 4); sin->sin_family = AF_INET; } else if (!strcmp(addr_type, "IPV6")) { struct sockaddr_in6 *sin6 = &out->u.sin6; - if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) + if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) { + LOGP(DUECUPS, LOGL_NOTICE, "Failed parsing EUA %s type %s\n", ip, addr_type); return -EINVAL; + } memcpy(&sin6->sin6_addr, buf, 16); sin6->sin6_family = AF_INET6; - } else + } else { + LOGP(DUECUPS, LOGL_NOTICE, "Unknown EUA type %s\n", addr_type); return -EINVAL; + } return 0; } -- 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: newchange 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>

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netdev API
by pespin 21 Mar '26

21 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email ) Change subject: Use libosmocore netdev API ...................................................................... Use libosmocore netdev API Depends: libosmocore.git Change-Id I75153eb59e96a6a2505dc5b29432c76e5c21ea24 Change-Id: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 --- A TODO-RELEASE M daemon/Makefile.am M daemon/gtp_tunnel.c M daemon/internal.h D daemon/netdev.c M daemon/tun_device.c 6 files changed, 68 insertions(+), 182 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..8eda384 --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,10 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line +libosmocore >1.13.1 osmo_netdev_del_addr() diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 1c680a6..89afe7a 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -37,7 +37,6 @@ osmo_uecups_daemon_SOURCES = \ cups_client.c \ utility.c \ - netdev.c \ tun_device.c \ gtp_daemon.c \ gtp_endpoint.c \ diff --git a/daemon/gtp_tunnel.c b/daemon/gtp_tunnel.c index a13b163..4c6b2c5 100644 --- a/daemon/gtp_tunnel.c +++ b/daemon/gtp_tunnel.c @@ -25,6 +25,7 @@ struct gtp_tunnel *gtp_tunnel_alloc(struct gtp_daemon *d, const struct gtp_tunnel_params *cpars) { struct gtp_tunnel *t; + int rc; t = talloc_zero(d, struct gtp_tunnel); if (!t) @@ -60,9 +61,9 @@ memcpy(&t->user_addr, &cpars->user_addr, sizeof(t->user_addr)); memcpy(&t->remote_udp, &cpars->remote_udp, sizeof(t->remote_udp)); - if (netdev_add_addr(t->tun_dev->nl, t->tun_dev->ifindex, &t->user_addr) < 0) { + if ((rc = osmo_netdev_add_addr(t->tun_dev->netdev, &t->user_addr, 32)) < 0) { LOGT(t, LOGL_ERROR, "Cannot add user addr to tun device: %s\n", - strerror(errno)); + strerror(-rc)); } /* TODO: hash table? */ @@ -134,12 +135,14 @@ /* UNLOCKED destroy of tunnel; drops references to EP + TUN */ void _gtp_tunnel_destroy(struct gtp_tunnel *t) { + int rc; + LOGT(t, LOGL_NOTICE, "Destroying\n"); /* talloc is not thread safe, all alloc/free must come from main thread */ ASSERT_MAIN_THREAD(t->d); - if (netdev_del_addr(t->tun_dev->nl, t->tun_dev->ifindex, &t->user_addr) < 0) - LOGT(t, LOGL_ERROR, "Cannot remove user address: %s\n", strerror(errno)); + if ((rc = osmo_netdev_del_addr(t->tun_dev->netdev, &t->user_addr, 32)) < 0) + LOGT(t, LOGL_ERROR, "Cannot remove user address: %s\n", strerror(-rc)); llist_del(&t->list); diff --git a/daemon/internal.h b/daemon/internal.h index 7a016fa..ae2356b 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -13,6 +13,7 @@ #include <osmocom/core/it_q.h> #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> +#include <osmocom/core/netdev.h> #include <osmocom/netif/stream.h> @@ -36,15 +37,6 @@ DUECUPS, }; -/*********************************************************************** - * netdev / netlink - ***********************************************************************/ - -int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa); -int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa); -int netdev_set_link(struct nl_sock *nlsk, int ifindex, bool up); -int netdev_add_defaultroute(struct nl_sock *nlsk, int ifindex, uint8_t family); - /*********************************************************************** * GTP Endpoint (UDP socket) @@ -115,8 +107,7 @@ const char *netns_name; int netns_fd; - /* netlink socket in the namespace of the tun device */ - struct nl_sock *nl; + struct osmo_netdev *netdev; /* list of local addresses? or simply only have the kernel know thses? */ diff --git a/daemon/netdev.c b/daemon/netdev.c deleted file mode 100644 index 165a6bc..0000000 --- a/daemon/netdev.c +++ /dev/null @@ -1,137 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <unistd.h> -#include <stdint.h> -#include <stdbool.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/socket.h> - -#include <netinet/ip.h> -#include <netinet/ip6.h> - -#include <linux/if.h> -#include <linux/if_tun.h> -#include <sys/ioctl.h> - -#include <linux/netlink.h> -#include <netlink/socket.h> -#include <netlink/route/link.h> -#include <netlink/route/addr.h> -#include <netlink/route/route.h> -#include <netlink/route/nexthop.h> - -#include <osmocom/core/utils.h> -#include <osmocom/core/socket.h> - -/*********************************************************************** - * netlink helper functions - ***********************************************************************/ - -static int _netdev_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa, bool add) -{ - struct nl_addr *local = NULL; - struct rtnl_addr *addr; - int rc; - - switch (osa->u.sa.sa_family) { - case AF_INET: - local = nl_addr_build(AF_INET, &osa->u.sin.sin_addr, 4); - break; - case AF_INET6: - local = nl_addr_build(AF_INET6, &osa->u.sin6.sin6_addr, 16); - break; - } - OSMO_ASSERT(local); - - addr = rtnl_addr_alloc(); - OSMO_ASSERT(addr); - rtnl_addr_set_ifindex(addr, ifindex); - OSMO_ASSERT(rtnl_addr_set_local(addr, local) == 0); - - if (add) - rc = rtnl_addr_add(nlsk, addr, 0); - else - rc = rtnl_addr_delete(nlsk, addr, 0); - - rtnl_addr_put(addr); - - return rc; -} - -int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa) -{ - return _netdev_addr(nlsk, ifindex, osa, true); -} - -int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa) -{ - return _netdev_addr(nlsk, ifindex, osa, false); -} - -int netdev_set_link(struct nl_sock *nlsk, int ifindex, bool up) -{ - struct rtnl_link *link, *change; - int rc; - - rc = rtnl_link_get_kernel(nlsk, ifindex, NULL, &link); - if (rc < 0) - return rc; - - change = rtnl_link_alloc(); - OSMO_ASSERT(change); - - if (up) - rtnl_link_set_flags(change, IFF_UP); - else - rtnl_link_unset_flags(change, IFF_UP); - - rc = rtnl_link_change(nlsk, link, change, 0); - - rtnl_link_put(change); - rtnl_link_put(link); - - return rc; -} - -int netdev_add_defaultroute(struct nl_sock *nlsk, int ifindex, uint8_t family) -{ - struct rtnl_route *route = rtnl_route_alloc(); - struct rtnl_nexthop *nhop = rtnl_route_nh_alloc(); - struct nl_addr *dst, *gw; - uint8_t buf[16]; - int rc; - - OSMO_ASSERT(route); - OSMO_ASSERT(nhop); - - /* destination address of route: all-zero */ - memset(buf, 0, sizeof(buf)); - dst = nl_addr_build(family, buf, family == AF_INET ? 4 : 16); - OSMO_ASSERT(dst); - nl_addr_set_prefixlen(dst, 0); - - /* gateway address of route: also all-zero */ - gw = nl_addr_clone(dst); - OSMO_ASSERT(gw); - - /* nexthop for route */ - rtnl_route_nh_set_ifindex(nhop, ifindex); - rtnl_route_nh_set_gateway(nhop, gw); - - /* tie everything together in the route */ - rtnl_route_set_dst(route, dst); - rtnl_route_set_family(route, family); - rtnl_route_add_nexthop(route, nhop); - - rc = rtnl_route_add(nlsk, route, NLM_F_CREATE); - - //rtnl_route_nh_free(nhop); - nl_addr_put(gw); - nl_addr_put(dst); - rtnl_route_put(route); - - return rc; -} diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 837fd9d..c12c694 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -16,7 +16,7 @@ #include <fcntl.h> #include <signal.h> #include <netdb.h> - +#include <net/if.h> #include <netinet/ip.h> #include <netinet/ip6.h> @@ -26,10 +26,6 @@ #include <linux/if_tun.h> #include <sys/ioctl.h> -#include <linux/netlink.h> -#include <netlink/socket.h> -#include <netlink/route/link.h> - #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> @@ -318,9 +314,9 @@ static struct tun_device * _tun_device_create(struct gtp_daemon *d, const char *devname, const char *netns_name) { - struct rtnl_link *link; struct tun_device *tun; struct osmo_netns_switch_state switch_state; + bool inside_netns = false; int rc; tun = talloc_zero(d, struct tun_device); @@ -349,6 +345,7 @@ tun->netns_name, strerror(errno)); goto err_close_ns; } + inside_netns = true; } tun->fd = tun_open(0, tun->devname); @@ -357,49 +354,72 @@ goto err_restore_ns; } - tun->nl = nl_socket_alloc(); - if (!tun->nl || nl_connect(tun->nl, NETLINK_ROUTE) < 0) { - LOGTUN(tun, LOGL_ERROR, "Cannot create netlink socket in namespace '%s'\n", - tun->netns_name); + /* Store interface index: + * (Note: there's a potential race condition here between creating the + * 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 ifindex as it does with ifname) + */ + tun->ifindex = if_nametoindex(tun->devname); + if (tun->ifindex == 0) { + LOGTUN(tun, LOGL_ERROR, "Unable to find ifindex for dev %s\n", + tun->devname); goto err_close; } - rc = rtnl_link_get_kernel(tun->nl, 0, tun->devname, &link); - if (rc < 0) { - LOGTUN(tun, LOGL_ERROR, "Cannot get ifindex for netif after create?!?\n"); - goto err_free_nl; - } - tun->ifindex = rtnl_link_get_ifindex(link); - rtnl_link_put(link); - /* switch back to default namespace before creating new thread */ - if (tun->netns_name) + if (inside_netns) { OSMO_ASSERT(osmo_netns_switch_exit(&switch_state) == 0); + inside_netns = false; + } + + tun->netdev = osmo_netdev_alloc(tun, tun->devname); + if (tun->netns_name) { + rc = osmo_netdev_set_netns_name(tun->netdev, tun->netns_name); + if (rc < 0) + goto err_free_netdev; + } + rc = osmo_netdev_set_ifindex(tun->netdev, tun->ifindex); + if (rc < 0) + goto err_free_netdev; + + rc = osmo_netdev_register(tun->netdev); + if (rc < 0) + goto err_free_netdev; /* bring the network device up */ - rc = netdev_set_link(tun->nl, tun->ifindex, true); + rc = osmo_netdev_ifupdown(tun->netdev, true); if (rc < 0) LOGTUN(tun, LOGL_ERROR, "Cannot set interface to 'up'\n"); if (tun->netns_name) { - rc = netdev_add_defaultroute(tun->nl, tun->ifindex, AF_INET); + struct osmo_sockaddr osa; + + memset(&osa, 0, sizeof(osa)); + osa.u.sin.sin_family = AF_INET; + osa.u.sin.sin_addr.s_addr = 0; + rc = osmo_netdev_add_route(tun->netdev, &osa, 0, NULL); if (rc < 0) LOGTUN(tun, LOGL_ERROR, "Cannot add IPv4 default route " - "(rc=%d): %s\n", rc, nl_geterror(rc)); + "(rc=%d): %s\n", rc, strerror(-rc)); else LOGTUN(tun, LOGL_INFO, "Added IPv4 default route\n"); - rc = netdev_add_defaultroute(tun->nl, tun->ifindex, AF_INET6); + memset(&osa, 0, sizeof(osa)); + osa.u.sin6.sin6_family = AF_INET6; + memset(&osa.u.sin6.sin6_addr, 0, sizeof(osa.u.sin6.sin6_addr)); + rc = osmo_netdev_add_route(tun->netdev, &osa, 0, NULL); if (rc < 0) LOGTUN(tun, LOGL_ERROR, "Cannot add IPv6 default route " - "(rc=%d): %s\n", rc, nl_geterror(rc)); + "(rc=%d): %s\n", rc, strerror(-rc)); else LOGTUN(tun, LOGL_INFO, "Added IPv6 default route\n"); } if (pthread_create(&tun->thread, NULL, tun_device_thread, tun)) { LOGTUN(tun, LOGL_ERROR, "Cannot create TUN thread: %s\n", strerror(errno)); - goto err_free_nl; + goto err_free_netdev; } LOGTUN(tun, LOGL_INFO, "Created (in netns '%s')\n", tun->netns_name); @@ -407,12 +427,12 @@ return tun; -err_free_nl: - nl_socket_free(tun->nl); +err_free_netdev: + osmo_netdev_free(tun->netdev); err_close: close(tun->fd); err_restore_ns: - if (tun->netns_name) + if (inside_netns) OSMO_ASSERT(osmo_netns_switch_exit(&switch_state) == 0); err_close_ns: if (tun->netns_name) @@ -482,7 +502,7 @@ if (tun->netns_name) close(tun->netns_fd); close(tun->fd); - nl_socket_free(tun->nl); + osmo_netdev_free(tun->netdev); talloc_free(tun); } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 Gerrit-Change-Number: 42444 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netdev API
by pespin 21 Mar '26

21 Mar '26

Attention is currently required from: daniel, fixeria, laforge, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email ) Change subject: Use libosmocore netdev API ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42444?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: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 Gerrit-Change-Number: 42444 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 20 Mar 2026 13:23:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netdev API
by pespin 21 Mar '26

21 Mar '26

Attention is currently required from: daniel, fixeria, laforge, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email ) Change subject: Use libosmocore netdev API ...................................................................... Patch Set 4: (1 comment) File daemon/tun_device.c: https://gerrit.osmocom.org/c/osmo-uecups/+/42444/comment/2d182db5_635c37b0?… : PS3, Line 366: ifinidex > ```suggestion […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42444?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: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 Gerrit-Change-Number: 42444 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 20 Mar 2026 13:13:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/42453/1 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: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2f7ec968035193e00652dc27217f46e0719e56e8 Gerrit-Change-Number: 42453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netdev API
by pespin 21 Mar '26

21 Mar '26

Attention is currently required from: daniel, fixeria, laforge, lynxis lazus, osmith, pespin. Hello Jenkins Builder, daniel, fixeria, laforge, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified-1 by Jenkins Builder Change subject: Use libosmocore netdev API ...................................................................... Use libosmocore netdev API Depends: libosmocore.git Change-Id I75153eb59e96a6a2505dc5b29432c76e5c21ea24 Change-Id: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 --- A TODO-RELEASE M daemon/Makefile.am M daemon/gtp_tunnel.c M daemon/internal.h D daemon/netdev.c M daemon/tun_device.c 6 files changed, 68 insertions(+), 182 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/44/42444/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I8f18ef56a6e7186fed88f965fbb34aa390c3bac1 Gerrit-Change-Number: 42444 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-uecups[master]: Use osmo_sockaddr everywhere
by pespin 21 Mar '26

21 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42440?usp=email ) Change subject: Use osmo_sockaddr everywhere ...................................................................... Use osmo_sockaddr everywhere This allows getting rid of lots of explicit castings, as well as makeing it easier do improve IPv6 support in the future. Change-Id: Id87d9cf2ec138091681ab0fe7c7f86d648c0e98e --- M daemon/cups_client.c M daemon/daemon_vty.c M daemon/gtp_endpoint.c M daemon/gtp_tunnel.c M daemon/internal.h M daemon/netdev.c M daemon/tun_device.c M daemon/utility.c 8 files changed, 60 insertions(+), 98 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/daemon/cups_client.c b/daemon/cups_client.c index 5b94bff..e2bae46 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -126,7 +126,7 @@ return jret; } -static int parse_ep(struct sockaddr_storage *out, json_t *in) +static int parse_ep(struct osmo_sockaddr *out, json_t *in) { json_t *jaddr_type, *jport, *jip; const char *addr_type, *ip; @@ -153,14 +153,14 @@ memset(out, 0, sizeof(*out)); if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; + struct sockaddr_in *sin = &out->u.sin; if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) return -EINVAL; memcpy(&sin->sin_addr, buf, 4); sin->sin_family = AF_INET; sin->sin_port = htons(json_integer_value(jport)); } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + struct sockaddr_in6 *sin6 = &out->u.sin6; if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) return -EINVAL; memcpy(&sin6->sin6_addr, buf, 16); @@ -172,7 +172,7 @@ return 0; } -static int parse_eua(struct sockaddr_storage *out, json_t *jip, json_t *jaddr_type) +static int parse_eua(struct osmo_sockaddr *out, json_t *jip, json_t *jaddr_type) { const char *addr_type, *ip; uint8_t buf[16]; @@ -186,13 +186,13 @@ memset(out, 0, sizeof(*out)); if (!strcmp(addr_type, "IPV4")) { - struct sockaddr_in *sin = (struct sockaddr_in *) out; + struct sockaddr_in *sin = &out->u.sin; if (osmo_hexparse(ip, buf, sizeof(buf)) != 4) return -EINVAL; memcpy(&sin->sin_addr, buf, 4); sin->sin_family = AF_INET; } else if (!strcmp(addr_type, "IPV6")) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) out; + struct sockaddr_in6 *sin6 = &out->u.sin6; if (osmo_hexparse(ip, buf, sizeof(buf)) != 16) return -EINVAL; memcpy(&sin6->sin6_addr, buf, 16); @@ -348,7 +348,7 @@ static int cups_client_handle_destroy_tun(struct cups_client *cc, json_t *dtun) { - struct sockaddr_storage local_ep_addr; + struct osmo_sockaddr local_ep_addr; json_t *jlocal_gtp_ep, *jrx_teid; uint32_t rx_teid; int rc; diff --git a/daemon/daemon_vty.c b/daemon/daemon_vty.c index c5cca74..16f23b8 100644 --- a/daemon/daemon_vty.c +++ b/daemon/daemon_vty.c @@ -146,7 +146,7 @@ show_ep_hdr(vty); pthread_rwlock_rdlock(&g_daemon->rwlock); if (argc > 0) { - ep = _gtp_endpoint_find(g_daemon, (const struct sockaddr_storage *) ai->ai_addr); + ep = _gtp_endpoint_find(g_daemon, (const struct osmo_sockaddr *) ai->ai_addr); if (!ep) { pthread_rwlock_unlock(&g_daemon->rwlock); vty_out(vty, "Cannot find GTP endpoint %s:%s%s", argv[0], argv[1], VTY_NEWLINE); @@ -183,7 +183,7 @@ return CMD_WARNING; } - ep = gtp_endpoint_find_or_create(g_daemon, (struct sockaddr_storage *) ai->ai_addr); + ep = gtp_endpoint_find_or_create(g_daemon, (const struct osmo_sockaddr *) ai->ai_addr); if (!ep) { vty_out(vty, "Error creating endpoint%s", VTY_NEWLINE); freeaddrinfo(ai); @@ -214,7 +214,7 @@ } pthread_rwlock_wrlock(&g_daemon->rwlock); - ep = _gtp_endpoint_find(g_daemon, (struct sockaddr_storage *) ai->ai_addr); + ep = _gtp_endpoint_find(g_daemon, (const struct osmo_sockaddr *) ai->ai_addr); if (!ep) { pthread_rwlock_unlock(&g_daemon->rwlock); vty_out(vty, "Cannot find to-be-destoryed endpoint%s", VTY_NEWLINE); @@ -232,11 +232,11 @@ { char remote_ip[64], remote_port[16], user_addr[64]; - getnameinfo((struct sockaddr *) &t->remote_udp, sizeof(t->remote_udp), + getnameinfo(&t->remote_udp.u.sa, sizeof(t->remote_udp.u.sas), remote_ip, sizeof(remote_ip), remote_port, sizeof(remote_port), NI_NUMERICHOST|NI_NUMERICSERV); - getnameinfo((struct sockaddr *) &t->user_addr, sizeof(t->user_addr), + getnameinfo(&t->user_addr.u.sa, sizeof(t->user_addr.u.sas), user_addr, sizeof(user_addr), NULL, 0, NI_NUMERICHOST|NI_NUMERICSERV); diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 87d333c..3340aee 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -157,7 +157,7 @@ } static struct gtp_endpoint * -_gtp_endpoint_create(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr) +_gtp_endpoint_create(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr) { struct gtp_endpoint *ep = talloc_zero(d, struct gtp_endpoint); char ipstr[INET6_ADDRSTRLEN]; @@ -167,7 +167,7 @@ if (!ep) return NULL; - rc = getnameinfo((struct sockaddr *)bind_addr, sizeof(*bind_addr), + rc = getnameinfo(&bind_addr->u.sa, sizeof(bind_addr->u.sas), ipstr, sizeof(ipstr), portstr, sizeof(portstr), NI_NUMERICHOST|NI_NUMERICSERV); if (rc != 0) goto out_free; @@ -176,12 +176,12 @@ ep->d = d; ep->use_count = 1; ep->bind_addr = *bind_addr; - ep->fd = socket(ep->bind_addr.ss_family, SOCK_DGRAM, IPPROTO_UDP); + ep->fd = socket(ep->bind_addr.u.sa.sa_family, SOCK_DGRAM, IPPROTO_UDP); if (ep->fd < 0) { LOGEP(ep, LOGL_ERROR, "Cannot create UDP socket: %s\n", strerror(errno)); goto out_free; } - rc = bind(ep->fd, (struct sockaddr *) &ep->bind_addr, sizeof(ep->bind_addr)); + rc = bind(ep->fd, &ep->bind_addr.u.sa, sizeof(ep->bind_addr.u.sas)); if (rc < 0) { LOGEP(ep, LOGL_ERROR, "Cannot bind UDP socket: %s\n", strerror(errno)); goto out_close; @@ -205,21 +205,19 @@ } struct gtp_endpoint * -_gtp_endpoint_find(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr) +_gtp_endpoint_find(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr) { struct gtp_endpoint *ep; llist_for_each_entry(ep, &d->gtp_endpoints, list) { - if (sockaddr_equals((const struct sockaddr *) &ep->bind_addr, - (const struct sockaddr *) bind_addr)) { + if (osmo_sockaddr_cmp(&ep->bind_addr, bind_addr) == 0) return ep; - } } return NULL; } struct gtp_endpoint * -gtp_endpoint_find_or_create(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr) +gtp_endpoint_find_or_create(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr) { struct gtp_endpoint *ep; @@ -258,7 +256,7 @@ void _gtp_endpoint_deref_destroy(struct gtp_endpoint *ep) { struct gtp_daemon *d = ep->d; - struct sockaddr_storage ss = ep->bind_addr; + struct osmo_sockaddr osa = ep->bind_addr; struct gtp_tunnel *t, *t2; struct gtp_endpoint *ep2; @@ -274,7 +272,7 @@ /* _gtp_endpoint_destroy may already have been called via * _gtp_tunnel_destroy -> gtp_endpoint_release, so we have to * check if the ep can still be found in the list */ - ep2 = _gtp_endpoint_find(d, &ss); + ep2 = _gtp_endpoint_find(d, &osa); if (ep2 && ep2 == ep) _gtp_endpoint_destroy(ep2); } diff --git a/daemon/gtp_tunnel.c b/daemon/gtp_tunnel.c index 6c3e81c..a13b163 100644 --- a/daemon/gtp_tunnel.c +++ b/daemon/gtp_tunnel.c @@ -87,12 +87,12 @@ /* find tunnel by R(x_teid), T(x_teid) + A(ddr) */ static struct gtp_tunnel * _gtp_tunnel_find_rta(struct gtp_daemon *d, uint32_t rx_teid, uint32_t tx_teid, - const struct sockaddr_storage *user_addr) + const struct osmo_sockaddr *user_addr) { struct gtp_tunnel *t; llist_for_each_entry(t, &d->gtp_tunnels, list) { if (t->rx_teid == rx_teid && t->tx_teid == tx_teid && - sockaddr_equals((struct sockaddr *) &t->user_addr, (struct sockaddr *)user_addr)) + osmo_sockaddr_cmp(&t->user_addr, &user_addr) == 0) return t; } return NULL; @@ -117,14 +117,15 @@ /* UNLOCKED find tunnel by tun + EUA ip (+proto/port) */ struct gtp_tunnel * -_gtp_tunnel_find_eua(struct tun_device *tun, const struct sockaddr *sa, uint8_t proto) +_gtp_tunnel_find_eua(struct tun_device *tun, const struct osmo_sockaddr *osa, uint8_t proto) { struct gtp_daemon *d = tun->d; struct gtp_tunnel *t; llist_for_each_entry(t, &d->gtp_tunnels, list) { /* TODO: Find best matching filter */ - if (t->tun_dev == tun && sockaddr_equals(sa, (struct sockaddr *) &t->user_addr)) + if (t->tun_dev == tun && + osmo_sockaddr_cmp(osa, &t->user_addr) == 0) return t; } return NULL; @@ -149,7 +150,7 @@ talloc_free(t); } -bool gtp_tunnel_destroy(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr, uint32_t rx_teid) +bool gtp_tunnel_destroy(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr, uint32_t rx_teid) { struct gtp_endpoint *ep; bool rc = false; diff --git a/daemon/internal.h b/daemon/internal.h index 19cf16a..d431add 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -29,8 +29,6 @@ #define MAX_UDP_PACKET 65535 -bool sockaddr_equals(const struct sockaddr *a, const struct sockaddr *b); - struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, bool passive); enum { @@ -44,8 +42,8 @@ * netdev / netlink ***********************************************************************/ -int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct sockaddr_storage *ss); -int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct sockaddr_storage *ss); +int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa); +int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa); int netdev_set_link(struct nl_sock *nlsk, int ifindex, bool up); int netdev_add_defaultroute(struct nl_sock *nlsk, int ifindex, uint8_t family); @@ -68,7 +66,7 @@ int fd; /* local IP:port */ - struct sockaddr_storage bind_addr; + struct osmo_sockaddr bind_addr; char *name; /* the thread handling Rx from the fd/socket */ @@ -77,10 +75,10 @@ struct gtp_endpoint * -gtp_endpoint_find_or_create(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr); +gtp_endpoint_find_or_create(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr); struct gtp_endpoint * -_gtp_endpoint_find(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr); +_gtp_endpoint_find(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr); void _gtp_endpoint_deref_destroy(struct gtp_endpoint *ep); @@ -212,10 +210,10 @@ uint32_t rx_teid; /* End user Address (inner IP) */ - struct sockaddr_storage user_addr; + struct osmo_sockaddr user_addr; /* Remote UDP IP/Port*/ - struct sockaddr_storage remote_udp; + struct osmo_sockaddr remote_udp; /* GTP Extension Header */ struct gtp1u_exthdrs exthdr; @@ -227,7 +225,7 @@ _gtp_tunnel_find_r(struct gtp_daemon *d, uint32_t rx_teid, struct gtp_endpoint *ep); struct gtp_tunnel * -_gtp_tunnel_find_eua(struct tun_device *tun, const struct sockaddr *sa, uint8_t proto); +_gtp_tunnel_find_eua(struct tun_device *tun, const struct osmo_sockaddr *osa, uint8_t proto); struct gtp_tunnel_params { /* TEID in receive and transmit direction */ @@ -238,13 +236,13 @@ struct gtp1u_exthdrs exthdr; /* end user address */ - struct sockaddr_storage user_addr; + struct osmo_sockaddr user_addr; /* remote GTP/UDP IP+Port */ - struct sockaddr_storage remote_udp; + struct osmo_sockaddr remote_udp; /* local GTP/UDP IP+Port (used to lookup/create local EP) */ - struct sockaddr_storage local_udp; + struct osmo_sockaddr local_udp; /* local TUN device name (used to lookup/create local tun) */ const char *tun_name; @@ -253,7 +251,7 @@ struct gtp_tunnel *gtp_tunnel_alloc(struct gtp_daemon *d, const struct gtp_tunnel_params *cpars); void _gtp_tunnel_destroy(struct gtp_tunnel *t); -bool gtp_tunnel_destroy(struct gtp_daemon *d, const struct sockaddr_storage *bind_addr, uint32_t rx_teid); +bool gtp_tunnel_destroy(struct gtp_daemon *d, const struct osmo_sockaddr *bind_addr, uint32_t rx_teid); /*********************************************************************** diff --git a/daemon/netdev.c b/daemon/netdev.c index e619883..165a6bc 100644 --- a/daemon/netdev.c +++ b/daemon/netdev.c @@ -24,27 +24,24 @@ #include <netlink/route/nexthop.h> #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> /*********************************************************************** * netlink helper functions ***********************************************************************/ -static int _netdev_addr(struct nl_sock *nlsk, int ifindex, const struct sockaddr_storage *ss, bool add) +static int _netdev_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa, bool add) { - const struct sockaddr_in6 *sin6; - const struct sockaddr_in *sin; struct nl_addr *local = NULL; struct rtnl_addr *addr; int rc; - switch (ss->ss_family) { + switch (osa->u.sa.sa_family) { case AF_INET: - sin = (struct sockaddr_in *) ss; - local = nl_addr_build(AF_INET, &sin->sin_addr, 4); + local = nl_addr_build(AF_INET, &osa->u.sin.sin_addr, 4); break; case AF_INET6: - sin6 = (struct sockaddr_in6 *) ss; - local = nl_addr_build(AF_INET6, &sin6->sin6_addr, 16); + local = nl_addr_build(AF_INET6, &osa->u.sin6.sin6_addr, 16); break; } OSMO_ASSERT(local); @@ -64,14 +61,14 @@ return rc; } -int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct sockaddr_storage *ss) +int netdev_add_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa) { - return _netdev_addr(nlsk, ifindex, ss, true); + return _netdev_addr(nlsk, ifindex, osa, true); } -int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct sockaddr_storage *ss) +int netdev_del_addr(struct nl_sock *nlsk, int ifindex, const struct osmo_sockaddr *osa) { - return _netdev_addr(nlsk, ifindex, ss, false); + return _netdev_addr(nlsk, ifindex, osa, false); } int netdev_set_link(struct nl_sock *nlsk, int ifindex, bool up) diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 40b6ec3..bc41db9 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -58,8 +58,8 @@ /* extracted information from a packet */ struct pkt_info { - struct sockaddr_storage saddr; - struct sockaddr_storage daddr; + struct osmo_sockaddr saddr; + struct osmo_sockaddr daddr; uint8_t proto; }; @@ -71,8 +71,8 @@ memset(out, 0, sizeof(*out)); if (ip4->version == 4) { - struct sockaddr_in *saddr4 = (struct sockaddr_in *) &out->saddr; - struct sockaddr_in *daddr4 = (struct sockaddr_in *) &out->daddr; + struct sockaddr_in *saddr4 = &out->saddr.u.sin; + struct sockaddr_in *daddr4 = &out->daddr.u.sin; if (in_len < sizeof(*ip4) || in_len < 4*ip4->ihl) return -1; @@ -100,8 +100,8 @@ } } else if (ip4->version == 6) { const struct ip6_hdr *ip6 = (struct ip6_hdr *) in; - struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) &out->saddr; - struct sockaddr_in6 *daddr6 = (struct sockaddr_in6 *) &out->daddr; + struct sockaddr_in6 *saddr6 = &out->saddr.u.sin6; + struct sockaddr_in6 *daddr6 = &out->daddr.u.sin6; if (in_len < sizeof(*ip6)) return -1; @@ -149,7 +149,7 @@ unsigned int head_len = payload - base_buffer; unsigned int hdr_len_needed; unsigned int opt_hdr_len_needed = 0; - struct sockaddr_storage daddr; + struct osmo_sockaddr daddr; int outfd = t->gtp_ep->fd; int rc; uint8_t flags; @@ -208,7 +208,7 @@ /* 4) write to GTP/UDP socket */ rc = sendto(outfd, gtph, hdr_len_needed + payload_len, 0, - (struct sockaddr *)&daddr, sizeof(daddr)); + &daddr.u.sa, sizeof(daddr.u.sas)); return rc; } @@ -256,19 +256,19 @@ continue; } - if (pinfo.saddr.ss_family == AF_INET6 && pinfo.proto == IPPROTO_ICMPV6) { + if (pinfo.saddr.u.sa.sa_family == AF_INET6 && pinfo.proto == IPPROTO_ICMPV6) { /* 2) TODO: magic voodoo for IPv6 neighbor discovery */ } /* 3) look-up tunnel based on source IP address (+ filter) */ pthread_rwlock_rdlock(&d->rwlock); - t = _gtp_tunnel_find_eua(tun, (struct sockaddr *) &pinfo.saddr, pinfo.proto); + t = _gtp_tunnel_find_eua(tun, &pinfo.saddr, pinfo.proto); if (!t) { char host[128]; char port[8]; pthread_rwlock_unlock(&d->rwlock); - getnameinfo((const struct sockaddr *)&pinfo.saddr, - sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), + getnameinfo(&pinfo.saddr.u.sa, + sizeof(pinfo.saddr.u.sas), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); LOGTUN_NC(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); continue; diff --git a/daemon/utility.c b/daemon/utility.c index 1b36a24..3c3fbea 100644 --- a/daemon/utility.c +++ b/daemon/utility.c @@ -17,38 +17,6 @@ * Utility ***********************************************************************/ -bool sockaddr_equals(const struct sockaddr *a, const struct sockaddr *b) -{ - const struct sockaddr_in *a4, *b4; - const struct sockaddr_in6 *a6, *b6; - - if (a->sa_family != b->sa_family) - return false; - - switch (a->sa_family) { - case AF_INET: - a4 = (struct sockaddr_in *) a; - b4 = (struct sockaddr_in *) b; - if (a4->sin_port != b4->sin_port) - return false; - if (a4->sin_addr.s_addr != b4->sin_addr.s_addr) - return false; - break; - case AF_INET6: - a6 = (struct sockaddr_in6 *) a; - b6 = (struct sockaddr_in6 *) b; - if (a6->sin6_port != b6->sin6_port) - return false; - if (memcmp(a6->sin6_addr.s6_addr, b6->sin6_addr.s6_addr, sizeof(b6->sin6_addr.s6_addr))) - return false; - break; - default: - assert(false); - } - - return true; -} - struct addrinfo *addrinfo_helper(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, bool passive) { -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Id87d9cf2ec138091681ab0fe7c7f86d648c0e98e Gerrit-Change-Number: 42440 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netns API
by pespin 21 Mar '26

21 Mar '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42442?usp=email ) Change subject: Use libosmocore netns API ...................................................................... Use libosmocore netns API Change-Id: Ia8617765d4c14483e2ad0ea09a8f2276fd7aaebf --- M daemon/Makefile.am M daemon/cups_client.c M daemon/internal.h M daemon/main.c D daemon/netns.c D daemon/netns.h M daemon/tun_device.c 7 files changed, 10 insertions(+), 324 deletions(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2d62f11..1c680a6 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -27,7 +27,6 @@ noinst_HEADERS = \ gtp.h \ - netns.h \ internal.h \ $(NULL) @@ -39,7 +38,6 @@ cups_client.c \ utility.c \ netdev.c \ - netns.c \ tun_device.c \ gtp_daemon.c \ gtp_endpoint.c \ diff --git a/daemon/cups_client.c b/daemon/cups_client.c index e2bae46..578719b 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -13,6 +13,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> #include <osmocom/core/exec.h> +#include <osmocom/core/netns.h> #include "internal.h" #include "gtp.h" @@ -405,7 +406,7 @@ struct gtp_daemon *d = cc->d; const char *cmd, *user; char **addl_env = NULL; - sigset_t oldmask; + struct osmo_netns_switch_state switch_state; int nsfd = -1, rc; juser = json_object_get(sprog, "run_as_user"); @@ -447,7 +448,7 @@ } if (jnetns) { - rc = switch_ns(nsfd, &oldmask); + rc = osmo_netns_switch_enter(nsfd, &switch_state); if (rc < 0) { talloc_free(addl_env); return -EIO; @@ -457,7 +458,7 @@ rc = osmo_system_nowait2(cmd, osmo_environment_whitelist, addl_env, user); if (jnetns) { - OSMO_ASSERT(restore_ns(&oldmask) == 0); + OSMO_ASSERT(osmo_netns_switch_exit(&switch_state) == 0); } talloc_free(addl_env); diff --git a/daemon/internal.h b/daemon/internal.h index d431add..7a016fa 100644 --- a/daemon/internal.h +++ b/daemon/internal.h @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #pragma once -#include "netns.h" - #include <stdint.h> #include <stdbool.h> #include <pthread.h> diff --git a/daemon/main.c b/daemon/main.c index c023351..b00e5d3 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -36,7 +36,6 @@ #include <jansson.h> #include "internal.h" -#include "netns.h" #include "gtp.h" static void *g_tall_ctx; @@ -226,8 +225,6 @@ handle_options(argc, argv); - init_netns(); - rc = vty_read_config_file(g_config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to open config file: '%s'\n", g_config_file); diff --git a/daemon/netns.c b/daemon/netns.c deleted file mode 100644 index b0ec254..0000000 --- a/daemon/netns.c +++ /dev/null @@ -1,273 +0,0 @@ -#warning "Merge netns.c from osmo-ggsn and osmo-gtpu-daemon" -/* - * Copyright (C) 2014-2017, Travelping GmbH <info(a)travelping.com> - * Copyright (C) 2020, Harald Welte <laforge(a)gnumonks.org> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#if defined(__linux__) - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sched.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <sys/mount.h> -#include <sys/param.h> -#include <fcntl.h> -#include <errno.h> - -#include <osmocom/core/utils.h> - -#include "netns.h" - -#define NETNS_PATH "/var/run/netns" - -/*! default namespace of the GGSN process */ -static int default_nsfd = -1; - -/*! switch to a (non-default) namespace, store existing signal mask in oldmask. - * \param[in] nsfd file descriptor representing the namespace to whch we shall switch - * \param[out] oldmaks caller-provided memory location to which old signal mask is stored - * \ returns 0 on success or negative (errno) in case of error */ -int switch_ns(int nsfd, sigset_t *oldmask) -{ - sigset_t intmask; - int rc; - - OSMO_ASSERT(default_nsfd >= 0); - - if (sigfillset(&intmask) < 0) - return -errno; - if ((rc = sigprocmask(SIG_BLOCK, &intmask, oldmask)) != 0) - return -rc; - - if (setns(nsfd, CLONE_NEWNET) < 0) { - /* restore old mask if we couldn't switch the netns */ - sigprocmask(SIG_SETMASK, oldmask, NULL); - return -errno; - } - return 0; -} - -/*! switch back to the default namespace, restoring signal mask. - * \param[in] oldmask signal mask to restore after returning to default namespace - * \returns 0 on successs; negative errno value in case of error */ -int restore_ns(sigset_t *oldmask) -{ - OSMO_ASSERT(default_nsfd >= 0); - - int rc; - if (setns(default_nsfd, CLONE_NEWNET) < 0) - return -errno; - - if ((rc = sigprocmask(SIG_SETMASK, oldmask, NULL)) != 0) - return -rc; - return 0; -} - -/*! open a file from within specified network namespace */ -int open_ns(int nsfd, const char *pathname, int flags) -{ - sigset_t intmask, oldmask; - int ret; - int fd = -1; - int rc; - - OSMO_ASSERT(default_nsfd >= 0); - - /* mask off all signals, store old signal mask */ - if (sigfillset(&intmask) < 0) - return -errno; - if ((rc = sigprocmask(SIG_BLOCK, &intmask, &oldmask)) != 0) - return -rc; - - /* associate the calling thread with namespace file descriptor */ - if (setns(nsfd, CLONE_NEWNET) < 0) { - ret = -errno; - goto restore_sigmask; - } - /* open the requested file/path */ - if ((fd = open(pathname, flags)) < 0) { - ret = -errno; - goto restore_defaultns; - } - ret = fd; - -restore_defaultns: - /* return back to default namespace */ - if (setns(default_nsfd, CLONE_NEWNET) < 0) { - if (fd >= 0) - close(fd); - return -errno; - } - -restore_sigmask: - /* restore process mask */ - if ((rc = sigprocmask(SIG_SETMASK, &oldmask, NULL)) != 0) { - if (fd >= 0) - close(fd); - return -rc; - } - - return ret; -} - -/*! create a socket in another namespace. - * Switches temporarily to namespace indicated by nsfd, creates a socket in - * that namespace and then returns to the default namespace. - * \param[in] nsfd File descriptor of the namspace in which to create socket - * \param[in] domain Domain of the socket (AF_INET, ...) - * \param[in] type Type of the socket (SOCK_STREAM, ...) - * \param[in] protocol Protocol of the socket (IPPROTO_TCP, ...) - * \returns 0 on success; negative errno in case of error */ -int socket_ns(int nsfd, int domain, int type, int protocol) -{ - sigset_t intmask, oldmask; - int ret; - int sk = -1; - int rc; - - OSMO_ASSERT(default_nsfd >= 0); - - /* mask off all signals, store old signal mask */ - if (sigfillset(&intmask) < 0) - return -errno; - if ((rc = sigprocmask(SIG_BLOCK, &intmask, &oldmask)) != 0) - return -rc; - - /* associate the calling thread with namespace file descriptor */ - if (setns(nsfd, CLONE_NEWNET) < 0) { - ret = -errno; - goto restore_sigmask; - } - - /* create socket of requested domain/type/proto */ - if ((sk = socket(domain, type, protocol)) < 0) { - ret = -errno; - goto restore_defaultns; - } - ret = sk; - -restore_defaultns: - /* return back to default namespace */ - if (setns(default_nsfd, CLONE_NEWNET) < 0) { - if (sk >= 0) - close(sk); - return -errno; - } - -restore_sigmask: - /* restore process mask */ - if ((rc = sigprocmask(SIG_SETMASK, &oldmask, NULL)) != 0) { - if (sk >= 0) - close(sk); - return -rc; - } - return ret; -} - -/*! initialize this network namespace helper module. - * Must be called before using any other functions of this file. - * \returns 0 on success; negative errno in case of error */ -int init_netns() -{ - /* store the default namespace for later reference */ - if ((default_nsfd = open("/proc/self/ns/net", O_RDONLY)) < 0) - return -errno; - return 0; -} - -/*! create obtain file descriptor for network namespace of give name. - * Creates /var/run/netns if it doesn't exist already. - * \param[in] name Name of the network namespace (in /var/run/netns/) - * \returns File descriptor of network namespace; negative errno in case of error */ -int get_nsfd(const char *name) -{ - int ret = 0; - int rc; - int fd; - sigset_t intmask, oldmask; - char path[MAXPATHLEN] = NETNS_PATH; - - OSMO_ASSERT(default_nsfd >= 0); - - /* create /var/run/netns, if it doesn't exist already */ - rc = mkdir(path, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); - if (rc < 0 && errno != EEXIST) - return rc; - - /* create /var/run/netns/[name], if it doesn't exist already */ - snprintf(path, sizeof(path), "%s/%s", NETNS_PATH, name); - fd = open(path, O_RDONLY|O_CREAT|O_EXCL, 0); - if (fd < 0) { - if (errno == EEXIST) { - if ((fd = open(path, O_RDONLY)) < 0) - return -errno; - return fd; - } - return -errno; - } - if (close(fd) < 0) - return -errno; - - /* mask off all signals, store old signal mask */ - if (sigfillset(&intmask) < 0) - return -errno; - if ((rc = sigprocmask(SIG_BLOCK, &intmask, &oldmask)) != 0) - return -rc; - - /* create a new network namespace */ - if (unshare(CLONE_NEWNET) < 0) { - ret = -errno; - goto restore_sigmask; - } - if (mount("/proc/self/ns/net", path, "none", MS_BIND, NULL) < 0) - ret = -errno; - - /* switch back to default namespace */ - if (setns(default_nsfd, CLONE_NEWNET) < 0) - return -errno; - -restore_sigmask: - /* restore process mask */ - if ((rc = sigprocmask(SIG_SETMASK, &oldmask, NULL)) != 0) - return -rc; - - /* might have been set above in case mount fails */ - if (ret < 0) - return ret; - - /* finally, open the created namespace file descriptor from default ns */ - if ((fd = open(path, O_RDONLY)) < 0) - return -errno; - - return fd; -} - -#endif diff --git a/daemon/netns.h b/daemon/netns.h deleted file mode 100644 index 3b91ba3..0000000 --- a/daemon/netns.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2014-2017, Travelping GmbH <info(a)travelping.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#ifndef __NETNS_H -#define __NETNS_H - -#if defined(__linux__) - -int init_netns(void); - -int switch_ns(int nsfd, sigset_t *oldmask); -int restore_ns(sigset_t *oldmask); - -int open_ns(int nsfd, const char *pathname, int flags); -int socket_ns(int nsfd, int domain, int type, int protocol); -int get_nsfd(const char *name); - -#endif - -#endif diff --git a/daemon/tun_device.c b/daemon/tun_device.c index bc41db9..837fd9d 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -33,11 +33,11 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include <osmocom/core/netns.h> #include <osmocom/core/utils.h> #include "gtp.h" #include "internal.h" -#include "netns.h" /*********************************************************************** * TUN Device @@ -320,7 +320,7 @@ { struct rtnl_link *link; struct tun_device *tun; - sigset_t oldmask; + struct osmo_netns_switch_state switch_state; int rc; tun = talloc_zero(d, struct tun_device); @@ -333,7 +333,7 @@ if (netns_name) { tun->netns_name = talloc_strdup(tun, netns_name); - tun->netns_fd = get_nsfd(tun->netns_name); + tun->netns_fd = osmo_netns_open_fd(tun->netns_name); if (tun->netns_fd < 0) { LOGTUN(tun, LOGL_ERROR, "Cannot obtain netns file descriptor: %s\n", strerror(errno)); @@ -343,7 +343,7 @@ /* temporarily switch to specified namespace to create tun device */ if (tun->netns_name) { - rc = switch_ns(tun->netns_fd, &oldmask); + rc = osmo_netns_switch_enter(tun->netns_fd, &switch_state); if (rc < 0) { LOGTUN(tun, LOGL_ERROR, "Cannot switch to netns '%s': %s\n", tun->netns_name, strerror(errno)); @@ -374,7 +374,7 @@ /* switch back to default namespace before creating new thread */ if (tun->netns_name) - OSMO_ASSERT(restore_ns(&oldmask) == 0); + OSMO_ASSERT(osmo_netns_switch_exit(&switch_state) == 0); /* bring the network device up */ rc = netdev_set_link(tun->nl, tun->ifindex, true); @@ -413,7 +413,7 @@ close(tun->fd); err_restore_ns: if (tun->netns_name) - OSMO_ASSERT(restore_ns(&oldmask) == 0); + OSMO_ASSERT(osmo_netns_switch_exit(&switch_state) == 0); err_close_ns: if (tun->netns_name) close(tun->netns_fd); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ia8617765d4c14483e2ad0ea09a8f2276fd7aaebf Gerrit-Change-Number: 42442 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-uecups[master]: Use libosmocore netns API
by pespin 21 Mar '26

21 Mar '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/42442?usp=email ) Change subject: Use libosmocore netns API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/42442?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: Ia8617765d4c14483e2ad0ea09a8f2276fd7aaebf Gerrit-Change-Number: 42442 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Mar 2026 13:09:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026