- gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: osmo_io: Reject writing messages with length of 0
by jolly 22 Feb '24

22 Feb '24

Attention is currently required from: daniel, jolly, laforge. Hello Jenkins Builder, daniel, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35912?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: osmo_io: Reject writing messages with length of 0 ...................................................................... osmo_io: Reject writing messages with length of 0 io_uring will reject to transmit messages with length of 0. Change-Id: I94be5ec7344d92157f7853c6c0ddf7007513ba8e Related: OS#5751 --- M src/core/osmo_io.c 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35912/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35912?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I94be5ec7344d92157f7853c6c0ddf7007513ba8e Gerrit-Change-Number: 35912 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6
by pespin 22 Feb '24

22 Feb '24

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33802?usp=email ) Change subject: ttcn3-ggsn-test: kernel-gtp: add ipv6 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg: https://gerrit.osmocom.org/c/docker-playground/+/33802/comment/d6a521e1_97e… PS2, Line 48: # gtpu-mode kernel-gtp in OsmoGGSN. because it cannot share GTP-U bind socket between tunnels. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3549db216ff89bdb963744bb38015ad68d4cf6a Gerrit-Change-Number: 33802 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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: 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-Comment-Date: Thu, 22 Feb 2024 13:17:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-trx[master]: ms: add demod test tool and data
by Hoernchen 22 Feb '24

22 Feb '24

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/36047?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ms: add demod test tool and data ...................................................................... ms: add demod test tool and data It just uses the viterbi equalizer and the sigproclib to generate and demodulate bursts and prints the bits, only useful for development. Change-Id: I852e34d9667d1f12f235f8b3da1fcc0d738b2db9 --- M .checkpatch.conf M .gitignore M configure.ac M utils/Makefile.am A utils/va-test/Makefile.am A utils/va-test/burst-gen.cpp A utils/va-test/demodbits_tsc7.s8 A utils/va-test/nb_chunk_tsc7.cfile 8 files changed, 566 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/36047/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36047?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I852e34d9667d1f12f235f8b3da1fcc0d738b2db9 Gerrit-Change-Number: 36047 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ggsn[master]: gtp_new: deduplicate create_and_bind_socket code
by osmith 22 Feb '24

22 Feb '24

osmith has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer
by osmith 22 Feb '24

22 Feb '24

osmith has submitted this change. ( 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, 71 insertions(+), 40 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve 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..c01d193 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,46 +418,62 @@ 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 family = in46a_to_af(listen); int type = SOCK_DGRAM; int protocol = 0; + struct sockaddr addr = {0}; + struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr; + struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr; - *fd = socket(domain, type, protocol); + *fd = socket(family, 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)); + name, family, type, protocol, strerror(errno)); return -errno; } - memset(&addr, 0, sizeof(addr)); - addr.sin_family = domain; - addr.sin_addr = *listen; - addr.sin_port = htons(port); + switch (family) { + case AF_INET: + addr4->sin_family = AF_INET; + addr4->sin_addr = listen->v4; + addr4->sin_port = htons(port); #if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); + addr4->sin_len = sizeof(struct addr); #endif + break; + case AF_INET6: + addr6->sin6_family = AF_INET6; + addr6->sin6_addr = listen->v6; + addr6->sin6_port = htons(port); +#if defined(__FreeBSD__) || defined(__APPLE__) + addr6->sin6_len = sizeof(struct addr); +#endif + break; + default: + OSMO_ASSERT(false); + break; + } - if (bind(*fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + if (bind(*fd, &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)); + 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; } return 0; } -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 +522,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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on inner layer
by osmith 22 Feb '24

22 Feb '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email ) Change subject: kernel-gtp: support IPv6 on inner layer ...................................................................... kernel-gtp: support IPv6 on inner layer Related: OS#6096 Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f --- M TODO-RELEASE M ggsn/ggsn.c M lib/gtp-kernel.c 3 files changed, 78 insertions(+), 41 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index d8cc3af..22cfd1d 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libgtp REMOVE remove GTP cause defines of reserved values +libgtpnl > 1.2.5 gtp_tunnel_set_family() diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index cec043d..db906ea 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -202,11 +202,6 @@ break; case APN_GTPU_MODE_KERNEL_GTP: LOGPAPN(LOGL_INFO, apn, "Opening Kernel GTP device %s\n", apn->tun.cfg.dev_name); - if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) { - LOGPAPN(LOGL_ERROR, apn, "Kernel GTP currently supports only IPv4\n"); - apn_stop(apn); - return -1; - } if (gsn == NULL) { /* skip bringing up the APN now if the GSN is not initialized yet. * This happens during initial load of the config file, as the @@ -536,8 +531,7 @@ in46a_to_eua(addr, num_addr, &pdp->eua); - if (apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP && apn_supports_ipv4(apn)) { - /* TODO: In IPv6, EUA doesn't contain the actual IP addr/prefix! */ + if (apn->cfg.gtpu_mode == APN_GTPU_MODE_KERNEL_GTP) { if (gtp_kernel_tunnel_add(pdp, apn->tun.cfg.dev_name) < 0) { LOGPPDP(LOGL_ERROR, pdp, "Cannot add tunnel to kernel: %s\n", strerror(errno)); gtp_create_context_resp(gsn, pdp, GTPCAUSE_SYS_FAIL); diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index 2a731e6..9bfb380 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -104,61 +104,93 @@ int gtp_kernel_tunnel_add(struct pdp_t *pdp, const char *devname) { - struct in_addr ms, sgsn; + int ms_addr_count; + struct in46_addr ms[2]; + struct in46_addr sgsn; struct gtp_tunnel *t; int ret; pdp_debug(__func__, devname, pdp); - t = gtp_tunnel_alloc(); - if (t == NULL) - return -1; + in46a_from_gsna(&pdp->gsnrc, &sgsn); - memcpy(&ms, &pdp->eua.v[2], sizeof(struct in_addr)); - memcpy(&sgsn, &pdp->gsnrc.v[0], sizeof(struct in_addr)); + ms_addr_count = in46a_from_eua(&pdp->eua, ms); - gtp_tunnel_set_ifidx(t, if_nametoindex(devname)); - gtp_tunnel_set_version(t, pdp->version); - gtp_tunnel_set_ms_ip4(t, &ms); - gtp_tunnel_set_sgsn_ip4(t, &sgsn); - if (pdp->version == 0) { - gtp_tunnel_set_tid(t, pdp_gettid(pdp->imsi, pdp->nsapi)); - gtp_tunnel_set_flowid(t, pdp->flru); - } else { - gtp_tunnel_set_i_tei(t, pdp->teid_own); - /* use the TEI advertised by SGSN when sending packets - * towards the SGSN */ - gtp_tunnel_set_o_tei(t, pdp->teid_gn); + for (int i = 0; i < ms_addr_count; i++) { + t = gtp_tunnel_alloc(); + if (t == NULL) + return -1; + + gtp_tunnel_set_ifidx(t, if_nametoindex(devname)); + gtp_tunnel_set_version(t, pdp->version); + + if (in46a_to_af(&ms[i]) == AF_INET) + gtp_tunnel_set_ms_ip4(t, &ms[i].v4); + else { + /* In IPv6, EUA doesn't contain the actual IP + * addr/prefix. Set higher bits to 0 to get the 64 bit + * netmask. */ + memset(((void *)&ms[i].v6) + 8, 0, 8); + gtp_tunnel_set_ms_ip6(t, &ms[i].v6); + } + + if (in46a_to_af(&sgsn) == AF_INET) + gtp_tunnel_set_sgsn_ip4(t, &sgsn.v4); + else + gtp_tunnel_set_sgsn_ip6(t, &sgsn.v6); + + if (pdp->version == 0) { + gtp_tunnel_set_tid(t, pdp_gettid(pdp->imsi, pdp->nsapi)); + gtp_tunnel_set_flowid(t, pdp->flru); + } else { + gtp_tunnel_set_i_tei(t, pdp->teid_own); + /* use the TEI advertised by SGSN when sending packets + * towards the SGSN */ + gtp_tunnel_set_o_tei(t, pdp->teid_gn); + } + + ret = gtp_add_tunnel(gtp_nl.genl_id, gtp_nl.nl, t); + gtp_tunnel_free(t); + + if (ret != 0) + break; } - ret = gtp_add_tunnel(gtp_nl.genl_id, gtp_nl.nl, t); - gtp_tunnel_free(t); - return ret; } int gtp_kernel_tunnel_del(struct pdp_t *pdp, const char *devname) { + int ms_addr_count; + struct in46_addr ms[2]; struct gtp_tunnel *t; int ret; pdp_debug(__func__, devname, pdp); - t = gtp_tunnel_alloc(); - if (t == NULL) - return -1; + ms_addr_count = in46a_from_eua(&pdp->eua, ms); - gtp_tunnel_set_ifidx(t, if_nametoindex(devname)); - gtp_tunnel_set_version(t, pdp->version); - if (pdp->version == 0) { - gtp_tunnel_set_tid(t, pdp_gettid(pdp->imsi, pdp->nsapi)); - gtp_tunnel_set_flowid(t, pdp->flru); - } else { - gtp_tunnel_set_i_tei(t, pdp->teid_own); + for (int i = 0; i < ms_addr_count; i++) { + t = gtp_tunnel_alloc(); + if (t == NULL) + return -1; + + gtp_tunnel_set_ifidx(t, if_nametoindex(devname)); + gtp_tunnel_set_family(t, in46a_to_af(&ms[i])); + gtp_tunnel_set_version(t, pdp->version); + if (pdp->version == 0) { + gtp_tunnel_set_tid(t, pdp_gettid(pdp->imsi, pdp->nsapi)); + gtp_tunnel_set_flowid(t, pdp->flru); + } else { + gtp_tunnel_set_i_tei(t, pdp->teid_own); + } + + ret = gtp_del_tunnel(gtp_nl.genl_id, gtp_nl.nl, t); + gtp_tunnel_free(t); + + if (ret != 0) + break; } - ret = gtp_del_tunnel(gtp_nl.genl_id, gtp_nl.nl, t); - gtp_tunnel_free(t); - return ret; } -- 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: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on inner layer
by osmith 22 Feb '24

22 Feb '24

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 5: Code-Review+2 -- 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: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 12:08:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer
by osmith 22 Feb '24

22 Feb '24

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36031?usp=email ) Change subject: kernel-gtp: support IPv6 on outer layer ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File tests/gtp/Makefile.am: https://gerrit.osmocom.org/c/osmo-ggsn/+/36031/comment/5cb66012_86e24290 PS1, Line 25: $(top_builddir)/lib/libmisc.a \ > Because gsn.c and gtp.c use functions from in46a now, not having libmisc. […] Done -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 12:08:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[master]: input/ipa: Log error message also in unexpeted error paths
by osmith 22 Feb '24

22 Feb '24

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36040?usp=email ) Change subject: input/ipa: Log error message also in unexpeted error paths ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36040?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib2134817f44026adf0111051ed9ec3c6b8fbe7c9 Gerrit-Change-Number: 36040 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Feb 2024 11:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-trx[master]: ms: add sigproclib demod
by Hoernchen 22 Feb '24

22 Feb '24

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/36046?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ms: add sigproclib demod ...................................................................... ms: add sigproclib demod This is basically a fixed version of ttsous ancient branch that can be used instead of the VA. Required config option part of a future patchset. Change-Id: I6558992bd69f18526be5ebe7d424ca00ceb67772 --- M GSM/GSMCommon.cpp M GSM/GSMCommon.h M Transceiver52M/Resampler.cpp M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 7 files changed, 419 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/46/36046/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36046?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6558992bd69f18526be5ebe7d424ca00ceb67772 Gerrit-Change-Number: 36046 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log