Attention is currently required from: jolly, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email )
Change subject: stream_cli: Do not try to send msg, if socket is disconnected
......................................................................
Patch Set 6: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8
Gerrit-Change-Number: 36123
Gerrit-PatchSet: 6
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 04 Mar 2024 19:08:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: daniel, jolly, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email )
Change subject: stream_cli: Correctly setup and free osmo_io client instance
......................................................................
Patch Set 7: Code-Review+1
(1 comment)
Patchset:
PS7:
> Can you explain why you need to free the iofd? There seems to (now) be a memory leak in osmo_stream_ […]
today I also saw some io_fd memory leak when running the STP_Tests against osmo-stp. This might be the cause of it?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I91a6a76b9ff96034a7b333edf87af27490202932
Gerrit-Change-Number: 35979
Gerrit-PatchSet: 7
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 04 Mar 2024 19:06:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36136?usp=email )
Change subject: ttcn3-epdg: Set up params to get GTP-U echo working
......................................................................
ttcn3-epdg: Set up params to get GTP-U echo working
Set the new module parameter added in the test.
Make sure the gtp_u_kmod osmo-epdg.config IP address is updated to the
proper docker network subnet.
Depends: osmo-ttcn3-hacks.git Change-Id I3fd96f212175959cb113d2f6a362c0e77e5ca0d7
Change-Id: I5cd9dcd6188227baed71823b0cbceb77dc771011
---
M ttcn3-epdg-test/EPDG_Tests.cfg
M ttcn3-epdg-test/jenkins.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg
index 5dbcb4c..d61939a 100644
--- a/ttcn3-epdg-test/EPDG_Tests.cfg
+++ b/ttcn3-epdg-test/EPDG_Tests.cfg
@@ -11,6 +11,7 @@
EPDG_Tests.mp_swx_local_ip := "172.18.10.103"
EPDG_Tests.mp_s6b_local_ip := "172.18.10.103"
EPDG_Tests.mp_s2b_local_ip := "172.18.10.103"
+EPDG_Tests.mp_upf_gtpu_local_ip := "172.18.10.103"
EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20"
EPDG_Tests.mp_s6b_remote_ip := "172.18.10.20"
diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh
index 096b2af..a4d029b 100755
--- a/ttcn3-epdg-test/jenkins.sh
+++ b/ttcn3-epdg-test/jenkins.sh
@@ -18,6 +18,9 @@
network_create
network_replace_subnet_in_configs
+# gtp_u_kmod has the IP addresses as usual erlang-tuple format. Patch them too:
+sed -i -E -e "s/172\,18\,[0-9]{1,3}\,/172,18,$SUBNET,/g" $VOL_BASE_DIR/epdg/osmo-epdg.config
+#TODO: Patch IPv6 address once it's supported.
echo Starting container with osmo-epdg
docker run --rm \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36136?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: I5cd9dcd6188227baed71823b0cbceb77dc771011
Gerrit-Change-Number: 36136
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36138?usp=email )
Change subject: ttcn3-epdg: Test GTP-U userplane
......................................................................
ttcn3-epdg: Test GTP-U userplane
Set the assigned IP address for the UE in the EPDG docker container on
the eth0 interface. This way the emulated UPF (ttcn3) can test
decaps+encaps of osmo-epdg tun by pinging the UE IP address and
expecting a pong back.
Related: OS#6235
Change-Id: Icc5710b42e5a5374aade6b952e1c543565ffad2e
---
M osmo-epdg-master/Dockerfile
A ttcn3-epdg-test/epdg.sh
M ttcn3-epdg-test/jenkins.sh
3 files changed, 52 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile
index a5e9b14..cdef31e 100644
--- a/osmo-epdg-master/Dockerfile
+++ b/osmo-epdg-master/Dockerfile
@@ -4,6 +4,14 @@
# Arguments used after FROM must be specified again
ARG DISTRO
+# $distro-erlang switched to user build, but we need to install more stuff beforehand:
+USER root
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
+ iproute2 && \
+ apt-get clean
+USER build
+
WORKDIR /tmp
ARG OSMO_EPDG_BRANCH="master"
diff --git a/ttcn3-epdg-test/epdg.sh b/ttcn3-epdg-test/epdg.sh
new file mode 100755
index 0000000..2614bf9
--- /dev/null
+++ b/ttcn3-epdg-test/epdg.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set +e
+set -x
+
+EPDG_TUN="gtp0"
+UE_IFACE="ue"
+UE_SUBNET="192.168.0.0/16"
+UE_ADDR="192.168.0.2/16"
+
+ip link add $UE_IFACE type dummy
+ip addr add $UE_ADDR dev $UE_IFACE
+ip link set $UE_IFACE up
+ip rule add from $UE_SUBNET table 45
+ERL_FLAGS='-config /data/osmo-epdg.config' /tmp/osmo-epdg/_build/default/bin/osmo-epdg &
+MYPID=$!
+
+# We cannot set a route for the interface until it is created by osmo-epdg...
+echo "Waiting for interface ${EPDG_TUN}..."
+/data/pipework --wait -i ${EPDG_TUN}
+echo "Adding src ${UE_SUBNET} default route to ${EPDG_TUN}"
+ip route add default dev $EPDG_TUN table 45
+
+wait $MYPID
diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh
index a4d029b..cdd3a5e 100755
--- a/ttcn3-epdg-test/jenkins.sh
+++ b/ttcn3-epdg-test/jenkins.sh
@@ -15,6 +15,8 @@
mkdir $VOL_BASE_DIR/epdg
cp osmo-epdg.config $VOL_BASE_DIR/epdg/
+cp epdg.sh $VOL_BASE_DIR/epdg/
+cp ../common/pipework $VOL_BASE_DIR/epdg/
network_create
network_replace_subnet_in_configs
@@ -32,7 +34,10 @@
-v $VOL_BASE_DIR/epdg:/data \
--name ${BUILD_TAG}-epdg -d \
$DOCKER_ARGS \
- $REPO_USER/osmo-epdg-$IMAGE_SUFFIX
+ --sysctl net.ipv4.conf.all.rp_filter=0 \
+ --sysctl net.ipv4.conf.default.rp_filter=0 \
+ $REPO_USER/osmo-epdg-$IMAGE_SUFFIX \
+ /bin/sh -c "/data/epdg.sh >/data/osmo-epdg.log 2>&1"
# Give some time to osmo-epdg to be fully started; it's a bit slow...
sleep 2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36138?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: Icc5710b42e5a5374aade6b952e1c543565ffad2e
Gerrit-Change-Number: 36138
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36131?usp=email )
Change subject: osmo_io: do check_mode_callback_compat() only if ioops is set at osmo_iofd_setup()
......................................................................
osmo_io: do check_mode_callback_compat() only if ioops is set at osmo_iofd_setup()
Setting ioops is optional when calling osmo_iofd_setup(). If it is not
set, do not call check_mode_callback_compat() to check for
compatibility.
Closes: Coverity CID#349578
Change-Id: I1e25f3e420f25a44cbf73a4da9a498b7561e9ddd
---
M src/core/osmo_io.c
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 33466e5..5a5e05c 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -619,7 +619,7 @@
return NULL;
}
- if (!check_mode_callback_compat(mode, ioops))
+ if (ioops && !check_mode_callback_compat(mode, ioops))
return NULL;
iofd = talloc_zero(ctx, struct osmo_io_fd);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36131?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: I1e25f3e420f25a44cbf73a4da9a498b7561e9ddd
Gerrit-Change-Number: 36131
Gerrit-PatchSet: 3
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-MessageType: merged
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36131?usp=email )
Change subject: osmo_io: do check_mode_callback_compat() only if ioops is set at osmo_iofd_setup()
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36131?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: I1e25f3e420f25a44cbf73a4da9a498b7561e9ddd
Gerrit-Change-Number: 36131
Gerrit-PatchSet: 2
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-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Mon, 04 Mar 2024 19:05:12 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149?usp=email )
Change subject: stp: prepare for testing M3UA-over-TCP
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File stp/STP_Tests_M3UA.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149/comment/0217ad99_70f2…
PS1, Line 285: if (not Misc_Helpers.f_osmo_repo_is("nightly")) {
> Ah I see, I thought this was only called on per-need basis. Fine then.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149?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: I5d0b05aa434c057ad379125ac293f5fc9a240b6f
Gerrit-Change-Number: 36149
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 04 Mar 2024 19:03:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment