February 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on inner layer

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email ) Change subject: kernel-gtp: support IPv6 on inner layer ...................................................................... Patch Set 4: (1 comment) Patchset: PS3: > Ack. Created https://osmocom.org/issues/6123 regarding the kernel module. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f Gerrit-Change-Number: 33797 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:13:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on inner layer

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email ) Change subject: kernel-gtp: support IPv6 on inner layer ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f Gerrit-Change-Number: 33797 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:13:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: debian: Fixes in systemd service

by pespin

Attention is currently required from: lynxis lazus, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36022?usp=email ) Change subject: debian: Fixes in systemd service ...................................................................... Patch Set 1: (1 comment) File contrib/systemd/osmo-epdg.service: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36022/comment/612b6a68_f326… PS1, Line 10: Environment="ERL_FLAGS=-config /etc/osmocom/osmo-epdg/osmo-epdg.config" > * Other configs are in /etc/osmocom without subdir, e.g. /etc/osmocom/osmo-msc.cfg. […] * s#/etc/osmocom/osmo-epdg#/etc/osmocom#: ACk, my fault * s#cfg#config#: This is because it's erlang, not C + libosmovty. I see ".config" used everywhere in erlang so I'd rather keep that. Anyway the file syntax is not the same. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36022?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Icd640d517b33a840d73aaabef9c594541848357a Gerrit-Change-Number: 36022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:13:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36031?usp=email ) Change subject: kernel-gtp: support IPv6 on outer layer ...................................................................... kernel-gtp: support IPv6 on outer layer Related: OS#1953, OS#6096 Change-Id: I257fff1dcd9d030a7f9ea936b2693a3f13208230 --- M ggsn/ggsn.c M gtp/gsn.c M gtp/gsn.h M gtp/gtp.c M lib/in46_addr.c M lib/in46_addr.h M sgsnemu/sgsnemu.c M tests/gtp/Makefile.am 8 files changed, 78 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/31/36031/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 918d565..cec043d 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -822,7 +822,7 @@ LOGPGGSN(LOGL_INFO, ggsn, "Starting GGSN\n"); /* Start libgtp listener */ - if (gtp_new(&ggsn->gsn, ggsn->cfg.state_dir, &ggsn->cfg.listen_addr.v4, GTP_MODE_GGSN)) { + if (gtp_new(&ggsn->gsn, ggsn->cfg.state_dir, &ggsn->cfg.listen_addr, GTP_MODE_GGSN)) { LOGPGGSN(LOGL_ERROR, ggsn, "Failed to create GTP: %s\n", strerror(errno)); return -1; } @@ -830,11 +830,9 @@ /* patch in different addresses to use (in case we're behind NAT, the listen * address is different from what we advertise externally) */ - if (ggsn->cfg.gtpc_addr.v4.s_addr) - ggsn->gsn->gsnc = ggsn->cfg.gtpc_addr.v4; + ggsn->gsn->gsnc = ggsn->cfg.gtpc_addr; - if (ggsn->cfg.gtpu_addr.v4.s_addr) - ggsn->gsn->gsnu = ggsn->cfg.gtpu_addr.v4; + ggsn->gsn->gsnu = ggsn->cfg.gtpu_addr; /* Register File Descriptors */ osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 0); diff --git a/gtp/gsn.c b/gtp/gsn.c index eb15eaf..1109d66 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -64,11 +64,6 @@ /* Error reporting functions */ -#define LOGP_WITH_ADDR(ss, level, addr, fmt, args...) \ - LOGP(ss, level, "addr(%s:%d) " fmt, \ - inet_ntoa((addr).sin_addr), htons((addr).sin_port), \ - ##args); - static const struct rate_ctr_desc gsn_ctr_description[] = { [GSN_CTR_ERR_SOCKET] = { "err:socket", "Socket error" }, [GSN_CTR_ERR_READFROM] = { "err:readfrom", "readfrom() errors" }, @@ -423,10 +418,10 @@ talloc_free(filename); } -static int create_and_bind_socket(const char *name, struct gsn_t *gsn, int *fd, int domain, - const struct in_addr *listen, int port) +static int create_and_bind_socket(const char *name, struct gsn_t *gsn, int *fd, const struct in46_addr *listen, + int port) { - struct sockaddr_in addr; + int domain = in46a_to_af(listen); int type = SOCK_DGRAM; int protocol = 0; @@ -440,29 +435,51 @@ return -errno; } - memset(&addr, 0, sizeof(addr)); - addr.sin_family = domain; - addr.sin_addr = *listen; - addr.sin_port = htons(port); + switch (domain) { + case AF_INET: + { + struct sockaddr_in addr = {0}; + addr.sin_family = AF_INET; + addr.sin_addr = listen->v4; + addr.sin_port = htons(port); #if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); + addr.sin_len = sizeof(struct addr); #endif - - if (bind(*fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); - LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, - "%s bind(fd=%d) failed: Error = %s\n", - name, *fd, strerror(errno)); - return -errno; + if (bind(*fd, &addr, sizeof(addr)) < 0) + goto bind_err; + break; + } + case AF_INET6: + { + struct sockaddr_in6 addr = {0}; + addr.sin6_family = AF_INET6; + addr.sin6_addr = listen->v6; + addr.sin6_port = htons(port); +#if defined(__FreeBSD__) || defined(__APPLE__) + addr.sin6_len = sizeof(struct addr); +#endif + if (bind(*fd, &addr, sizeof(addr)) < 0) + goto bind_err; + break; + } + default: + OSMO_ASSERT(false); + break; } return 0; + +bind_err: + rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); + LOGP(DLGTP, LOGL_ERROR, + "%s bind(fd=%d, addr=(%s:%d)) failed: Error = %s\n", + name, *fd, in46a_ntoa(listen), port, strerror(errno)); + return -errno; } -int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, - int mode) +int gtp_new(struct gsn_t **gsn, char *statedir, struct in46_addr *listen, int mode) { - LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", inet_ntoa(*listen)); + LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", in46a_ntoa(listen)); *gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */ @@ -511,15 +528,15 @@ (*gsn)->fd1u = -1; /* Create GTP version 0 socket */ - if (create_and_bind_socket("GTPv0", *gsn, &(*gsn)->fd0, AF_INET, listen, GTP0_PORT) < 0) + if (create_and_bind_socket("GTPv0", *gsn, &(*gsn)->fd0, listen, GTP0_PORT) < 0) goto error; /* Create GTP version 1 control plane socket */ - if (create_and_bind_socket("GTPv1 control plane", *gsn, &(*gsn)->fd1c, AF_INET, listen, GTP1C_PORT) < 0) + if (create_and_bind_socket("GTPv1 control plane", *gsn, &(*gsn)->fd1c, listen, GTP1C_PORT) < 0) goto error; /* Create GTP version 1 user plane socket */ - if (create_and_bind_socket("GTPv1 user plane", *gsn, &(*gsn)->fd1u, AF_INET, listen, GTP1U_PORT) < 0) + if (create_and_bind_socket("GTPv1 user plane", *gsn, &(*gsn)->fd1u, listen, GTP1U_PORT) < 0) goto error; /* Start internal queue timer */ diff --git a/gtp/gsn.h b/gtp/gsn.h index 8e47ce3..df2f745 100644 --- a/gtp/gsn.h +++ b/gtp/gsn.h @@ -18,6 +18,7 @@ #include <osmocom/core/tdef.h> #include <osmocom/core/rate_ctr.h> +#include "../lib/in46_addr.h" #include "pdp.h" #define GTP_MODE_GGSN 1 @@ -77,8 +78,8 @@ int fd1c; /* GTP1 control plane file descriptor */ int fd1u; /* GTP0 user plane file descriptor */ int mode; /* Mode of operation: GGSN or SGSN */ - struct in_addr gsnc; /* IP address of this gsn for signalling */ - struct in_addr gsnu; /* IP address of this gsn for user traffic */ + struct in46_addr gsnc; /* IP address of this gsn for signalling */ + struct in46_addr gsnu; /* IP address of this gsn for user traffic */ /* Parameters related to signalling messages */ uint16_t seq_next; /* Next sequence number to use */ @@ -117,8 +118,7 @@ /* External API functions */ -extern int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, - int mode); +extern int gtp_new(struct gsn_t **gsn, char *statedir, struct in46_addr *listen, int mode); extern int gtp_free(struct gsn_t *gsn); diff --git a/gtp/gtp.c b/gtp/gtp.c index 43e56b5..86c456f 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1297,8 +1297,8 @@ } /* Initialize our own IP addresses */ - in_addr2gsna(&pdp->gsnlc, &gsn->gsnc); - in_addr2gsna(&pdp->gsnlu, &gsn->gsnu); + in46a_to_gsna(&pdp->gsnlc, &gsn->gsnc); + in46a_to_gsna(&pdp->gsnlu, &gsn->gsnu); if (!gtp_pdp_getimsi(gsn, &pdp_old, pdp->imsi, pdp->nsapi)) { /* Found old pdp with same tid. Now the voodoo begins! */ diff --git a/lib/in46_addr.c b/lib/in46_addr.c index 648fe7e..d7c194f 100644 --- a/lib/in46_addr.c +++ b/lib/in46_addr.c @@ -376,6 +376,14 @@ return 1; } +void in46a_to_gsna(struct ul16_t *gsna, const struct in46_addr *src) +{ + memset(gsna, 0, sizeof(struct ul16_t)); + gsna->l = src->len; + OSMO_ASSERT(gsna->l <= sizeof(gsna->v)); + memcpy(gsna->v, &src->v6, gsna->l); +} + void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst) { dst->len = in->l; diff --git a/lib/in46_addr.h b/lib/in46_addr.h index 5589f94..59f58fc 100644 --- a/lib/in46_addr.h +++ b/lib/in46_addr.h @@ -40,4 +40,5 @@ return addr->len == sizeof(struct in_addr); } +void in46a_to_gsna(struct ul16_t *gsna, const struct in46_addr *src); void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst); diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 7893f4f..f5ed671 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -59,6 +59,7 @@ #include "../lib/syserr.h" #include "../lib/netns.h" #include "../lib/icmpv6.h" +#include "../lib/in46_addr.h" #include "../gtp/pdp.h" #include "../gtp/gtp.h" #include "cmdline.h" @@ -117,7 +118,7 @@ int pingsize; int pingcount; int pingquiet; - struct in_addr listen; + struct in46_addr listen; struct in_addr remote; struct in_addr dns; int contexts; /* Number of contexts to create */ @@ -459,10 +460,10 @@ args_info.listen_arg); return -1; } else { - memcpy(&options.listen.s_addr, host->h_addr, - host->h_length); + options.listen.len = host->h_length; + memcpy(&options.listen.v6, host->h_addr, host->h_length); printf("Local IP address is: %s (%s)\n", - args_info.listen_arg, inet_ntoa(options.listen)); + args_info.listen_arg, in46a_ntoa(&options.listen)); } } else { SYS_ERR(DSGSN, LOGL_ERROR, 0, diff --git a/tests/gtp/Makefile.am b/tests/gtp/Makefile.am index ef69260..4d4d2e3 100644 --- a/tests/gtp/Makefile.am +++ b/tests/gtp/Makefile.am @@ -22,11 +22,13 @@ gtpie_test_LDADD = \ $(top_builddir)/lib/debug.o \ $(top_builddir)/gtp/libgtp.la \ + $(top_builddir)/lib/libmisc.a \ $(LIBOSMOCORE_LIBS) \ $(NULL) queue_test_LDADD = \ $(top_builddir)/lib/debug.o \ $(top_builddir)/gtp/libgtp.la \ + $(top_builddir)/lib/libmisc.a \ $(LIBOSMOCORE_LIBS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I257fff1dcd9d030a7f9ea936b2693a3f13208230 Gerrit-Change-Number: 36031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-ggsn[master]: Fix a typo

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36029?usp=email ) Change subject: Fix a typo ...................................................................... Fix a typo Change-Id: I508274a1a466651025c488ad897aeed739e4b799 --- M ggsn/ggsn.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/29/36029/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 0cde543..918d565 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -193,7 +193,7 @@ } LOGPAPN(LOGL_INFO, apn, "Opened TUN device %s\n", apn->tun.tun->devname); - /* Register with libosmcoore */ + /* Register with libosmocore */ osmo_fd_setup(&apn->tun.fd, apn->tun.tun->fd, OSMO_FD_READ, ggsn_tun_fd_cb, apn, 0); osmo_fd_register(&apn->tun.fd); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36029?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I508274a1a466651025c488ad897aeed739e4b799 Gerrit-Change-Number: 36029 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: gtp_new: deduplicate create_and_bind_socket code

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36030?usp=email ) Change subject: gtp_new: deduplicate create_and_bind_socket code ...................................................................... gtp_new: deduplicate create_and_bind_socket code Change-Id: Iff3cfdfb0c08033d869c51499754b3416c71732b --- M gtp/gsn.c 1 file changed, 60 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/30/36030/1 diff --git a/gtp/gsn.c b/gtp/gsn.c index 8b3ea3a..eb15eaf 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -423,11 +423,45 @@ talloc_free(filename); } +static int create_and_bind_socket(const char *name, struct gsn_t *gsn, int *fd, int domain, + const struct in_addr *listen, int port) +{ + struct sockaddr_in addr; + int type = SOCK_DGRAM; + int protocol = 0; + + *fd = socket(domain, type, protocol); + + if (*fd < 0) { + rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); + LOGP(DLGTP, LOGL_ERROR, + "%s socket(domain=%d, type=%d, protocol=%d) failed: Error = %s\n", + name, domain, type, protocol, strerror(errno)); + return -errno; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = domain; + addr.sin_addr = *listen; + addr.sin_port = htons(port); +#if defined(__FreeBSD__) || defined(__APPLE__) + addr.sin_len = sizeof(addr); +#endif + + if (bind(*fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); + LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, + "%s bind(fd=%d) failed: Error = %s\n", + name, *fd, strerror(errno)); + return -errno; + } + + return 0; +} + int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, int mode) { - struct sockaddr_in addr; - LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", inet_ntoa(*listen)); *gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */ @@ -467,89 +501,35 @@ (*gsn)->cb_data_ind = 0; /* Store function parameters */ + /* Same IP for user traffic and signalling */ (*gsn)->gsnc = *listen; (*gsn)->gsnu = *listen; (*gsn)->mode = mode; + (*gsn)->fd0 = -1; + (*gsn)->fd1c = -1; + (*gsn)->fd1u = -1; + /* Create GTP version 0 socket */ - if (((*gsn)->fd0 = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP(DLGTP, LOGL_ERROR, - "GTPv0 socket(domain=%d, type=%d, protocol=%d) failed: Error = %s\n", - AF_INET, SOCK_DGRAM, 0, strerror(errno)); - return -errno; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr = *listen; /* Same IP for user traffic and signalling */ - addr.sin_port = htons(GTP0_PORT); -#if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); -#endif - - if (bind((*gsn)->fd0, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, - "bind(fd0=%d) failed: Error = %s\n", - (*gsn)->fd0, strerror(errno)); - return -errno; - } + if (create_and_bind_socket("GTPv0", *gsn, &(*gsn)->fd0, AF_INET, listen, GTP0_PORT) < 0) + goto error; /* Create GTP version 1 control plane socket */ - if (((*gsn)->fd1c = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP(DLGTP, LOGL_ERROR, - "GTPv1 control plane socket(domain=%d, type=%d, protocol=%d) failed: Error = %s\n", - AF_INET, SOCK_DGRAM, 0, strerror(errno)); - return -errno; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr = *listen; /* Same IP for user traffic and signalling */ - addr.sin_port = htons(GTP1C_PORT); -#if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); -#endif - - if (bind((*gsn)->fd1c, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, - "bind(fd1c=%d) failed: Error = %s\n", - (*gsn)->fd1c, strerror(errno)); - return -errno; - } + if (create_and_bind_socket("GTPv1 control plane", *gsn, &(*gsn)->fd1c, AF_INET, listen, GTP1C_PORT) < 0) + goto error; /* Create GTP version 1 user plane socket */ - if (((*gsn)->fd1u = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP(DLGTP, LOGL_ERROR, - "GTPv1 user plane socket(domain=%d, type=%d, protocol=%d) failed: Error = %s\n", - AF_INET, SOCK_DGRAM, 0, strerror(errno)); - return -errno; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr = *listen; /* Same IP for user traffic and signalling */ - addr.sin_port = htons(GTP1U_PORT); -#if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); -#endif - - if (bind((*gsn)->fd1u, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - rate_ctr_inc2((*gsn)->ctrg, GSN_CTR_ERR_SOCKET); - LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, - "bind(fd1u=%d) failed: Error = %s\n", - (*gsn)->fd1u, strerror(errno)); - return -errno; - } + if (create_and_bind_socket("GTPv1 user plane", *gsn, &(*gsn)->fd1u, AF_INET, listen, GTP1U_PORT) < 0) + goto error; /* Start internal queue timer */ gtp_queue_timer_start(*gsn); return 0; +error: + gtp_free(*gsn); + *gsn = NULL; + return -1; } int gtp_free(struct gsn_t *gsn) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Iff3cfdfb0c08033d869c51499754b3416c71732b Gerrit-Change-Number: 36030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: rebar.lock: Update after dependency fixes/updates

by laforge

Attention is currently required from: lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36021?usp=email ) Change subject: rebar.lock: Update after dependency fixes/updates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iea501aca2a15df48aaae2672dcb9d39716ea585c Gerrit-Change-Number: 36021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 21 Feb 2024 08:29:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: Add TS.48 profiles modified for unique ICCIDs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36026?usp=email ) Change subject: osmo-smdpp: Add TS.48 profiles modified for unique ICCIDs ...................................................................... osmo-smdpp: Add TS.48 profiles modified for unique ICCIDs The original TS.48 profiles have shared/overlapping ICCIDs meaning you can always install one of them on a given eUICC. Let's add a set of modified TS.48 profiles so you can install any number of them in parallel on a single eUICC, switching between them via your LPA. Change-Id: Id5019b290db1ee90ae1c72b312f08bf3184908ea --- A smdpp-data/upp/TS48V1-A-UNIQUE.der A smdpp-data/upp/TS48V1-B-UNIQUE.der A smdpp-data/upp/TS48V2-SAIP2-1-BERTLV-UNIQUE.der A smdpp-data/upp/TS48V2-SAIP2-1-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V2-SAIP2-3-BERTLV-UNIQUE.der A smdpp-data/upp/TS48V2-SAIP2-3-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V3-SAIP2-1-BERTLV-UNIQUE.der A smdpp-data/upp/TS48V3-SAIP2-1-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V3-SAIP2-3-BERTLV-UNIQUE.der A smdpp-data/upp/TS48V3-SAIP2-3-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V4-SAIP2-1A-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V4-SAIP2-1B-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V4-SAIP2-3-BERTLV-UNIQUE.der A smdpp-data/upp/TS48V4-SAIP2-3-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V5-SAIP2-1A-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V5-SAIP2-1B-NOBERTLV-UNIQUE.der A smdpp-data/upp/TS48V5-SAIP2-3-BERTLV-SUCI-UNIQUE.der A smdpp-data/upp/TS48V5-SAIP2-3-NOBERTLV-UNIQUE.der 18 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/smdpp-data/upp/TS48V1-A-UNIQUE.der b/smdpp-data/upp/TS48V1-A-UNIQUE.der new file mode 100644 index 0000000..18559be --- /dev/null +++ b/smdpp-data/upp/TS48V1-A-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V1-B-UNIQUE.der b/smdpp-data/upp/TS48V1-B-UNIQUE.der new file mode 100644 index 0000000..24ffb8d --- /dev/null +++ b/smdpp-data/upp/TS48V1-B-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V2-SAIP2-1-BERTLV-UNIQUE.der b/smdpp-data/upp/TS48V2-SAIP2-1-BERTLV-UNIQUE.der new file mode 100644 index 0000000..657a48e --- /dev/null +++ b/smdpp-data/upp/TS48V2-SAIP2-1-BERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V2-SAIP2-1-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V2-SAIP2-1-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..3eba990 --- /dev/null +++ b/smdpp-data/upp/TS48V2-SAIP2-1-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V2-SAIP2-3-BERTLV-UNIQUE.der b/smdpp-data/upp/TS48V2-SAIP2-3-BERTLV-UNIQUE.der new file mode 100644 index 0000000..4c8d7f2 --- /dev/null +++ b/smdpp-data/upp/TS48V2-SAIP2-3-BERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V2-SAIP2-3-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V2-SAIP2-3-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..52999e2 --- /dev/null +++ b/smdpp-data/upp/TS48V2-SAIP2-3-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V3-SAIP2-1-BERTLV-UNIQUE.der b/smdpp-data/upp/TS48V3-SAIP2-1-BERTLV-UNIQUE.der new file mode 100644 index 0000000..700edb5 --- /dev/null +++ b/smdpp-data/upp/TS48V3-SAIP2-1-BERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V3-SAIP2-1-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V3-SAIP2-1-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..ab731ad --- /dev/null +++ b/smdpp-data/upp/TS48V3-SAIP2-1-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V3-SAIP2-3-BERTLV-UNIQUE.der b/smdpp-data/upp/TS48V3-SAIP2-3-BERTLV-UNIQUE.der new file mode 100644 index 0000000..e340003 --- /dev/null +++ b/smdpp-data/upp/TS48V3-SAIP2-3-BERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V3-SAIP2-3-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V3-SAIP2-3-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..59bfe56 --- /dev/null +++ b/smdpp-data/upp/TS48V3-SAIP2-3-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V4-SAIP2-1A-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V4-SAIP2-1A-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..e8ac2c2 --- /dev/null +++ b/smdpp-data/upp/TS48V4-SAIP2-1A-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V4-SAIP2-1B-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V4-SAIP2-1B-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..8cd3a31 --- /dev/null +++ b/smdpp-data/upp/TS48V4-SAIP2-1B-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V4-SAIP2-3-BERTLV-UNIQUE.der b/smdpp-data/upp/TS48V4-SAIP2-3-BERTLV-UNIQUE.der new file mode 100644 index 0000000..4c8433a --- /dev/null +++ b/smdpp-data/upp/TS48V4-SAIP2-3-BERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V4-SAIP2-3-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V4-SAIP2-3-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..8a08988 --- /dev/null +++ b/smdpp-data/upp/TS48V4-SAIP2-3-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V5-SAIP2-1A-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V5-SAIP2-1A-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..2a91ef6 --- /dev/null +++ b/smdpp-data/upp/TS48V5-SAIP2-1A-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V5-SAIP2-1B-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V5-SAIP2-1B-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..747cead --- /dev/null +++ b/smdpp-data/upp/TS48V5-SAIP2-1B-NOBERTLV-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V5-SAIP2-3-BERTLV-SUCI-UNIQUE.der b/smdpp-data/upp/TS48V5-SAIP2-3-BERTLV-SUCI-UNIQUE.der new file mode 100644 index 0000000..d7cbeeb --- /dev/null +++ b/smdpp-data/upp/TS48V5-SAIP2-3-BERTLV-SUCI-UNIQUE.der Binary files differ diff --git a/smdpp-data/upp/TS48V5-SAIP2-3-NOBERTLV-UNIQUE.der b/smdpp-data/upp/TS48V5-SAIP2-3-NOBERTLV-UNIQUE.der new file mode 100644 index 0000000..0276eac --- /dev/null +++ b/smdpp-data/upp/TS48V5-SAIP2-3-NOBERTLV-UNIQUE.der Binary files differ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36026?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5019b290db1ee90ae1c72b312f08bf3184908ea Gerrit-Change-Number: 36026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: Add TS.48 profiles modified for unique ICCIDs

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36026?usp=email ) Change subject: osmo-smdpp: Add TS.48 profiles modified for unique ICCIDs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36026?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5019b290db1ee90ae1c72b312f08bf3184908ea Gerrit-Change-Number: 36026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Feb 2024 08:28:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: Get rid of hard-coded ICCID

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36025?usp=email ) Change subject: osmo-smdpp: Get rid of hard-coded ICCID ...................................................................... osmo-smdpp: Get rid of hard-coded ICCID Read the ICCID from the header of the UPP when building the ProfileMetdata. This allows the download of profiles with arbitrary ICCID. Change-Id: I1b9e17f757f9935436828e6dc1ab75ff17d1d1a4 --- M osmo-smdpp.py 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 8cb0082..582b222 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -35,6 +35,7 @@ from pySim.utils import h2b, b2h, swap_nibbles import pySim.esim.rsp as rsp +from pySim.esim import saip from pySim.esim.es8p import * from pySim.esim.x509_cert import oid, cert_policy_has_oid, cert_get_auth_key_id from pySim.esim.x509_cert import CertAndPrivkey, CertificateSet, cert_get_subject_key_id, VerifyError @@ -363,11 +364,14 @@ if not os.path.isfile(path) or not os.access(path, os.R_OK): raise ApiError('8.2.6', '3.8', 'Refused') ss.matchingId = matchingId + with open(path, 'rb') as f: + pes = saip.ProfileElementSequence.from_der(f.read()) + iccid_str = b2h(pes.get_pe_for_type('header').decoded['iccid']) # FIXME: we actually want to perform the profile binding herr, and read the profile metadat from the profile # Put together profileMetadata + _bin - ss.profileMetadata = ProfileMetadata(iccid_bin= h2b(swap_nibbles('89000123456789012358')), spn="OsmocomSPN", profile_name="OsmocomProfile") + ss.profileMetadata = ProfileMetadata(iccid_bin=h2b(swap_nibbles(iccid_str)), spn="OsmocomSPN", profile_name=matchingId) profileMetadata_bin = ss.profileMetadata.gen_store_metadata_request() # Put together smdpSigned2 + _bin -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36025?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1b9e17f757f9935436828e6dc1ab75ff17d1d1a4 Gerrit-Change-Number: 36025 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024