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

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

by pespin

Attention is currently required from: laforge, osmith. pespin 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: Code-Review+1 -- 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:27:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes 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 pespin

Attention is currently required from: osmith. pespin 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 1: (4 comments) File gtp/gsn.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/36031/comment/7495bdfd_f911e5dd PS1, Line 424: int domain = in46a_to_af(listen); can we call it family at some point? I had to fiugre out what "domain" meant here. https://gerrit.osmocom.org/c/osmo-ggsn/+/36031/comment/a6599b05_2820182d PS1, Line 446: addr.sin_len = sizeof(struct addr); wrong indentation. https://gerrit.osmocom.org/c/osmo-ggsn/+/36031/comment/1c74bf8f_636c7218 PS1, Line 461: if (bind(*fd, &addr, sizeof(addr)) < 0) the bind can be deduplicated by moving it below. File tests/gtp/Makefile.am: https://gerrit.osmocom.org/c/osmo-ggsn/+/36031/comment/e412d4a9_ada84f2a PS1, Line 25: $(top_builddir)/lib/libmisc.a \ why is this libmisc needed here now? -- 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-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:24:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved osmith: Verified 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

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

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36029?usp=email ) Change subject: Fix a typo ...................................................................... Patch Set 1: Verified+1 -- 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 21 Feb 2024 12:16:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

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

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36030?usp=email ) Change subject: gtp_new: deduplicate create_and_bind_socket code ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: this should be moved to osmocom socket at some point anyway, but it's not urgent and this is a first good stage which I guess you need as a preparation for other patches. -- 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:15:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6

by osmith

Attention is currently required from: laforge. osmith 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: (1 comment) This change is ready for review. Patchset: PS1: > See the commit message description: […] As discussed, created issue https://osmocom.org/issues/6106 for this. -- 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:15:50 +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

[S] Change in libgtpnl[master]: tests/qemu: pass MS_PROTO to gtp-tunnel delete

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/36032?usp=email ) Change subject: tests/qemu: pass MS_PROTO to gtp-tunnel delete ...................................................................... tests/qemu: pass MS_PROTO to gtp-tunnel delete The MS protocol needs to be passed to gtp-tunnel delete, instead of the SGSN_GGSN_PROTO. Fix for: + gtp-tunnel add gtp_sgsn v1 200 100 172.99.0.1 fd00::2 … + gtp-tunnel delete gtp_sgsn v1 200 ip6 genl_socket_talk: No such file or directory Change-Id: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400 --- M tests/qemu/00_test_functions.sh M tests/qemu/01_ms_ip4_sgsn_ip4.sh M tests/qemu/02_ms_ip4_sgsn_ip6.sh M tests/qemu/03_ms_ip6_sgsn_ip4.sh M tests/qemu/04_ms_ip6_sgsn_ip6.sh 5 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/32/36032/1 diff --git a/tests/qemu/00_test_functions.sh b/tests/qemu/00_test_functions.sh index c4813ab..5839363 100644 --- a/tests/qemu/00_test_functions.sh +++ b/tests/qemu/00_test_functions.sh @@ -8,6 +8,7 @@ # MS - SGSN -gtp- GGSN - WEBSERVER tunnel_start() { + test -n "$MS_PROTO" test -n "$MS" test -n "$MS_PREFLEN" test -n "$SGSN_GGSN_PROTO" @@ -67,9 +68,9 @@ ip link del veth_sgsn ip route del "$WEBSERVER"/"$MS_PREFLEN" dev gtp_sgsn - gtp-tunnel delete gtp_sgsn v1 200 "$SGSN_GGSN_PROTO" + gtp-tunnel delete gtp_sgsn v1 200 "$MS_PROTO" gtp-link del gtp_sgsn - ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$SGSN_GGSN_PROTO" + ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$MS_PROTO" ggsn_side gtp-link del gtp_ggsn ip netns del ggsn_side } diff --git a/tests/qemu/01_ms_ip4_sgsn_ip4.sh b/tests/qemu/01_ms_ip4_sgsn_ip4.sh index 42e2842..4789483 100644 --- a/tests/qemu/01_ms_ip4_sgsn_ip4.sh +++ b/tests/qemu/01_ms_ip4_sgsn_ip4.sh @@ -1,6 +1,7 @@ #!/bin/sh -ex . /tests/00_test_functions.sh +MS_PROTO="ip" MS="172.99.0.1" MS_PREFLEN="32" SGSN_GGSN_PROTO="ip" diff --git a/tests/qemu/02_ms_ip4_sgsn_ip6.sh b/tests/qemu/02_ms_ip4_sgsn_ip6.sh index b5858ab..2a489cd 100644 --- a/tests/qemu/02_ms_ip4_sgsn_ip6.sh +++ b/tests/qemu/02_ms_ip4_sgsn_ip6.sh @@ -1,6 +1,7 @@ #!/bin/sh -ex . /tests/00_test_functions.sh +MS_PROTO="ip" MS="172.99.0.1" MS_PREFLEN="32" SGSN_GGSN_PROTO="ip6" diff --git a/tests/qemu/03_ms_ip6_sgsn_ip4.sh b/tests/qemu/03_ms_ip6_sgsn_ip4.sh index 12793b0..f873faf 100644 --- a/tests/qemu/03_ms_ip6_sgsn_ip4.sh +++ b/tests/qemu/03_ms_ip6_sgsn_ip4.sh @@ -1,6 +1,7 @@ #!/bin/sh -ex . /tests/00_test_functions.sh +MS_PROTO="ip6" MS="fd00::" MS_PREFLEN="64" SGSN_GGSN_PROTO="ip" diff --git a/tests/qemu/04_ms_ip6_sgsn_ip6.sh b/tests/qemu/04_ms_ip6_sgsn_ip6.sh index 6c2f13f..483a9d7 100644 --- a/tests/qemu/04_ms_ip6_sgsn_ip6.sh +++ b/tests/qemu/04_ms_ip6_sgsn_ip6.sh @@ -1,6 +1,7 @@ #!/bin/sh -ex . /tests/00_test_functions.sh +MS_PROTO="ip6" MS="fc00::" MS_PREFLEN="64" SGSN_GGSN_PROTO="ip6" -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36032?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: Ib6b011520fe41855b87ed0e2f6f8a6af3d0b2400 Gerrit-Change-Number: 36032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in libgtpnl[master]: tests/qemu: add 05_ms_ip46_sgsn_ip4.sh

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/36034?usp=email ) Change subject: tests/qemu: add 05_ms_ip46_sgsn_ip4.sh ...................................................................... tests/qemu: add 05_ms_ip46_sgsn_ip4.sh Change-Id: I1e306bc4534f14138249cd4034f54f77d940b261 --- M tests/qemu/00_test_functions.sh A tests/qemu/05_ms_ip46_sgsn_ip4.sh M tests/qemu/initrd-init.sh 3 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/34/36034/1 diff --git a/tests/qemu/00_test_functions.sh b/tests/qemu/00_test_functions.sh index 5839363..4660d8f 100644 --- a/tests/qemu/00_test_functions.sh +++ b/tests/qemu/00_test_functions.sh @@ -50,16 +50,52 @@ ggsn_side gtp-tunnel list } +# Add a second tunnel to test MS with IPv4v6 +tunnel_start_2() { + test -n "$MS2_PROTO" + test -n "$MS2" + test -n "$MS2_PREFLEN" + test -n "$WEBSERVER2" + + # SGSN side: add second IP to lo (MS) + ip addr add "$MS2"/"$MS2_PREFLEN" dev lo + + # SGSN side: prepare second gtp-tunnel + gtp-tunnel add gtp_sgsn v1 200 100 "$MS2" "$GGSN" + ip route add "$WEBSERVER2"/"$MS2_PREFLEN" dev gtp_sgsn + + # GGSN side: prepare add second IP to lo (WEBSERVER) + ggsn_side ip addr add "$WEBSERVER2"/"$MS2_PREFLEN" dev lo + + # GGSN side: prepare second gtp-tunnel + ggsn_side gtp-tunnel add gtp_ggsn v1 100 200 "$MS2" "$SGSN" + ggsn_side ip route add "$MS2"/"$MS2_PREFLEN" dev gtp_ggsn + + # List tunnels from both sides + gtp-tunnel list + ggsn_side gtp-tunnel list +} + tunnel_ping() { ip addr show ping -c 1 "$WEBSERVER" ggsn_side ping -c 1 "$MS" + + if [ -n "$MS2" ]; then + ping -c 1 "$WEBSERVER2" + ggsn_side ping -c 1 "$MS2" + fi } tunnel_stop() { killall gtp-link ip addr del "$MS"/"$MS_PREFLEN" dev lo + + if [ -n "$MS2" ]; then + ip addr del "$MS2"/"$MS2_PREFLEN" dev lo + fi + ip link set veth_sgsn down if [ "$SGSN_GGSN_PROTO" == "ip" ]; then # FIXME: doesn't work with ip6 @@ -69,8 +105,19 @@ ip link del veth_sgsn ip route del "$WEBSERVER"/"$MS_PREFLEN" dev gtp_sgsn gtp-tunnel delete gtp_sgsn v1 200 "$MS_PROTO" + + if [ -n "$MS2" ]; then + ip route del "$WEBSERVER2"/"$MS2_PREFLEN" dev gtp_sgsn + gtp-tunnel delete gtp_sgsn v1 200 "$MS2_PROTO" + fi + gtp-link del gtp_sgsn ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$MS_PROTO" + + if [ -n "$MS2" ]; then + ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$MS2_PROTO" + fi + ggsn_side gtp-link del gtp_ggsn ip netns del ggsn_side } diff --git a/tests/qemu/05_ms_ip46_sgsn_ip4.sh b/tests/qemu/05_ms_ip46_sgsn_ip4.sh new file mode 100644 index 0000000..a0f9220 --- /dev/null +++ b/tests/qemu/05_ms_ip46_sgsn_ip4.sh @@ -0,0 +1,23 @@ +#!/bin/sh -ex +. /tests/00_test_functions.sh + +MS_PROTO="ip" +MS="172.99.0.1" +MS_PREFLEN="32" +SGSN_GGSN_PROTO="ip" +SGSN="172.0.0.1" +SGSN_PREFLEN="24" +GGSN="172.0.0.2" +WEBSERVER="172.99.0.2" + +tunnel_start + +MS2_PROTO="ip6" +MS2_PROTO="ip6" +MS2="fd00::" +MS2_PREFLEN="64" +WEBSERVER2="fe00::2" + +tunnel_start_2 +tunnel_ping +tunnel_stop diff --git a/tests/qemu/initrd-init.sh b/tests/qemu/initrd-init.sh index ba20592..5dacb86 100755 --- a/tests/qemu/initrd-init.sh +++ b/tests/qemu/initrd-init.sh @@ -29,6 +29,7 @@ run_test 02_ms_ip4_sgsn_ip6.sh run_test 03_ms_ip6_sgsn_ip4.sh run_test 04_ms_ip6_sgsn_ip6.sh +run_test 05_ms_ip46_sgsn_ip4.sh # Success (run-qemu.sh checks for this line) echo "QEMU_TEST_SUCCESSFUL" -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36034?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: I1e306bc4534f14138249cd4034f54f77d940b261 Gerrit-Change-Number: 36034 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in libgtpnl[master]: tools/gtp-tunnel: pass rc of gtp_del_tunnel

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/36033?usp=email ) Change subject: tools/gtp-tunnel: pass rc of gtp_del_tunnel ...................................................................... tools/gtp-tunnel: pass rc of gtp_del_tunnel Don't exit with 0 if gtp_del_tunnel fails. Change-Id: I8046a57a5831e6bdee2ac37415380ce391c79c22 --- M tools/gtp-tunnel.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/33/36033/1 diff --git a/tools/gtp-tunnel.c b/tools/gtp-tunnel.c index e8db171..2a5540a 100644 --- a/tools/gtp-tunnel.c +++ b/tools/gtp-tunnel.c @@ -131,6 +131,7 @@ { struct gtp_tunnel *t; uint32_t gtp_ifidx; + int ret; if (argc != 6) { printf("%s del <gtp device> <version> <tid|i_tei> <family>\n", @@ -171,10 +172,10 @@ return EXIT_FAILURE; } - gtp_del_tunnel(genl_id, nl, t); + ret = gtp_del_tunnel(genl_id, nl, t); gtp_tunnel_free(t); - return 0; + return ret; } struct gtp_pdp { -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36033?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: I8046a57a5831e6bdee2ac37415380ce391c79c22 Gerrit-Change-Number: 36033 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 pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36029?usp=email ) Change subject: Fix a typo ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Feb 2024 12:14:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024