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

[M] Change in pysim[master]: transport: change APDU format paradigm
by dexter 19 Mar '26

19 Mar '26

Attention is currently required from: daniel, laforge, neels. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42441?usp=email ) Change subject: transport: change APDU format paradigm ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This patch wouldn't alter the behavior of existing APDU scripts. As far as I know pySim-shell, pySim-prog and pySim-read are the only programs that make use of the pySim/transport API. In case there are other projects that use this API, those would need fixing if they still use TPDUs instead of APDUs. If this is a concern we should find an alternative. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9a531a825def318b28bf58291d811cf119003fab Gerrit-Change-Number: 42441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 12:39:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in pysim[master]: transport: change APDU format paradigm
by dexter 19 Mar '26

19 Mar '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42441?usp=email ) Change subject: transport: change APDU format paradigm ...................................................................... transport: change APDU format paradigm Unfortunately we have mixed up the concept of TPDUs and APDUs in earlier versions of pySim-shell. This lead to problems with detecteding the APDU case properly (see also ISO/IEC 7816-3) and also prevented us from adding support for T=1. This problem has been fixed long time ago and all APDUs sent from the pySim-shell code should be well formed and valid according to ISO/IEC 7816-3. To ensure that we continue to format APDUs correctly as APDUs (and not TPDUs) we have added a mechanism to the LinkBase class that would either raise an exception or print a warning if someone mistakenly tries to send an APDU that is really a TPDU. Whether a warning is printed or an exception is raised is controlled via the apdu_strict member in the LinkBase class, which is false (print warning only) by default. The reason why we have implemneted the mechanism this way was because we wanted to ensure that existing APDU scripts (pySim-shell apdu command) keep working, even though when those scripts uses APDUs which are formally invalid. Sending a TPDU instead of an APDU via a T=0 link will still work in almost all cases. This is also the reason why this problem slipped through unnoticed for long time. However, there may still be subtile problems araising from this practice. The root of the problem is that it is impossible to distinguish between APDU case 3 and 4 when a TPDU instead of an APDU is sent. However in order to handle a case 4 APDU correctly we must be able to distinguish the APDU case correctly to handle the case correctly. ETSI TS 102 221, section 7.3.1.1.4, clause 4 is very clear about the fact that not (only) the status word (e.g. 61xx) but the APDU case is what matters. To complete the logic in LinkBaseTpdu and to maintain compatibility (older APDU scripts), we must still be able to switch between the 'apdu_strict' mode and the non-strict mode. However, it makes sense to do this on a per-api-call basis instead globally via a class property. At the same time we will limit the effect of pySim-shell's apdu_strict setable to the apdu command only. By doing so, the bahviour of the apdu command is not altered. Users will still have to enable the 'strict' mode explicitly. At the same time all the internal functionality of pySim-shell will always use the 'strict' mode. Related: OS#6970 Change-Id: I9a531a825def318b28bf58291d811cf119003fab --- M pySim-shell.py M pySim/commands.py M pySim/transport/__init__.py 3 files changed, 24 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/42441/1 diff --git a/pySim-shell.py b/pySim-shell.py index 50deea2..39678fd 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -136,8 +136,7 @@ self.add_settable(Settable2Compat('apdu_trace', bool, 'Trace and display APDUs exchanged with card', self, onchange_cb=self._onchange_apdu_trace)) self.add_settable(Settable2Compat('apdu_strict', bool, - 'Enforce APDU responses according to ISO/IEC 7816-3, table 12', self, - onchange_cb=self._onchange_apdu_strict)) + 'Strictly apply APDU format according to ISO/IEC 7816-3, table 12', self)) self.add_settable(Settable2Compat('verbose', bool, 'Enable/disable verbose logging', self, onchange_cb=self._onchange_verbose)) @@ -218,13 +217,6 @@ else: self.card._scc._tp.apdu_tracer = None - def _onchange_apdu_strict(self, param_name, old, new): - if self.card: - if new == True: - self.card._scc._tp.apdu_strict = True - else: - self.card._scc._tp.apdu_strict = False - def _onchange_verbose(self, param_name, old, new): PySimLogger.set_verbose(new) if new == True: @@ -295,9 +287,9 @@ # can be executed without the presence of a runtime state (self.rs) object. However, this also means that # self.lchan is also not present (see method equip). if opts.raw or self.lchan is None: - data, sw = self.card._scc.send_apdu(opts.APDU, apply_lchan = False) + data, sw = self.card._scc.send_apdu(opts.APDU, apply_lchan = False, apdu_strict = self.apdu_strict) else: - data, sw = self.lchan.scc.send_apdu(opts.APDU, apply_lchan = False) + data, sw = self.lchan.scc.send_apdu(opts.APDU, apply_lchan = False, apdu_strict = self.apdu_strict) if data: self.poutput("SW: %s, RESP: %s" % (sw, data)) else: diff --git a/pySim/commands.py b/pySim/commands.py index 066a2c4..b973b93 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -87,7 +87,7 @@ else: return 255 - def send_apdu(self, pdu: Hexstr, apply_lchan:bool = True) -> ResTuple: + def send_apdu(self, pdu: Hexstr, apply_lchan:bool = True, apdu_strict: bool = True) -> ResTuple: """Sends an APDU and auto fetch response data Args: @@ -101,11 +101,12 @@ if apply_lchan: pdu = cla_with_lchan(pdu[0:2], self.lchan_nr) + pdu[2:] if self.scp: - return self.scp.send_apdu_wrapper(self._tp.send_apdu, pdu) + return self.scp.send_apdu_wrapper(self._tp.send_apdu, pdu, apdu_strict = apdu_strict) else: - return self._tp.send_apdu(pdu) + return self._tp.send_apdu(pdu, apdu_strict = apdu_strict) - def send_apdu_checksw(self, pdu: Hexstr, sw: SwMatchstr = "9000", apply_lchan:bool = True) -> ResTuple: + def send_apdu_checksw(self, pdu: Hexstr, sw: SwMatchstr = "9000", apply_lchan:bool = True, + apdu_strict: bool = True) -> ResTuple: """Sends an APDU and check returned SW Args: @@ -121,12 +122,13 @@ if apply_lchan: pdu = cla_with_lchan(pdu[0:2], self.lchan_nr) + pdu[2:] if self.scp: - return self.scp.send_apdu_wrapper(self._tp.send_apdu_checksw, pdu, sw) + return self.scp.send_apdu_wrapper(self._tp.send_apdu_checksw, pdu, sw, apdu_strict = apdu_strict) else: - return self._tp.send_apdu_checksw(pdu, sw) + return self._tp.send_apdu_checksw(pdu, sw, apdu_strict = apdu_strict) def send_apdu_constr(self, cla: Hexstr, ins: Hexstr, p1: Hexstr, p2: Hexstr, cmd_constr: Construct, - cmd_data: Hexstr, resp_constr: Construct, apply_lchan:bool = True) -> Tuple[dict, SwHexstr]: + cmd_data: Hexstr, resp_constr: Construct, apply_lchan:bool = True, + apdu_strict: bool = True) -> Tuple[dict, SwHexstr]: """Build and sends an APDU using a 'construct' definition; parses response. Args: @@ -145,7 +147,7 @@ lc = i2h([len(cmd)]) if cmd_data else '' le = '00' if resp_constr else '' pdu = ''.join([cla, ins, p1, p2, lc, b2h(cmd), le]) - (data, sw) = self.send_apdu(pdu, apply_lchan = apply_lchan) + (data, sw) = self.send_apdu(pdu, apply_lchan = apply_lchan, apdu_strict = apdu_strict) if data: # filter the resulting dict to avoid '_io' members inside rsp = filter_dict(resp_constr.parse(h2b(data))) @@ -155,7 +157,8 @@ def send_apdu_constr_checksw(self, cla: Hexstr, ins: Hexstr, p1: Hexstr, p2: Hexstr, cmd_constr: Construct, cmd_data: Hexstr, resp_constr: Construct, - sw_exp: SwMatchstr="9000", apply_lchan:bool = True) -> Tuple[dict, SwHexstr]: + sw_exp: SwMatchstr="9000", apply_lchan:bool = True, + apdu_strict: bool = True) -> Tuple[dict, SwHexstr]: """Build and sends an APDU using a 'construct' definition; parses response. Args: @@ -171,7 +174,7 @@ Tuple of (decoded_data, sw) """ (rsp, sw) = self.send_apdu_constr(cla, ins, p1, p2, cmd_constr, cmd_data, resp_constr, - apply_lchan = apply_lchan) + apply_lchan = apply_lchan, apdu_strict = apdu_strict) if not sw_match(sw, sw_exp): raise SwMatchError(sw, sw_exp.lower(), self._tp.sw_interpreter) return (rsp, sw) diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index f19790c..6807048 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -90,7 +90,6 @@ self.sw_interpreter = sw_interpreter self.apdu_tracer = apdu_tracer self.proactive_handler = proactive_handler - self.apdu_strict = False @abc.abstractmethod def __str__(self) -> str: @@ -141,11 +140,12 @@ self.apdu_tracer.trace_reset() return self._reset_card() - def send_apdu(self, apdu: Hexstr) -> ResTuple: + def send_apdu(self, apdu: Hexstr, apdu_strict: bool = True) -> ResTuple: """Sends an APDU with minimal processing Args: apdu : string of hexadecimal characters (ex. "A0A40000023F00", must comply to ISO/IEC 7816-3, section 12.1) + apdu_strict : strictly apply APDU format according to ISO/IEC 7816-3, table 12 Returns: tuple(data, sw), where data : string (in hex) of returned data (ex. "074F4EFFFF") @@ -174,26 +174,27 @@ if len(data) > 0 and (case == 3 or case == 1): exeption_str = 'received unexpected response data, incorrect APDU-case ' + \ '(%d, should be %d, missing Le field?)!' % (case, case + 1) - if self.apdu_strict: + if apdu_strict: raise ValueError(exeption_str) else: log.warning(exeption_str) return (data, sw) - def send_apdu_checksw(self, apdu: Hexstr, sw: SwMatchstr = "9000") -> ResTuple: + def send_apdu_checksw(self, apdu: Hexstr, sw: SwMatchstr = "9000", apdu_strict: bool = True) -> ResTuple: """Sends an APDU and check returned SW Args: apdu : string of hexadecimal characters (ex. "A0A40000023F00", must comply to ISO/IEC 7816-3, section 12.1) - sw : string of 4 hexadecimal characters (ex. "9000"). The user may mask out certain - digits using a '?' to add some ambiguity if needed. + sw : string of 4 hexadecimal characters (ex. "9000"). The user may mask out certain digits using a '?' + to add some ambiguity if needed. + apdu_strict : strictly apply APDU format according to ISO/IEC 7816-3, table 12 Returns: tuple(data, sw), where data : string (in hex) of returned data (ex. "074F4EFFFF") sw : string (in hex) of status word (ex. "9000") """ - rv = self.send_apdu(apdu) + rv = self.send_apdu(apdu, apdu_strict) last_sw = rv[1] while sw == '9000' and sw_match(last_sw, '91xx'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9a531a825def318b28bf58291d811cf119003fab Gerrit-Change-Number: 42441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

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

19 Mar '26

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/40/42440/1 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: newchange 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>

1 0

[XS] Change in osmo-trx[master]: transceiver: return -EINVAL for invalid SETSLOT
by Timur Davydov 19 Mar '26

19 Mar '26

Timur Davydov has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/42421?usp=email ) Change subject: transceiver: return -EINVAL for invalid SETSLOT ...................................................................... Abandoned Abandoning: functionality implemented differently in a subsequent commit -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42421?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I90bda68268abdeee9c766a3bf4189fba8f13da53 Gerrit-Change-Number: 42421 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: [REST] Add MME source address/port to EnbItem
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42433?usp=email ) Change subject: [REST] Add MME source address/port to EnbItem ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I15bbddf96ac7d5b6f9962a8d745db58fdec334e7 Gerrit-Change-Number: 42433 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 08:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: doc/manuals: cli: shorten enb_list example table
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42439?usp=email ) Change subject: doc/manuals: cli: shorten enb_list example table ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4e25233a3e77358060f1098e97907c93deab334b Gerrit-Change-Number: 42439 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 08:01:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: f_REST_*(): use tr_HTTP_RespBody(decmatch T:?)
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42438?usp=email ) Change subject: s1gw: f_REST_*(): use tr_HTTP_RespBody(decmatch T:?) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6997dae5314d4a4588386183832426ab5b8d0843 Gerrit-Change-Number: 42438 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 08:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/HTTP_Adapter: bail out early on failure
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42437?usp=email ) Change subject: library/HTTP_Adapter: bail out early on failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I229028d551d5cf9651e6e65314cd40f414bfe235 Gerrit-Change-Number: 42437 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 07:59:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/HTTP_Adapter: clarify response template restriction
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42436?usp=email ) Change subject: library/HTTP_Adapter: clarify response template restriction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1a5ee842c30de9ec22d9e375f6b1b24b3eaee1e0 Gerrit-Change-Number: 42436 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Mar 2026 07:58:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-trx[master]: transceiver: add optional WebSDR device support
by pespin 19 Mar '26

19 Mar '26

Attention is currently required from: Hoernchen, Timur Davydov, fixeria, laforge. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/osmo-trx/+/42411?usp=email ) Change subject: transceiver: add optional WebSDR device support ...................................................................... Patch Set 10: (3 comments) Patchset: PS10: I'll try to summarize my thoughts, they may sound harsh but I hope you get the point in order to understand needed improvements: You are doing way too many changes in an invasive way, as in going with an axe disabling code and changing lots of code paths without properly modularizing code. This imho needs more work before it is in a point where it can be merged. What this needs imho: * Properly split each change in code paths, etc. in little steps (commits), explaining why that change is needed. For instance, it makes no sense to have all the Transceiver code path method changes together with the new library/binary you are adding. This way we can also discuss each of the thing separately. * Properly split different code paths into different logical code blocks, eg. split read/write to socket into its own helpers if you don't need that, and then switch between those existing helpers and yours in an easy way. So please, start by splitting out existing code paths in separate commits and explain why they need to be changed and how they improve the existing code. File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/42411/comment/624f2983_3697441c?usp… : PS10, Line 1132: msgLen = read(mDataSockets[chan], buffer, sizeof(buffer)); You should instead properly split read/write from/to sockets into its own method. File Transceiver52M/radioInterface.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/42411/comment/e00dd06a_872a8224?usp… : PS10, Line 332: int RadioInterface::fillPullBuffer(std::vector<short *> &bufs, size_t samples, int recvunderrun, TIMESTAMP ts) I don't see TIMESTAMP ts used here? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia0d340c323c2eea28fbe82601ba0af7cfbd68f6d Gerrit-Change-Number: 42411 Gerrit-PatchSet: 10 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Thu, 19 Mar 2026 07:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026