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

[S] Change in osmo-ttcn3-hacks[master]: epdg: Validate assigned PDP Address and APN

by osmith

Attention is currently required from: lynxis lazus, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35977?usp=email ) Change subject: epdg: Validate assigned PDP Address and APN ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File epdg/EPDG_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35977/comment/e7024def_6794… PS1, Line 608: tr_GSUP_IE_PDP_ADDRESS(tr_GSUP_PDP_Address_IPv4(f_inet_addr(g_pars.ue_ip))), I guess IPv6 is not relevant here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35977?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I440a7379c6dab5448d4c57c498ad9d086d0c456b Gerrit-Change-Number: 35977 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 15 Feb 2024 14:44:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libgtpnl[master]: gtp-link: set IPv6 socket only

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libgtpnl/+/35986?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: 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, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/86/35986/2 -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[L] Change in libgtpnl[master]: Add QEMU tests

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libgtpnl/+/35991?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: Add QEMU tests ...................................................................... Add QEMU tests Add tests to ensure libgtpnl + kernel driver work as expected. Right now a kernel needs to be built from source, using Pablo's tree: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/ Make sure to enable: CONFIG_GTP=y CONFIG_NET_NS=y CONFIG_VETH=y $ cp bzImage tests/qemu/_linux $ ./configure --enable-qemu-tests $ make $ make check Once patches are upstreamed, it will be possible to use a pre-built kernel from jenkins with: make -C tests qemu-download-kernel Related: OS#1952 Change-Id: Ibf75514b866fffb11e90529e4705f126b23d7415 --- M .gitignore M Makefile.am M configure.ac A tests/Makefile.am A tests/qemu/00_test_functions.sh A tests/qemu/01_ms_ip4_sgsn_ip4.sh A tests/qemu/02_ms_ip4_sgsn_ip6.sh A tests/qemu/03_ms_ip6_sgsn_ip4.sh A tests/qemu/04_ms_ip6_sgsn_ip6.sh A tests/qemu/check-depends.sh A tests/qemu/initrd-build.sh A tests/qemu/initrd-init.sh A tests/qemu/run-qemu.sh 13 files changed, 411 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/91/35991/2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35991?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: Ibf75514b866fffb11e90529e4705f126b23d7415 Gerrit-Change-Number: 35991 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test/fragment.config: add NET_NS, VETH

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35992?usp=email ) Change subject: ttcn3-ggsn-test/fragment.config: add NET_NS, VETH ...................................................................... ttcn3-ggsn-test/fragment.config: add NET_NS, VETH Build the kernel with NET_NS and VETH, so libgtpnl's qemu tests can download the kernel and use it. Related: OS#1952 Related: libgtpnl Ibf75514b866fffb11e90529e4705f126b23d7415 Change-Id: I6e893b64718f853b8595de36c090a1326db34419 --- M ttcn3-ggsn-test/fragment.config 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/35992/1 diff --git a/ttcn3-ggsn-test/fragment.config b/ttcn3-ggsn-test/fragment.config index 8a72dc2..b5a07b5 100644 --- a/ttcn3-ggsn-test/fragment.config +++ b/ttcn3-ggsn-test/fragment.config @@ -266,3 +266,8 @@ CONFIG_X86_HV_CALLBACK_VECTOR=y # CONFIG_X86_X2APIC is not set # CONFIG_XEN is not set + +# For libgtpnl's qemu tests +CONFIG_NAMESPACES=y +CONFIG_NET_NS=y +CONFIG_VETH=y -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35992?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: I6e893b64718f853b8595de36c090a1326db34419 Gerrit-Change-Number: 35992 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]: gtp-tunnel: display i_tei in help

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35990?usp=email ) Change subject: gtp-tunnel: display i_tei in help ...................................................................... gtp-tunnel: display i_tei in help display <tid|i_tei> in help message that is printed. Change-Id: I0aa78e654f23a2b6588ac8e1e5508e798caad1a7 --- M tools/gtp-tunnel.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/90/35990/1 diff --git a/tools/gtp-tunnel.c b/tools/gtp-tunnel.c index 8c8f95f..e8db171 100644 --- a/tools/gtp-tunnel.c +++ b/tools/gtp-tunnel.c @@ -133,7 +133,7 @@ uint32_t gtp_ifidx; if (argc != 6) { - printf("%s del <gtp device> <version> <tid> <family>\n", + printf("%s del <gtp device> <version> <tid|i_tei> <family>\n", argv[0]); return EXIT_FAILURE; } -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35990?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: I0aa78e654f23a2b6588ac8e1e5508e798caad1a7 Gerrit-Change-Number: 35990 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]: gtp-genl: display gtp device in listing

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35989?usp=email ) Change subject: gtp-genl: display gtp device in listing ...................................................................... gtp-genl: display gtp device in listing Display the device that the tunnel belongs to, users need this information to delete tunnels. Change-Id: I888723a8318c04772f7d22a042e69fa6e9ef2239 --- M src/gtp-genl.c 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/89/35989/1 diff --git a/src/gtp-genl.c b/src/gtp-genl.c index 3b7c3ef..33a78d8 100644 --- a/src/gtp-genl.c +++ b/src/gtp-genl.c @@ -141,6 +141,7 @@ EXPORT_SYMBOL(gtp_del_tunnel); struct gtp_pdp { + uint32_t ifidx; uint32_t version; union { struct { @@ -181,6 +182,7 @@ case GTPA_PEER_ADDRESS: case GTPA_MS_ADDRESS: case GTPA_VERSION: + case GTPA_LINK: if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) { perror("mnl_attr_validate"); return MNL_CB_ERROR; @@ -210,6 +212,8 @@ mnl_attr_parse(nlh, sizeof(*genl), genl_gtp_validate_cb, tb); + if (tb[GTPA_LINK]) + pdp.ifidx = mnl_attr_get_u32(tb[GTPA_LINK]); if (tb[GTPA_TID]) pdp.u.v0.tid = mnl_attr_get_u64(tb[GTPA_TID]); if (tb[GTPA_I_TEI]) @@ -245,6 +249,8 @@ return MNL_CB_ERROR; } + printf("%s ", if_indextoname(pdp.ifidx, buf)); + if (tb[GTPA_VERSION]) pdp.version = mnl_attr_get_u32(tb[GTPA_VERSION]); -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35989?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: I888723a8318c04772f7d22a042e69fa6e9ef2239 Gerrit-Change-Number: 35989 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[L] Change in libgtpnl[master]: Add QEMU tests

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/35991?usp=email ) Change subject: Add QEMU tests ...................................................................... Add QEMU tests Add tests to ensure libgtpnl + kernel driver work as expected. Right now a kernel needs to be built from source, using Pablo's tree: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/ Make sure to enable: CONFIG_GTP=y CONFIG_NET_NS=y CONFIG_VETH=y $ cp bzImage tests/qemu/_linux $ ./configure --enable-qemu-tests $ make $ make check Once patches are upstreamed, it will be possible to use a pre-built kernel from jenkins with: make -C tests qemu-download-kernel Related: OS#1952 Change-Id: Ibf75514b866fffb11e90529e4705f126b23d7415 --- M .gitignore M Makefile.am M configure.ac A tests/Makefile.am A tests/qemu/00_test_functions.sh A tests/qemu/01_ms_ip4_sgsn_ip4.sh A tests/qemu/02_ms_ip4_sgsn_ip6.sh A tests/qemu/03_ms_ip6_sgsn_ip4.sh A tests/qemu/04_ms_ip6_sgsn_ip6.sh A tests/qemu/check-depends.sh A tests/qemu/initrd-build.sh A tests/qemu/initrd-init.sh A tests/qemu/run-qemu.sh 13 files changed, 411 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/91/35991/1 diff --git a/.gitignore b/.gitignore index bf5732d..56eefa6 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ tools/gtp-link tools/gtp-tunnel + +tests/qemu/_* diff --git a/Makefile.am b/Makefile.am index c34b6db..c6b9682 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,12 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include tools +SUBDIRS = \ + include \ + src \ + tests \ + tools \ + $(NULL) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtpnl.pc diff --git a/configure.ac b/configure.ac index 2665b70..b846c8c 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,19 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +AC_ARG_ENABLE(qemu_tests, + [AS_HELP_STRING( + [--enable-qemu-tests], + [Run automated tests in QEMU] + )], + [qemu_tests=$enableval], [qemu_tests="no"]) +AC_MSG_CHECKING([whether to enable QEMU tests]) +AC_MSG_RESULT([$qemu_tests]) +AM_CONDITIONAL(ENABLE_QEMU_TESTS, test x"$qemu_tests" = x"yes") +if test x"$qemu_tests" = x"yes" && ! $srcdir/tests/qemu/check-depends.sh; then + AC_MSG_ERROR([missing programs for --enable-qemu-tests]) +fi + AC_SUBST([CPPFLAGS]) AC_SUBST([CFLAGS]) AC_CONFIG_FILES([ @@ -82,6 +95,7 @@ include/linux/Makefile libgtpnl.pc src/Makefile + tests/Makefile tools/Makefile ]) AC_OUTPUT() diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..54af52d --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,15 @@ +check-local: + $(MAKE) qemu-tests + +if ENABLE_QEMU_TESTS +qemu-download-kernel: + rm -f qemu/_linux + wget -O qemu/_linux \ + https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-test-kernel-latest-net-n… +qemu-tests: + qemu/initrd-build.sh + qemu/run-qemu.sh +else +qemu-tests: + @echo "Not running QEMU tests (determined at configure-time)" +endif diff --git a/tests/qemu/00_test_functions.sh b/tests/qemu/00_test_functions.sh new file mode 100644 index 0000000..c4813ab --- /dev/null +++ b/tests/qemu/00_test_functions.sh @@ -0,0 +1,75 @@ +#!/bin/sh -ex + +# Use ip from iproute2 instead of busybox ip, because iproute2's version has +# "ip netns" implemented. Calling /bin/ip explicitly is needed here, otherwise +# busybox sh will use busybox ip, regardless of PATH. +alias ip="/bin/ip" +alias ggsn_side="ip netns exec ggsn_side" + +# MS - SGSN -gtp- GGSN - WEBSERVER +tunnel_start() { + test -n "$MS" + test -n "$MS_PREFLEN" + test -n "$SGSN_GGSN_PROTO" + test -n "$SGSN" + test -n "$SGSN_PREFLEN" + test -n "$GGSN" + test -n "$WEBSERVER" + + ip netns add ggsn_side + + # SGSN side: prepare veth_sgsn (SGSN), lo (MS) + ip link add veth_sgsn type veth peer name veth_ggsn + ip addr add "$SGSN"/"$SGSN_PREFLEN" dev veth_sgsn + ip link set veth_sgsn up + ip addr add "$MS"/"$MS_PREFLEN" dev lo + ip link set lo up + + # SGSN side: prepare gtp-tunnel + gtp-link add gtp_sgsn "$SGSN_GGSN_PROTO" --sgsn & + sleep 1 + gtp-tunnel add gtp_sgsn v1 200 100 "$MS" "$GGSN" + ip route add "$WEBSERVER"/"$MS_PREFLEN" dev gtp_sgsn + + # GGSN side: prepare veth_ggsn (GGSN), lo (WEBSERVER) + ip link set veth_ggsn netns ggsn_side + ggsn_side ip addr add "$GGSN"/"$SGSN_PREFLEN" dev veth_ggsn + ggsn_side ip link set veth_ggsn up + ggsn_side ip addr add "$WEBSERVER"/"$MS_PREFLEN" dev lo + ggsn_side ip link set lo up + + # GGSN side: prepare gtp-tunnel + ggsn_side gtp-link add gtp_ggsn "$SGSN_GGSN_PROTO" & + sleep 1 + ggsn_side gtp-tunnel add gtp_ggsn v1 100 200 "$MS" "$SGSN" + ggsn_side ip route add "$MS"/"$MS_PREFLEN" dev gtp_ggsn + + # List tunnel 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" +} + +tunnel_stop() { + killall gtp-link + + ip addr del "$MS"/"$MS_PREFLEN" dev lo + ip link set veth_sgsn down + + if [ "$SGSN_GGSN_PROTO" == "ip" ]; then # FIXME: doesn't work with ip6 + ip addr del "$SGSN"/"$SGSN_PREFLEN" dev veth_sgsn + fi + + 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-link del gtp_sgsn + ggsn_side gtp-tunnel delete gtp_ggsn v1 100 "$SGSN_GGSN_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 new file mode 100644 index 0000000..42e2842 --- /dev/null +++ b/tests/qemu/01_ms_ip4_sgsn_ip4.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex +. /tests/00_test_functions.sh + +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 +tunnel_ping +tunnel_stop diff --git a/tests/qemu/02_ms_ip4_sgsn_ip6.sh b/tests/qemu/02_ms_ip4_sgsn_ip6.sh new file mode 100644 index 0000000..b5858ab --- /dev/null +++ b/tests/qemu/02_ms_ip4_sgsn_ip6.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex +. /tests/00_test_functions.sh + +MS="172.99.0.1" +MS_PREFLEN="32" +SGSN_GGSN_PROTO="ip6" +SGSN="fd00::1" +SGSN_PREFLEN="7" +GGSN="fd00::2" +WEBSERVER="172.99.0.2" + +tunnel_start +tunnel_ping +tunnel_stop diff --git a/tests/qemu/03_ms_ip6_sgsn_ip4.sh b/tests/qemu/03_ms_ip6_sgsn_ip4.sh new file mode 100644 index 0000000..12793b0 --- /dev/null +++ b/tests/qemu/03_ms_ip6_sgsn_ip4.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex +. /tests/00_test_functions.sh + +MS="fd00::" +MS_PREFLEN="64" +SGSN_GGSN_PROTO="ip" +SGSN="172.0.0.1" +SGSN_PREFLEN="24" +GGSN="172.0.0.2" +WEBSERVER="fe00::2" + +tunnel_start +tunnel_ping +tunnel_stop diff --git a/tests/qemu/04_ms_ip6_sgsn_ip6.sh b/tests/qemu/04_ms_ip6_sgsn_ip6.sh new file mode 100644 index 0000000..6c2f13f --- /dev/null +++ b/tests/qemu/04_ms_ip6_sgsn_ip6.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex +. /tests/00_test_functions.sh + +MS="fc00::" +MS_PREFLEN="64" +SGSN_GGSN_PROTO="ip6" +SGSN="fd00::1" +SGSN_PREFLEN="7" +GGSN="fd00::2" +WEBSERVER="fe00::2" + +tunnel_start +tunnel_ping +tunnel_stop diff --git a/tests/qemu/check-depends.sh b/tests/qemu/check-depends.sh new file mode 100755 index 0000000..15a7600 --- /dev/null +++ b/tests/qemu/check-depends.sh @@ -0,0 +1,18 @@ +#!/bin/sh +RET=0 + +require_program() { + if [ -z "$(command -v "$1")" ]; then + RET=1 + echo "ERROR: missing program: $1" + fi +} + +require_program busybox +require_program cpio +require_program find +require_program gzip +require_program ip +require_program qemu-system-x86_64 + +exit "$RET" diff --git a/tests/qemu/initrd-build.sh b/tests/qemu/initrd-build.sh new file mode 100755 index 0000000..34d3bc5 --- /dev/null +++ b/tests/qemu/initrd-build.sh @@ -0,0 +1,110 @@ +#!/bin/sh -e +DIR="$(cd "$(dirname "$0")" && pwd)" +DIR_INITRD="$DIR/_initrd" +SRC_LIBS="$(realpath "$DIR/../../src/.libs/")" +TOOLS_LIBS="$(realpath "$DIR/../../tools/.libs/")" + +# Add one or more files to the initramfs, with parent directories. +# usr-merge: resolve symlinks for /lib -> /usr/lib etc. so "cp --parents" does +# not fail with "cp: cannot make directory '/tmp/initrd/lib': File exists" +# $@: path to files +initrd_add_file() { + local i + + for i in "$@"; do + case "$i" in + /bin/*|/sbin/*|/lib/*|/lib64/*) + cp -a --parents "$i" "$DIR_INITRD"/usr + ;; + *) + cp -a --parents "$i" "$DIR_INITRD" + ;; + esac + done +} + +# Add binaries with depending libraries +# $@: paths to binaries +initrd_add_bin() { + local bin + local bin_path + local file + + for bin in "$@"; do + local bin_path="$(which "$bin")" + if [ -z "$bin_path" ]; then + echo "ERROR: file not found: $bin" + exit 1 + fi + + lddtree_out="$(lddtree -l "$bin_path")" + if [ -z "$lddtree_out" ]; then + echo "ERROR: lddtree failed on '$bin_path'" + exit 1 + fi + + for file in $lddtree_out; do + initrd_add_file "$file" + + # Copy resolved symlink + if [ -L "$file" ]; then + initrd_add_file "$(realpath "$file")" + fi + done + done +} + +# Add command to run inside the initramfs +# $@: commands +initrd_add_cmd() { + local i + + if ! [ -e "$DIR_INITRD"/cmd.sh ]; then + echo "#!/bin/sh -ex" > "$DIR_INITRD"/cmd.sh + chmod +x "$DIR_INITRD"/cmd.sh + fi + + for i in "$@"; do + echo "$i" >> "$DIR_INITRD"/cmd.sh + done +} + +rm -rf "$DIR_INITRD" +mkdir -p "$DIR_INITRD" +cd "$DIR_INITRD" + +for dir in bin sbin lib lib64; do + ln -s usr/"$dir" "$dir" +done + +mkdir -p \ + dev/net \ + proc \ + run \ + sys \ + tmp \ + usr/bin \ + usr/sbin + +initrd_add_bin \ + busybox \ + ip + +initrd_add_cmd \ + "export LD_LIBRARY_PATH=$SRC_LIBS:$LD_LIBRARY_PATH" + +export LD_LIBRARY_PATH="$SRC_LIBS:$LD_LIBRARY_PATH" + +for i in gtp-link gtp-tunnel; do + initrd_add_bin "$TOOLS_LIBS"/"$i" + ln -s "$TOOLS_LIBS"/"$i" usr/bin/"$i" +done + +mkdir tests +cp "$DIR"/*.sh tests + +cp "$DIR"/initrd-init.sh init + +find . -print0 \ + | cpio --quiet -o -0 -H newc \ + | gzip -1 > "$DIR"/_initrd.gz diff --git a/tests/qemu/initrd-init.sh b/tests/qemu/initrd-init.sh new file mode 100755 index 0000000..9e7ac8e --- /dev/null +++ b/tests/qemu/initrd-init.sh @@ -0,0 +1,36 @@ +#!/bin/busybox sh +echo "Running initrd-init.sh" +set -x + +run_test() { + echo + echo "QEMU test: $1" + echo + if ! sh -ex "/tests/$1"; then + poweroff -f + fi +} + +export HOME=/root +export LD_LIBRARY_PATH=/usr/local/lib +export PATH=/usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/sbin:/usr/sbin +export TERM=screen + +/bin/busybox --install -s +hostname qemu +mount -t proc proc /proc +mount -t sysfs sys /sys +mknod /dev/null c 1 3 +. /cmd.sh +set +x + +# Run all tests + +run_test 01_ms_ip4_sgsn_ip4.sh +run_test 02_ms_ip4_sgsn_ip6.sh +run_test 03_ms_ip6_sgsn_ip4.sh +run_test 04_ms_ip6_sgsn_ip6.sh + +# Success (run-qemu.sh checks for this line) +echo "QEMU_TEST_SUCCESSFUL" +poweroff -f diff --git a/tests/qemu/run-qemu.sh b/tests/qemu/run-qemu.sh new file mode 100755 index 0000000..35bf756 --- /dev/null +++ b/tests/qemu/run-qemu.sh @@ -0,0 +1,51 @@ +#!/bin/sh -e +DIR="$(cd "$(dirname "$0")" && pwd)" + +if [ -e /dev/kvm ]; then + MACHINE_ARG="-machine pc,accel=kvm" +else + echo "WARNING: /dev/kvm not found, emulation will be slower" + MACHINE_ARG="-machine pc" +fi + +if ! [ -e "$DIR"/_linux ]; then + echo "ERROR: linux kernel not found: $DIR/_linux" + echo "Put a kernel there, either download it from the Osmocom jenkins:" + echo "$ make -C tests qemu-download-kernel" + echo + echo "Or build your own kernel. Make sure to set:" + echo " CONFIG_GTP=y" + echo " CONFIG_NET_NS=y" + echo " CONFIG_VETH=y" + exit 1 +fi + +KERNEL_CMDLINE="root=/dev/ram0 console=ttyS0 panic=-1 init=/init" + +set -x +qemu-system-x86_64 \ + $MACHINE_ARG \ + -smp 1 \ + -m 512M \ + -no-user-config -nodefaults -display none \ + -gdb unix:"$DIR"/_gdb.pipe,server=on,wait=off \ + -no-reboot \ + -kernel "$DIR"/_linux \ + -initrd "$DIR"/_initrd.gz \ + -append "${KERNEL_CMDLINE}" \ + -serial stdio \ + -chardev socket,id=charserial1,path="$DIR"/_gdb-serial.pipe,server=on,wait=off \ + -device isa-serial,chardev=charserial1,id=serial1 \ + 2>&1 | tee "$DIR/_output" + +set +x +if grep -q "QEMU_TEST_SUCCESSFUL" "$DIR/_output"; then + echo + echo "QEMU tests: successful" + echo +else + echo + echo "QEMU tests: failed" + echo + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35991?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: Ibf75514b866fffb11e90529e4705f126b23d7415 Gerrit-Change-Number: 35991 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]: gtp: provide interface to set family

by osmith

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 year, 4 months

1
0
0 0

[S] Change in libgtpnl[master]: gtp-link: set IPv6 socket only

by osmith

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 year, 4 months

1
0
0 0

[M] Change in libgtpnl[master]: gtp-link: add IPv6 support

by osmith

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 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024