- gerrit-log - lists.osmocom.org

[S] Change in libgtpnl[master]: gtp: provide interface to set family
by osmith 15 Feb '24

15 Feb '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35987?usp=email ) Change subject: gtp: provide interface to set family ...................................................................... gtp: provide interface to set family Kernel now supports for TID/I_TEI to be used in both IPv4 and IPv6 GTP tunnels. This improves dualstack support for MS/UE so GTP traffic can be identified with the same tunnel identifier. Update gtp-tunnel to specify the family, since a tunnel is now identified by the following tuple [ version, identifier, family ]. Change-Id: I584d3997ffb89cd430dfda9615a4ce0ce517ab2a --- M include/libgtpnl/gtp.h M src/gtp.c M src/libgtpnl.map M tools/gtp-link.c M tools/gtp-tunnel.c 5 files changed, 40 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/87/35987/1 diff --git a/include/libgtpnl/gtp.h b/include/libgtpnl/gtp.h index 9b0bcf4..796932b 100644 --- a/include/libgtpnl/gtp.h +++ b/include/libgtpnl/gtp.h @@ -11,6 +11,7 @@ void gtp_tunnel_set_ifns(struct gtp_tunnel *t, int ifns); void gtp_tunnel_set_ifidx(struct gtp_tunnel *t, uint32_t ifidx); +void gtp_tunnel_set_family(struct gtp_tunnel *t, uint16_t family); void gtp_tunnel_set_ms_ip4(struct gtp_tunnel *t, struct in_addr *ms_addr); void gtp_tunnel_set_sgsn_ip4(struct gtp_tunnel *t, struct in_addr *sgsn_addr); void gtp_tunnel_set_ms_ip6(struct gtp_tunnel *t, const struct in6_addr *ms_addr); diff --git a/src/gtp.c b/src/gtp.c index 657eb7a..0c378c4 100644 --- a/src/gtp.c +++ b/src/gtp.c @@ -58,6 +58,12 @@ } EXPORT_SYMBOL(gtp_tunnel_set_ifidx); +void gtp_tunnel_set_family(struct gtp_tunnel *t, uint16_t family) +{ + t->ms_addr.family = family; +} +EXPORT_SYMBOL(gtp_tunnel_set_family); + void gtp_tunnel_set_ms_ip4(struct gtp_tunnel *t, struct in_addr *ms_addr) { t->ms_addr.family = AF_INET; diff --git a/src/libgtpnl.map b/src/libgtpnl.map index 1237e69..41b7dd7 100644 --- a/src/libgtpnl.map +++ b/src/libgtpnl.map @@ -43,3 +43,7 @@ gtp_tunnel_set_ms_ip6; gtp_tunnel_set_sgsn_ip6; } LIBGTPNL_1.0; + +LIBGTPNL_1.2 { + gtp_tunnel_set_family; +} LIBGTPNL_1.1; diff --git a/tools/gtp-link.c b/tools/gtp-link.c index 6979459..325a45f 100644 --- a/tools/gtp-link.c +++ b/tools/gtp-link.c @@ -75,6 +75,7 @@ { int fd1 = socket(family, SOCK_DGRAM, 0); int fd2 = socket(family, SOCK_DGRAM, 0); + int one = 1; if (fd1 < 0 || fd2 < 0) return -1; diff --git a/tools/gtp-tunnel.c b/tools/gtp-tunnel.c index 1fcdee7..1b8a7a0 100644 --- a/tools/gtp-tunnel.c +++ b/tools/gtp-tunnel.c @@ -131,8 +131,8 @@ struct gtp_tunnel *t; uint32_t gtp_ifidx; - if (argc != 5) { - printf("%s del <gtp device> <version> <tid>\n", + if (argc != 6) { + printf("%s del <gtp device> <version> <tid> <family>\n", argv[0]); return EXIT_FAILURE; } @@ -160,6 +160,16 @@ return EXIT_FAILURE; } + if (strcmp(argv[5], "ip") == 0) { + gtp_tunnel_set_family(t, AF_INET); + } else if (strcmp(argv[5], "ip6") == 0) { + gtp_tunnel_set_family(t, AF_INET6); + } else { + fprintf(stderr, "wrong family %s, use ip or ip6\n", argv[5]); + gtp_tunnel_free(t); + return EXIT_FAILURE; + } + gtp_del_tunnel(genl_id, nl, t); gtp_tunnel_free(t); -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I584d3997ffb89cd430dfda9615a4ce0ce517ab2a Gerrit-Change-Number: 35987 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libgtpnl[master]: gtp-link: set IPv6 socket only
by osmith 15 Feb '24

15 Feb '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35986?usp=email ) Change subject: gtp-link: set IPv6 socket only ...................................................................... gtp-link: set IPv6 socket only GTP driver bails out for IPv4-mapped-IPv6 socket with EADDRNOAVAIL, to prevent issues with setsockopt IPV6_ADDRFORM. GTP control plane checks that tunnel family matches the socket family for this GTP device, ie. there is a 1:1 mapping between the socket listener and the device which determines the supported IP tunnel header. Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Change-Id: I887a107657059adeb14ae425576ae7ea9018f762 --- M tools/gtp-link.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/86/35986/1 diff --git a/tools/gtp-link.c b/tools/gtp-link.c index feb2efe..6979459 100644 --- a/tools/gtp-link.c +++ b/tools/gtp-link.c @@ -95,6 +95,10 @@ gtp_sock->len = sizeof(struct sockaddr_in6); setup_sockaddr_in6(&gtp_sock->sockaddr.fd1.in6, 3386); setup_sockaddr_in6(&gtp_sock->sockaddr.fd2.in6, 2152); + if (setsockopt(fd1, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0) + perror("setsockopt IPV6_V6ONLY: "); + if (setsockopt(fd2, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0) + perror("setsockopt IPV6_V6ONLY: "); break; } -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I887a107657059adeb14ae425576ae7ea9018f762 Gerrit-Change-Number: 35986 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libgtpnl[master]: gtp-link: add IPv6 support
by osmith 15 Feb '24

15 Feb '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35985?usp=email ) Change subject: gtp-link: add IPv6 support ...................................................................... gtp-link: add IPv6 support Update tool to allow to specify family that is used for the outer network header in GTP tunnels. ./gtp-link add gtp0 ip # IPv4 GGSN ./gtp-link add gtp0 ip --sgsn # IPv4 SGSN ./gtp-link add gtp0 ip6 # IPv6 GGSN ./gtp-link add gtp0 ip6 --sgsn # IPv6 SGSN Change-Id: I201c32a1bf9a2ab7a228287590bc7ec19c4997b9 --- M tools/gtp-link.c 1 file changed, 112 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/85/35985/1 diff --git a/tools/gtp-link.c b/tools/gtp-link.c index d342f2b..feb2efe 100644 --- a/tools/gtp-link.c +++ b/tools/gtp-link.c @@ -40,13 +40,75 @@ #include <libgtpnl/gtpnl.h> +struct gtp_server_sock { + int family; + int fd1; + int fd2; + socklen_t len; + struct { + union { + struct sockaddr_in in; + struct sockaddr_in6 in6; + } fd1; + union { + struct sockaddr_in in; + struct sockaddr_in6 in6; + } fd2; + } sockaddr; +}; + +static void setup_sockaddr_in(struct sockaddr_in *sockaddr, uint16_t port) +{ + sockaddr->sin_family = AF_INET; + sockaddr->sin_port = htons(port); + sockaddr->sin_addr.s_addr = INADDR_ANY; +} + +static void setup_sockaddr_in6(struct sockaddr_in6 *sockaddr, uint16_t port) +{ + sockaddr->sin6_family = AF_INET6; + sockaddr->sin6_port = htons(port); + sockaddr->sin6_addr = in6addr_any; +} + +static int setup_socket(struct gtp_server_sock *gtp_sock, int family) +{ + int fd1 = socket(family, SOCK_DGRAM, 0); + int fd2 = socket(family, SOCK_DGRAM, 0); + + if (fd1 < 0 || fd2 < 0) + return -1; + + memset(gtp_sock, 0, sizeof(*gtp_sock)); + + gtp_sock->family = family; + gtp_sock->fd1 = fd1; + gtp_sock->fd2 = fd2; + + switch (family) { + case AF_INET: + gtp_sock->len = sizeof(struct sockaddr_in); + setup_sockaddr_in(&gtp_sock->sockaddr.fd1.in, 3386); + setup_sockaddr_in(&gtp_sock->sockaddr.fd2.in, 2152); + break; + case AF_INET6: + gtp_sock->len = sizeof(struct sockaddr_in6); + setup_sockaddr_in6(&gtp_sock->sockaddr.fd1.in6, 3386); + setup_sockaddr_in6(&gtp_sock->sockaddr.fd2.in6, 2152); + break; + } + + return 0; +} + int main(int argc, char *argv[]) { char buf[MNL_SOCKET_BUFFER_SIZE]; - int ret, sgsn_mode = 0; + struct gtp_server_sock gtp_sock; + int ret, sgsn_mode = 0, family; if (argc < 3) { - printf("Usage: %s add <device> [--sgsn]\n", argv[0]); + printf("Usage: %s add <device> <family> [--sgsn]\n", argv[0]); printf(" %s del <device>\n", argv[0]); exit(EXIT_FAILURE); } @@ -57,43 +119,44 @@ perror("gtp_dev_destroy"); return 0; + } else if (!strcmp(argv[1], "add")) { + if (argc < 4) { + printf("Usage: %s add <device> <family> [--sgsn]\n", argv[0]); + exit(EXIT_FAILURE); + } + + if (argc == 5 && !strcmp(argv[4], "--sgsn")) + sgsn_mode = 1; } - if (argc > 3 && !strcmp(argv[3], "--sgsn")) - sgsn_mode = 1; + if (!strcmp(argv[3], "ip")) + family = AF_INET; + else if (!strcmp(argv[3], "ip6")) + family = AF_INET6; + else { + fprintf(stderr, "unsupport family `%s', expecting `ip' or `ip6'\n", + argv[3]); + exit(EXIT_FAILURE); + } - int fd1 = socket(AF_INET, SOCK_DGRAM, 0); - int fd2 = socket(AF_INET, SOCK_DGRAM, 0); - struct sockaddr_in sockaddr_fd1 = { - .sin_family = AF_INET, - .sin_port = htons(3386), - .sin_addr = { - .s_addr = INADDR_ANY, - }, - }; - struct sockaddr_in sockaddr_fd2 = { - .sin_family = AF_INET, - .sin_port = htons(2152), - .sin_addr = { - .s_addr = INADDR_ANY, - }, - }; + if (setup_socket(&gtp_sock, family) < 0) { + perror("socket"); + exit(EXIT_FAILURE); + } - if (bind(fd1, (struct sockaddr *) &sockaddr_fd1, - sizeof(sockaddr_fd1)) < 0) { + if (bind(gtp_sock.fd1, (struct sockaddr *) &gtp_sock.sockaddr.fd1, gtp_sock.len) < 0) { perror("bind"); exit(EXIT_FAILURE); } - if (bind(fd2, (struct sockaddr *) &sockaddr_fd2, - sizeof(sockaddr_fd2)) < 0) { + if (bind(gtp_sock.fd2, (struct sockaddr *) &gtp_sock.sockaddr.fd2, gtp_sock.len) < 0) { perror("bind"); exit(EXIT_FAILURE); } if (sgsn_mode) - ret = gtp_dev_create_sgsn(-1, argv[2], fd1, fd2); + ret = gtp_dev_create_sgsn(-1, argv[2], gtp_sock.fd1, gtp_sock.fd2); else - ret = gtp_dev_create(-1, argv[2], fd1, fd2); + ret = gtp_dev_create(-1, argv[2], gtp_sock.fd1, gtp_sock.fd2); if (ret < 0) { perror("cannot create GTP device\n"); exit(EXIT_FAILURE); @@ -103,11 +166,13 @@ "this process running for testing purposes.\n"); while (1) { - struct sockaddr_in addr; - socklen_t len = sizeof(addr); + union { + struct sockaddr_in addr; + struct sockaddr_in6 addr6; + } sock; - ret = recvfrom(fd1, buf, sizeof(buf), 0, - (struct sockaddr *)&addr, &len); + ret = recvfrom(gtp_sock.fd1, buf, sizeof(buf), 0, + (struct sockaddr *)&sock, &gtp_sock.len); printf("received %d bytes via UDP socket\n", ret); } -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I201c32a1bf9a2ab7a228287590bc7ec19c4997b9 Gerrit-Change-Number: 35985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libgtpnl[master]: gtp: add flags to gtp_tunnel object
by osmith 15 Feb '24

15 Feb '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35988?usp=email ) Change subject: gtp: add flags to gtp_tunnel object ...................................................................... gtp: add flags to gtp_tunnel object Flags tells us what fields have been set in this object. This is required by ./gtp-tunnel del otherwise, build helper function adds the MS/UE address and kernel reports ENOENT, and tunnel identifier is ignored. Update gtp-tunnel tool to set flowid to zero in the GTP version 0 case, otherwise kernel reports EINVAL since now this flag is not ever set. Change-Id: I66677ab2d4de2c459ed9987c465fce6f059d6d93 --- M src/gtp-genl.c M src/gtp.c M src/internal.h M tools/gtp-tunnel.c 4 files changed, 93 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/88/35988/1 diff --git a/src/gtp-genl.c b/src/gtp-genl.c index 447e1ea..3b7c3ef 100644 --- a/src/gtp-genl.c +++ b/src/gtp-genl.c @@ -44,42 +44,55 @@ static void gtp_build_payload(struct nlmsghdr *nlh, struct gtp_tunnel *t) { - mnl_attr_put_u8(nlh, GTPA_FAMILY, t->ms_addr.family); - mnl_attr_put_u32(nlh, GTPA_VERSION, t->gtp_version); - if (t->ifns >= 0) + if (t->flags & GTP_TUN_FAMILY) + mnl_attr_put_u8(nlh, GTPA_FAMILY, t->ms_addr.family); + if (t->flags & GTP_TUN_VERSION) + mnl_attr_put_u32(nlh, GTPA_VERSION, t->gtp_version); + if (t->flags & GTP_TUN_IFNS) mnl_attr_put_u32(nlh, GTPA_NET_NS_FD, t->ifns); - mnl_attr_put_u32(nlh, GTPA_LINK, t->ifidx); + if (t->flags & GTP_TUN_IFIDX) + mnl_attr_put_u32(nlh, GTPA_LINK, t->ifidx); - switch (t->ms_addr.family) { - case AF_INET: - mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.ip4.s_addr); - break; - case AF_INET6: - mnl_attr_put(nlh, GTPA_MS_ADDR6, sizeof(t->ms_addr.ip6), &t->ms_addr.ip6); - break; - default: - /* No addr is set when deleting a tunnel */ - break; + if (t->flags & GTP_TUN_MS_ADDR) { + switch (t->ms_addr.family) { + case AF_INET: + mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.ip4.s_addr); + break; + case AF_INET6: + mnl_attr_put(nlh, GTPA_MS_ADDR6, sizeof(t->ms_addr.ip6), &t->ms_addr.ip6); + break; + default: + /* No addr is set when deleting a tunnel */ + break; + } } - switch (t->sgsn_addr.family) { - case AF_INET: - mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.ip4.s_addr); - break; - case AF_INET6: - mnl_attr_put(nlh, GTPA_PEER_ADDR6, sizeof(t->sgsn_addr.ip6), &t->sgsn_addr.ip6); - break; - default: - /* No addr is set when deleting a tunnel */ - break; + if (t->flags & GTP_TUN_SGSN_ADDR) { + switch (t->sgsn_addr.family) { + case AF_INET: + mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.ip4.s_addr); + break; + case AF_INET6: + mnl_attr_put(nlh, GTPA_PEER_ADDR6, sizeof(t->sgsn_addr.ip6), &t->sgsn_addr.ip6); + break; + default: + /* No addr is set when deleting a tunnel */ + break; + } } - if (t->gtp_version == GTP_V0) { - mnl_attr_put_u64(nlh, GTPA_TID, t->u.v0.tid); - mnl_attr_put_u16(nlh, GTPA_FLOW, t->u.v0.flowid); - } else if (t->gtp_version == GTP_V1) { - mnl_attr_put_u32(nlh, GTPA_I_TEI, t->u.v1.i_tei); - mnl_attr_put_u32(nlh, GTPA_O_TEI, t->u.v1.o_tei); + if (t->flags & GTP_TUN_VERSION) { + if (t->gtp_version == GTP_V0) { + if (t->flags & GTP_TUN_V0_TID) + mnl_attr_put_u64(nlh, GTPA_TID, t->u.v0.tid); + if (t->flags & GTP_TUN_V0_FLOWID) + mnl_attr_put_u16(nlh, GTPA_FLOW, t->u.v0.flowid); + } else if (t->gtp_version == GTP_V1) { + if (t->flags & GTP_TUN_V1_I_TEI) + mnl_attr_put_u32(nlh, GTPA_I_TEI, t->u.v1.i_tei); + if (t->flags & GTP_TUN_V1_O_TEI) + mnl_attr_put_u32(nlh, GTPA_O_TEI, t->u.v1.o_tei); + } } } diff --git a/src/gtp.c b/src/gtp.c index 0c378c4..af216f7 100644 --- a/src/gtp.c +++ b/src/gtp.c @@ -49,18 +49,21 @@ void gtp_tunnel_set_ifns(struct gtp_tunnel *t, int ifns) { t->ifns = ifns; + t->flags |= GTP_TUN_IFNS; } EXPORT_SYMBOL(gtp_tunnel_set_ifns); void gtp_tunnel_set_ifidx(struct gtp_tunnel *t, uint32_t ifidx) { t->ifidx = ifidx; + t->flags |= GTP_TUN_IFIDX; } EXPORT_SYMBOL(gtp_tunnel_set_ifidx); void gtp_tunnel_set_family(struct gtp_tunnel *t, uint16_t family) { t->ms_addr.family = family; + t->flags |= GTP_TUN_FAMILY; } EXPORT_SYMBOL(gtp_tunnel_set_family); @@ -68,6 +71,7 @@ { t->ms_addr.family = AF_INET; t->ms_addr.ip4 = *ms_addr; + t->flags |= GTP_TUN_FAMILY | GTP_TUN_MS_ADDR; } EXPORT_SYMBOL(gtp_tunnel_set_ms_ip4); @@ -75,6 +79,7 @@ { t->sgsn_addr.family = AF_INET; t->sgsn_addr.ip4 = *sgsn_addr; + t->flags |= GTP_TUN_SGSN_ADDR; } EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip4); @@ -82,6 +87,7 @@ { t->ms_addr.family = AF_INET6; t->ms_addr.ip6 = *ms_addr; + t->flags |= GTP_TUN_FAMILY | GTP_TUN_MS_ADDR; } EXPORT_SYMBOL(gtp_tunnel_set_ms_ip6); @@ -89,36 +95,42 @@ { t->sgsn_addr.family = AF_INET6; t->sgsn_addr.ip6 = *sgsn_addr; + t->flags |= GTP_TUN_SGSN_ADDR; } EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip6); void gtp_tunnel_set_version(struct gtp_tunnel *t, uint32_t version) { t->gtp_version = version; + t->flags |= GTP_TUN_VERSION; } EXPORT_SYMBOL(gtp_tunnel_set_version); void gtp_tunnel_set_tid(struct gtp_tunnel *t, uint64_t tid) { t->u.v0.tid = tid; + t->flags |= GTP_TUN_V0_TID; } EXPORT_SYMBOL(gtp_tunnel_set_tid); void gtp_tunnel_set_flowid(struct gtp_tunnel *t, uint16_t flowid) { t->u.v0.flowid = flowid; + t->flags |= GTP_TUN_V0_FLOWID; } EXPORT_SYMBOL(gtp_tunnel_set_flowid); void gtp_tunnel_set_i_tei(struct gtp_tunnel *t, uint32_t i_tei) { t->u.v1.i_tei = i_tei; + t->flags |= GTP_TUN_V1_I_TEI; } EXPORT_SYMBOL(gtp_tunnel_set_i_tei); void gtp_tunnel_set_o_tei(struct gtp_tunnel *t, uint32_t o_tei) { t->u.v1.o_tei = o_tei; + t->flags |= GTP_TUN_V1_O_TEI; } EXPORT_SYMBOL(gtp_tunnel_set_o_tei); diff --git a/src/internal.h b/src/internal.h index ce8a683..1433621 100644 --- a/src/internal.h +++ b/src/internal.h @@ -20,6 +20,19 @@ }; }; +enum { + GTP_TUN_IFNS = (1 << 0), + GTP_TUN_IFIDX = (1 << 1), + GTP_TUN_FAMILY = (1 << 2), + GTP_TUN_MS_ADDR = (1 << 3), + GTP_TUN_SGSN_ADDR = (1 << 4), + GTP_TUN_VERSION = (1 << 5), + GTP_TUN_V0_TID = (1 << 6), + GTP_TUN_V0_FLOWID = (1 << 7), + GTP_TUN_V1_I_TEI = (1 << 8), + GTP_TUN_V1_O_TEI = (1 << 9), +}; + struct gtp_tunnel { int ifns; uint32_t ifidx; @@ -36,6 +49,7 @@ uint32_t o_tei; } v1; } u; + uint32_t flags; }; #endif diff --git a/tools/gtp-tunnel.c b/tools/gtp-tunnel.c index 1b8a7a0..8c8f95f 100644 --- a/tools/gtp-tunnel.c +++ b/tools/gtp-tunnel.c @@ -109,9 +109,10 @@ optidx++; - if (gtp_version == GTP_V0) + if (gtp_version == GTP_V0) { gtp_tunnel_set_tid(t, atoi(argv[optidx++])); - else if (gtp_version == GTP_V1) { + gtp_tunnel_set_flowid(t, 0); + } else if (gtp_version == GTP_V1) { gtp_tunnel_set_i_tei(t, atoi(argv[optidx++])); gtp_tunnel_set_o_tei(t, atoi(argv[optidx++])); } -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I66677ab2d4de2c459ed9987c465fce6f059d6d93 Gerrit-Change-Number: 35988 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: epdg: Configure gtpu tunnel
by pespin 15 Feb '24

15 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35646?usp=email ) Change subject: epdg: Configure gtpu tunnel ...................................................................... epdg: Configure gtpu tunnel Related: OS#6235 Change-Id: Ifeece08cdcceb378ae1e195cada5bfef54a1e2bd --- M ttcn3-epdg-test/osmo-epdg.config 1 file changed, 31 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config index ac17e43..6c65172 100644 --- a/ttcn3-epdg-test/osmo-epdg.config +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -39,7 +39,27 @@ {gtpc_remote_port, 2123} ] }, - % %% =========================================== + %% =========================================== + %% gtp_u_kmod config + %% =========================================== + {gtp_u_kmod, [ + {sockets, [{grx, [%% ip: IP Address assigned at the tunnel: + {ip, {172,18,10,20}}, + %% Allow binding to an IP address that is nonlocal or does not (yet) exist (IP_FREEBIND): + freebind, + % Create gtp tundev with role SGSN: + {role, sgsn} + ] + }] + } + ]}, + %% =========================================== + %% gen_socket config + %% =========================================== + {gen_socket, [ + {libdir, "/tmp/osmo-epdg/_build/default/lib/gen_socket/priv/lib"} +]}, + %% =========================================== %% Lager logging config %% =========================================== {lager, [ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35646?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: Ifeece08cdcceb378ae1e195cada5bfef54a1e2bd Gerrit-Change-Number: 35646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: epdg: Configure gtpu tunnel
by pespin 15 Feb '24

15 Feb '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35646?usp=email ) Change subject: epdg: Configure gtpu tunnel ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35646?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: Ifeece08cdcceb378ae1e195cada5bfef54a1e2bd Gerrit-Change-Number: 35646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 13:52:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: epdg: Configure gtpu tunnel
by pespin 15 Feb '24

15 Feb '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35646?usp=email ) Change subject: epdg: Configure gtpu tunnel ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: Merging since this should fix ttcn3 tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35646?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: Ifeece08cdcceb378ae1e195cada5bfef54a1e2bd Gerrit-Change-Number: 35646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 15 Feb 2024 13:51:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Send correct APN in GSUP CEAI Tunnel Response
by pespin 15 Feb '24

15 Feb '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35976?usp=email ) Change subject: Send correct APN in GSUP CEAI Tunnel Response ...................................................................... Send correct APN in GSUP CEAI Tunnel Response Change-Id: Ifbd78720436690e9ee40688e455ab61d65085738 --- M src/epdg_gtpc_s2b.erl M src/gsup_server.erl 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 9b6d9ed..309ed79 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -386,6 +386,7 @@ lager:info("s2b: Updated Session after create_session_response: ~p~n", [Sess2]), State1 = update_gtp_session(Sess0, Sess2, State0), ResInfo = #{ + apn => binary_to_list(Sess0#gtp_session.apn), eua => conv:gtp2_paa_to_epdg_eua(Paa), local_teid => Bearer#gtp_bearer.local_data_tei, remote_teid => RemoteTEID, diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 6930673..6bb98ee 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -156,10 +156,10 @@ lager:info("tunnel_response for ~p: ~p~n", [Imsi, Result]), Socket = State#gsups_state.socket, case Result of - {ok, #{eua := Eua}} -> + {ok, #{apn := Apn, eua := Eua}} -> PdpInfo = #{pdp_context_id => 0, pdp_address => conv:epdg_eua_to_gsup_pdp_address(Eua), - access_point_name => "foobar.apn", + access_point_name => Apn, quality_of_service => <<0, 0, 0>>, pdp_charging => 0}, Resp = #{message_type => epdg_tunnel_result, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35976?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: Ifbd78720436690e9ee40688e455ab61d65085738 Gerrit-Change-Number: 35976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: Send correct APN in GSUP CEAI Tunnel Response
by pespin 15 Feb '24

15 Feb '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35976?usp=email ) Change subject: Send correct APN in GSUP CEAI Tunnel Response ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35976?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: Ifbd78720436690e9ee40688e455ab61d65085738 Gerrit-Change-Number: 35976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 13:50:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-sccp[master]: VTY: rename 'sctp-role' to 'transport-role', add an alias
by pespin 15 Feb '24

15 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35978?usp=email ) Change subject: VTY: rename 'sctp-role' to 'transport-role', add an alias ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iab6c898181d79a5ed2bea767ee90e55bc3af16a5 Gerrit-Change-Number: 35978 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, 15 Feb 2024 13:49:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log