- gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: ttcn3-*-test: allow running tests with artificial link delay
by fixeria 20 Mar '24

20 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36372?usp=email ) Change subject: ttcn3-*-test: allow running tests with artificial link delay ...................................................................... ttcn3-*-test: allow running tests with artificial link delay Change-Id: I4da3167ecda6ec5f27433da47d1a501180b37ca5 Related: OS#6411, OS#6375 --- M README.md M common/ttcn3-docker-run.sh M debian-bookworm-titan-master/Dockerfile M debian-bookworm-titan/Dockerfile M debian-bullseye-titan-master/Dockerfile M debian-bullseye-titan/Dockerfile 6 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/36372/1 diff --git a/README.md b/README.md index 436fdd0..95ba200 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,18 @@ $ ./jenkins.sh ``` +### Running a testsuite with artificial link delay + +Below is an example of running ttcn3-bsc-test with a link delay of 30ms: + +``` +$ export DOCKER_ARGS="--cap-add=NET_ADMIN -e 'OSMO_TTCN3_NETEM_DELAY=30'" +$ cd ttcn3-bsc-test +$ ./jenkins.sh +``` + +FIXME: somehow, `--cap-add=NET_ADMIN` breaks tcpdump/dumpcap! + ### More examples latest (debian): diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh index c8c871e..84bfc6c 100755 --- a/common/ttcn3-docker-run.sh +++ b/common/ttcn3-docker-run.sh @@ -31,6 +31,11 @@ done fi +if [ -n "$OSMO_TTCN3_NETEM_DELAY" ]; then + echo "Enabling netem delay (${OSMO_TTCN3_NETEM_DELAY}ms)" + tc qdisc add dev eth0 root netem delay ${OSMO_TTCN3_NETEM_DELAY}ms +fi + cd /data # Use TEST_NAME to only run one test instead of all. Set it like this: diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile index 2b0644a..161c933 100644 --- a/debian-bookworm-titan-master/Dockerfile +++ b/debian-bookworm-titan-master/Dockerfile @@ -20,6 +20,7 @@ build-essential \ ca-certificates \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index fcc00ba..c4af2ef 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -21,6 +21,7 @@ ca-certificates \ ccache \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/debian-bullseye-titan-master/Dockerfile b/debian-bullseye-titan-master/Dockerfile index a7ec65d..b364bd2 100644 --- a/debian-bullseye-titan-master/Dockerfile +++ b/debian-bullseye-titan-master/Dockerfile @@ -18,6 +18,7 @@ DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends --no-install-suggests \ build-essential \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 2274cc4..75591d1 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -23,6 +23,7 @@ DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends --no-install-suggests \ build-essential \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36372?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: I4da3167ecda6ec5f27433da47d1a501180b37ca5 Gerrit-Change-Number: 36372 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites
by fixeria 20 Mar '24

20 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36371?usp=email ) Change subject: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites ...................................................................... ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites Let's also retrieve talloc reports for these testsuites. Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9 --- M ttcn3-cbc-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh M ttcn3-upf-test/jenkins.sh 12 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/36371/1 diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index e1958ef..6026df0 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -33,6 +33,8 @@ $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4264" \ -v $VOL_BASE_DIR/cbc-tester:/data \ --name ${BUILD_TAG}-ttcn3-cbc-test \ $DOCKER_ARGS \ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 1c53173..72dc4af 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -61,6 +61,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4246" \ -e "WAIT_FOR_NETDEV=hdlc8" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test -d \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 0ee7a5f..861be39 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -39,6 +39,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4246" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ $DOCKER_ARGS \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index c47c9ca..21647ed 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -67,6 +67,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4261" \ -v $base_dir/hnbgw-tester:/data \ -v $base_dir/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-hnbgw-test \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index 3b57fd8..cdc47b0 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -38,6 +38,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4273" \ -v $VOL_BASE_DIR/hnodeb-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-hnodeb-test \ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index b2d78a7..5395fa3 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -34,6 +34,8 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/mgw-tester:/data \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.180" \ + -e "OSMO_SUT_PORT=4243" \ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-mgw-test diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index d63229b..c42ad18 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -50,6 +50,8 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test-sns \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index dca6dc0..f92a08e 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -46,6 +46,8 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 2a20dcc..5ccbdf5 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -39,6 +39,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4256" \ -v $VOL_BASE_DIR/sip-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-sip-test \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 33a1293..ab284b3 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -47,6 +47,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4271" \ -v $VOL_BASE_DIR/smlc-tester:/data \ --name ${BUILD_TAG}-ttcn3-smlc-test \ $DOCKER_ARGS \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index f6768f0..4f90a4d 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -40,6 +40,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.200" \ + -e "OSMO_SUT_PORT=4239" \ -v $VOL_BASE_DIR/stp-tester:/data \ --name ${BUILD_TAG}-ttcn3-stp-test \ $DOCKER_ARGS \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index f814975..8bb19e2 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -33,6 +33,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4275" \ -v $VOL_BASE_DIR/upf-tester:/data \ --name ${BUILD_TAG}-ttcn3-upf-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36371?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: Iaa94dd200fdb98962b784cb507c9995096232dc9 Gerrit-Change-Number: 36371 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""
by fixeria 20 Mar '24

20 Mar '24

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 20 Mar 2024 14:05:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""
by laforge 20 Mar '24

20 Mar '24

Attention is currently required from: Hoernchen, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35525/comment/272bd1db_836c71ce PS1, Line 11: some fallout expected > I hear you, and I agree that it is the old test code that's broken. […] Done File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/35525/comment/4ec5b19a_7155a913 PS2, Line 412: log_cache_enable fyi, I intentionally didn't add a 'bool enable' argument or the like, as disabling it would mean freein'g the pointer in thread-safe way, which means additional overhead for every code path reading/accessing it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 13:57:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""
by laforge 20 Mar '24

20 Mar '24

Attention is currently required from: Hoernchen, fixeria. laforge has uploaded a new patch set (#3) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Revert "Revert "logging: add log level cache"" This reverts commit 7f1fb3ea817578f3f2f63e8065aa50f8355caa3b - slightly amended with the new log_cache_enalbe() function. The cache is hence disabled by default, and applications can enable it, if they wish to benefit from it. Reason for the original revert was: some fallout expected due to log manipulation in test code Change-Id: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 --- M include/osmocom/core/logging.h M src/core/libosmocore.map M src/core/logging.c M src/vty/logging_vty.c 4 files changed, 163 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/35525/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""
by laforge 20 Mar '24

20 Mar '24

Attention is currently required from: Hoernchen, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35525/comment/adf9f90e_7f284559 PS1, Line 11: some fallout expected > But that promise is impossible to keep because that means 11 year old test code that checks the numb […] I hear you, and I agree that it is the old test code that's broken. However, as we cannot go back in history, and in this case it's easy to maek the new feature optional by adding the proposed log_cache_enable() function, I think it's the best way to do just that. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 13:54:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""
by laforge 20 Mar '24

20 Mar '24

Attention is currently required from: fixeria, laforge. laforge has uploaded a new patch set (#2) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Revert "Revert "logging: add log level cache"" This reverts commit 7f1fb3ea817578f3f2f63e8065aa50f8355caa3b - slightly amended with the new log_cache_enalbe() function. The cache is hence disabled by default, and applications can enable it, if they wish to benefit from it. Reason for the original revert was: some fallout expected due to log manipulation in test code Change-Id: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 --- M include/osmocom/core/logging.h M src/core/libosmocore.map M src/core/logging.c M src/vty/logging_vty.c 4 files changed, 160 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/35525/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-mgw[master]: cosmetic: make linter happy
by laforge 20 Mar '24

20 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36369?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: make linter happy ...................................................................... cosmetic: make linter happy Change-Id: Iec8404061588b848f9e597bf4112d6df9597de95 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 2fd62ae..bdf516e 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1051,7 +1051,7 @@ size_t addr_len; LOGP(DRTP, LOGL_DEBUG, - "sending %i bytes length packet to %s:%u ...\n", len, + "sending %d bytes length packet to %s:%u ...\n", len, osmo_sockaddr_ntop(&addr->u.sa, ipbuf), osmo_sockaddr_port(&addr->u.sa)); @@ -1487,7 +1487,7 @@ OSMO_ASSERT(endp); msg = msgb_alloc_c(endp->trunk, RTP_BUF_SIZE, "RTP-rx"); - proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; + proto = (fd == &conn_src->end.rtp) ? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr.u.sa, &slen); @@ -1604,11 +1604,11 @@ NULL, 0, OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(dscp) | OSMO_SOCK_F_PRIO(prio)); if (rc < 0) { - LOGP(DRTP, LOGL_ERROR, "failed to bind UDP port (%s:%i).\n", + LOGP(DRTP, LOGL_ERROR, "failed to bind UDP port (%s:%d).\n", source_addr, port); return -1; } - LOGP(DRTP, LOGL_DEBUG, "created socket + bound UDP port (%s:%i).\n", source_addr, port); + LOGP(DRTP, LOGL_DEBUG, "created socket + bound UDP port (%s:%d).\n", source_addr, port); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36369?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec8404061588b848f9e597bf4112d6df9597de95 Gerrit-Change-Number: 36369 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-mgw[master]: simplify unused transcoding/processing call-back
by laforge 20 Mar '24

20 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: simplify unused transcoding/processing call-back ...................................................................... simplify unused transcoding/processing call-back the processing call-back is working with a raw buffer + length, while we actually work with struct msgb. Let's simply pass the msgb into the call-back, and the call-back can then do what they want with the contents of that msgb. Change-Id: I002624f9008726e3d754d48aa2282c38e3b42953 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c 3 files changed, 20 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 42d67cf..bfb412b 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -70,12 +70,10 @@ /** * Return: * < 0 in case no audio was processed - * >= 0 in case audio was processed. The remaining payload - * length will be returned. + * >= 0 in case audio was processed. */ typedef int (*mgcp_processing)(struct mgcp_endpoint *endp, - struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size); + struct mgcp_rtp_end *dst_end, struct msgb *msg); struct mgcp_conn_rtp; diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index a7bd333..1ec8979 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -159,8 +159,7 @@ int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); /* payload processing default functions */ -int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size); +int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, struct msgb *msg); int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn_dst, diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 19fcd9f..ee25f74 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -404,13 +404,11 @@ /*! dummy callback to disable transcoding (see also cfg->rtp_processing_cb). * \param[in] associated endpoint. * \param[in] destination RTP end. - * \param[in,out] pointer to buffer with voice data. - * \param[in] voice data length. - * \param[in] maximum size of caller provided voice data buffer. + * \param[in,out] msg message bufffer containing data. Function might change length. * \returns ignores input parameters, return always 0. */ int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, - char *data, int *len, int buf_size) + struct msgb *msg) { return 0; } @@ -1167,14 +1165,12 @@ osmo_sockaddr_port(&rtp_end->addr.u.sa), ntohs(rtp_end->rtcp_port) ); } else if (is_rtp) { - int buflen = msgb_length(msg); - /* Make sure we have a valid RTP header, in cases where no RTP * header is present, we will generate one. */ gen_rtp_header(msg, rtp_end, rtp_state); /* Run transcoder */ - rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, (char *)msgb_data(msg), &buflen, RTP_BUF_SIZE); + rc = endp->trunk->cfg->rtp_processing_cb(endp, rtp_end, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "Error %d during transcoding\n", rc); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I002624f9008726e3d754d48aa2282c38e3b42953 Gerrit-Change-Number: 36357 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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-MessageType: merged

1 0

[S] Change in osmo-mgw[master]: remove osmo_fd from mgcp_create_bind()
by laforge 20 Mar '24

20 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: remove osmo_fd from mgcp_create_bind() ...................................................................... remove osmo_fd from mgcp_create_bind() preparation for osmo_io Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c 3 files changed, 27 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index bfb412b..e61ba89 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -204,6 +204,5 @@ int mgcp_send_reset_all(struct mgcp_config *cfg); -int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port, uint8_t dscp, - uint8_t prio); +int mgcp_create_bind(const char *source_addr, int port, uint8_t dscp, uint8_t prio); int mgcp_udp_send(int fd, const struct osmo_sockaddr *addr, const char *buf, int len); diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index ee25f74..275aace 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1517,13 +1517,11 @@ /*! bind RTP port to osmo_fd. * \param[in] source_addr source (local) address to bind on. - * \param[in] fd associated file descriptor. * \param[in] port to bind on. * \param[in] dscp IP DSCP value to use. * \param[in] prio socket priority to use. - * \returns 0 on success, -1 on ERROR. */ -int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port, uint8_t dscp, - uint8_t prio) + * \returns file descriptor on success, -1 on ERROR. */ +int mgcp_create_bind(const char *source_addr, int port, uint8_t dscp, uint8_t prio) { int rc; @@ -1535,34 +1533,37 @@ source_addr, port); return -1; } - fd->fd = rc; LOGP(DRTP, LOGL_DEBUG, "created socket + bound UDP port (%s:%i).\n", source_addr, port); - return 0; + return rc; } /* Bind RTP and RTCP port (helper function for mgcp_bind_net_rtp_port()) */ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr, struct mgcp_rtp_end *rtp_end, struct mgcp_endpoint *endp) { + int rc; + /* NOTE: The port that is used for RTCP is the RTP port incremented by one * (e.g. RTP-Port = 16000 ==> RTCP-Port = 16001) */ - if (mgcp_create_bind(source_addr, &rtp_end->rtp, rtp_end->local_port, - cfg->endp_dscp, cfg->endp_priority) != 0) { + rc = mgcp_create_bind(source_addr, rtp_end->local_port, cfg->endp_dscp, cfg->endp_priority); + if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to create RTP port: %s:%d\n", source_addr, rtp_end->local_port); goto cleanup0; } + rtp_end->rtp.fd = rc; - if (mgcp_create_bind(source_addr, &rtp_end->rtcp, rtp_end->local_port + 1, - cfg->endp_dscp, cfg->endp_priority) != 0) { + rc = mgcp_create_bind(source_addr, rtp_end->local_port + 1, cfg->endp_dscp, cfg->endp_priority); + if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to create RTCP port: %s:%d\n", source_addr, rtp_end->local_port + 1); goto cleanup1; } + rtp_end->rtcp.fd = rc; if (osmo_fd_register(&rtp_end->rtp) != 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 185aecd..997b07b 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -514,13 +514,14 @@ osmo_fd_setup(&osmux_fd_v6, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); if (cfg->osmux.local_addr_v4) { - ret = mgcp_create_bind(cfg->osmux.local_addr_v4, &osmux_fd_v4, cfg->osmux.local_port, + ret = mgcp_create_bind(cfg->osmux.local_addr_v4, cfg->osmux.local_port, cfg->endp_dscp, cfg->endp_priority); if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv4 socket to %s:%u\n", cfg->osmux.local_addr_v4, cfg->osmux.local_port); return ret; } + osmux_fd_v4.fd = ret; ret = osmo_fd_register(&osmux_fd_v4); if (ret < 0) { @@ -532,13 +533,14 @@ osmo_sock_get_name2(osmux_fd_v4.fd)); } if (cfg->osmux.local_addr_v6) { - ret = mgcp_create_bind(cfg->osmux.local_addr_v6, &osmux_fd_v6, cfg->osmux.local_port, + ret = mgcp_create_bind(cfg->osmux.local_addr_v6, cfg->osmux.local_port, cfg->endp_dscp, cfg->endp_priority); if (ret < 0) { LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv6 socket to [%s]:%u\n", cfg->osmux.local_addr_v6, cfg->osmux.local_port); return ret; } + osmux_fd_v6.fd = ret; ret = osmo_fd_register(&osmux_fd_v6); if (ret < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 Gerrit-Change-Number: 36360 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log