March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: sccp: Fix test rx SLS expectancies

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39768?usp=email ) Change subject: sccp: Fix test rx SLS expectancies ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic288b58629361de9cfadb568a27b51b7e02c9e99 Gerrit-Change-Number: 39768 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:15:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: Improve logging receiving unexpected msg

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email ) Change subject: sccp: Improve logging receiving unexpected msg ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File sccp/SCCP_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767/comment/6f0a31d4_b2e4… : PS2, Line 154: { : Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, : log2str("Unexpected MTP/SCCP received: got (ASP_MTP3_PAUSE|ASP_MTP3_RESUME|ASP_MTP3_STATUS) vs exp ", exp this is a bit "unelegant" as it basically is the default case. Todays M3UA implementation may just know of ASP_MTP3_{PAUSE,RESUME,STATUS} but that might of course change at whcih point the code here is no longer valid. Not critical, just saying... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90c5236882e96fc038fee0d2f4551cfc58767c78 Gerrit-Change-Number: 39767 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:15:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email ) Change subject: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer ...................................................................... m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer Recent commit reworked those code paths to return an error type instead of an err message, but wrongly left the negative error of osmo_fsm_inst_dispatch() code path as is, without converting it to a positive m3ua error code value, which ended up in an ERR msg not being generated. Fixes: 82c1d2c8c6699349258869bce690293b590a6b0d Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5 --- M src/m3ua.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/71/39771/1 diff --git a/src/m3ua.c b/src/m3ua.c index 39c799e..04ee7c5 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -734,6 +734,8 @@ /* deliver that event to the ASP FSM */ rc = osmo_fsm_inst_dispatch(asp->fi, event, xua); + if (rc < 0) + rc = M3UA_ERR_UNEXPECTED_MSG; ret_free: xua_msg_free(xua); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5 Gerrit-Change-Number: 39771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?usp=email ) Change subject: stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File stp/STP_Tests_IPA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765/comment/ff4c74ab_3347… : PS1, Line 309: where > were Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68856e11a92b707eb11ab4813390e6faf3c54b69 Gerrit-Change-Number: 39765 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:13:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

4 months

1
0
0 0

[M] Change in docker-playground[master]: nplab-m3ua-test: Record pcap of all testsuite run

by pespin

Attention is currently required from: laforge, osmith. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/39770?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: nplab-m3ua-test: Record pcap of all testsuite run ...................................................................... nplab-m3ua-test: Record pcap of all testsuite run Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 --- M debian-buster-build/Dockerfile M nplab-m3ua-test/Dockerfile M nplab-m3ua-test/jenkins.sh M nplab-m3ua-test/osmo-stp.cfg A nplab-m3ua-test/tcpdump-start.sh A nplab-m3ua-test/tcpdump-stop.sh A nplab-m3ua-test/test.sh 7 files changed, 223 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/39770/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[M] Change in docker-playground[master]: nplab-m3ua-test: Record pcap of all testsuite run

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email ) Change subject: nplab-m3ua-test: Record pcap of all testsuite run ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Same will be needed for nplab-sua-test. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Mar 2025 15:29:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months

1
0
0 0

[M] Change in docker-playground[master]: nplab-m3ua-test: Record pcap of all testsuite run

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email ) Change subject: nplab-m3ua-test: Record pcap of all testsuite run ...................................................................... nplab-m3ua-test: Record pcap of all testsuite run Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 --- M debian-buster-build/Dockerfile M nplab-m3ua-test/Dockerfile M nplab-m3ua-test/jenkins.sh A nplab-m3ua-test/tcpdump-start.sh A nplab-m3ua-test/tcpdump-stop.sh A nplab-m3ua-test/test.sh 6 files changed, 219 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/39770/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 0d2b5b7..49ee3c1 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -58,6 +58,7 @@ sqlite3 \ stow \ telnet \ + tcpdump \ wget && \ apt-get clean diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile index 2f6ad93..23e885b 100644 --- a/nplab-m3ua-test/Dockerfile +++ b/nplab-m3ua-test/Dockerfile @@ -10,6 +10,9 @@ cp runtest-junitxml.py /usr/local/bin/ COPY dotguile /root/.guile +COPY test.sh /usr/local/bin/test.sh +COPY tcpdump-start.sh /usr/local/bin/tcpdump-start.sh +COPY tcpdump-stop.sh /usr/local/bin/tcpdump-stop.sh RUN mkdir /data diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 3db8745..96e5854 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -36,4 +36,4 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/m3ua-tester:/data \ --name ${BUILD_TAG}-m3ua-test \ - $REPO_USER/nplab-m3ua-test > $VOL_BASE_DIR/m3ua-tester/junit-xml-m3ua.log + $REPO_USER/nplab-m3ua-test /usr/local/bin/test.sh diff --git a/nplab-m3ua-test/tcpdump-start.sh b/nplab-m3ua-test/tcpdump-start.sh new file mode 100755 index 0000000..9575a68 --- /dev/null +++ b/nplab-m3ua-test/tcpdump-start.sh @@ -0,0 +1,124 @@ +#!/bin/sh + +PIDFILE_PCAP=/tmp/pcap.pid +TCPDUMP=$(command -v tcpdump) +DUMPCAP=$(command -v dumpcap) + +PIDFILE_NETCAT=/tmp/netcat.pid +NETCAT=$(command -v nc) +GSMTAP_PORT=4729 + +TESTCASE=$1 + + +SUDOSTR="" +if ! [ "$(id -u)" = "0" ]; then + SUDOSTR="sudo -n" + # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, + # and this script will hang indefinitely +fi + +kill_rm_pidfile() { + # NOTE: This requires you to be root or something like + # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file + if [ -e "$1" ]; then + if [ -s "$1" ]; then + $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" + fi + rm $1 + fi +} + +echo "------ $TESTCASE ------" +date + +if [ "z$TTCN3_PCAP_PATH" = "z" ]; then + TTCN3_PCAP_PATH=/tmp +fi + +kill_rm_pidfile $PIDFILE_NETCAT +kill_rm_pidfile $PIDFILE_PCAP + +CMD="$SUDOSTR $TCPDUMP -U" + +if [ -x "$DUMPCAP" ]; then + CAP_ERR="1" + if [ -x /sbin/setcap ]; then + # N. B: this check requires libcap2-bin package + /sbin/setcap -q -v 'cap_net_admin,cap_net_raw=pie' $DUMPCAP + CAP_ERR="$?" + fi + + # did we implicitly inherit all those caps because we're root in a netns? + if [ -u $DUMPCAP -o "$CAP_ERR" = "1" ]; then + getpcaps 0 2>&1 | grep -e cap_net_admin | grep -q -e cap_net_raw + CAP_ERR="$?" + fi + + # did we implicitly inherit all those caps because we're root in a netns? + if [ -u $DUMPCAP -o "$CAP_ERR" = "1" ]; then + getpcaps 0 2>&1 | grep -q -e " =ep" # all perms + CAP_ERR="$?" + fi + + if [ -u $DUMPCAP -o "$CAP_ERR" = "0" ]; then + # dumpcap, *after dropping permissions*, needs to be able to write to the directory to create the pcap file: + if [ "$(stat -L -c "%u" "$TTCN3_PCAP_PATH")" = "$(id -u)" ] && [ "$(stat -L -c "%A" "$TTCN3_PCAP_PATH" | head -c 4)" = "drwx" ]; then + CMD="$DUMPCAP -q" + else + echo "NOTE: unable to use dumpcap due to missing permissions in $TTCN3_PCAP_PATH" + fi + else + echo "NOTE: unable to use dumpcap due to missing capabilities or suid bit" + fi +fi + +# Create a dummy sink for GSMTAP packets +$NETCAT -l -u -k -p $GSMTAP_PORT >/dev/null 2>$TESTCASE.netcat.stderr & +PID=$! +echo $PID > $PIDFILE_NETCAT + +CMD_OUTFILE=$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout +CMD_OUTFILE_ERR=$TTCN3_PCAP_PATH/$TESTCASE.pcap.stderr +FIFO=/tmp/cmderr +if ! [ -e $FIFO ]; then + mkfifo $FIFO +else + echo "Warning: Named pipe already exists: $FIFO" +fi + +# Log stderr to CMD_OUTFILE and a dedicated error log file +tee $CMD_OUTFILE < $FIFO > $CMD_OUTFILE_ERR & +CMD_STR="$CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE 2>$FIFO &" +echo "$CMD_STR" +eval $CMD_STR +# $CMD -s 1520 -n -i any -w \"$TTCN3_PCAP_PATH/$TESTCASE.pcap\" >$CMD_OUTFILE & +PID=$! +echo $PID > $PIDFILE_PCAP +if [ -f $CMD_OUTFILE_ERR ] && [ $(wc -l $CMD_OUTFILE_ERR | awk '{print $1}') -ne 0 ]; then + echo "Warnings or error messages from command:" >&2 + echo " $CMD_STR" >&2 + echo "Message:" >&2 + echo "$(cat $CMD_OUTFILE_ERR)" | sed 's/^/\t/' >&2 +fi + +# Wait until packet dumper creates the pcap file and starts recording. +# We generate some traffic until we see packet dumper catches it. +# Timeout is 10 seconds. +ping 127.0.0.1 >/dev/null 2>&1 & +PID=$! +i=0 +while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" ] || + [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcap")" -eq 32 ] +do + echo "Waiting for packet dumper to start... $i" + sleep 1 + i=$((i+1)) + if [ $i -eq 10 ]; then + echo "Packet dumper didn't start filling pcap file after $i seconds!!!" + break + fi +done +kill $PID + +echo "$TESTCASE" > "$TTCN3_PCAP_PATH/.current_test" diff --git a/nplab-m3ua-test/tcpdump-stop.sh b/nplab-m3ua-test/tcpdump-stop.sh new file mode 100755 index 0000000..c9226a0 --- /dev/null +++ b/nplab-m3ua-test/tcpdump-stop.sh @@ -0,0 +1,83 @@ +#!/bin/sh + +PIDFILE_PCAP=/tmp/pcap.pid +PIDFILE_NETCAT=/tmp/netcat.pid +FIFO=/tmp/cmderr +TESTCASE=$1 + +SUDOSTR="" +if ! [ "$(id -u)" = "0" ]; then + SUDOSTR="sudo -n" + # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, + # and this script will hang indefinitely +fi + +kill_rm_pidfile() { + # NOTE: This requires you to be root or something like + # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file + if [ -e "$1" ]; then + if [ -s "$1" ]; then + $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" + fi + rm $1 + fi +} + +date + +echo "------ $TESTCASE ------" + +if [ "z$TTCN3_PCAP_PATH" = "z" ]; then + TTCN3_PCAP_PATH=/tmp +fi + +# Order the SUT to print a talloc report +if [ "z$OSMO_SUT_HOST" != "z" ] && [ "z$OSMO_SUT_PORT" != "z" ]; then + if [ -x "$(command -v osmo_interact_vty.py)" ]; then + echo "Saving talloc report from $OSMO_SUT_HOST:$OSMO_SUT_PORT to $TESTCASE.talloc" + if ! timeout 5 osmo_interact_vty.py \ + -H $OSMO_SUT_HOST -p $OSMO_SUT_PORT \ + -c "en; show talloc-context application full" \ + > "$TTCN3_PCAP_PATH/$TESTCASE.talloc"; then + echo + echo "ERROR: failed to get talloc report via vty" + echo + fi + else + echo "Missing osmo_interact_vty.py from osmo-python-tests!" + echo " -> Unable to obtain talloc report from the SUT" + fi +fi + +# Wait for up to 2 seconds if we keep receiving traffinc from packet dumper, +# otherwise we might lose last packets from test. +i=0 +prev_count=-1 +count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap") +while [ $count -gt $prev_count ] && [ $i -lt 2 ] +do + echo "Waiting for packet dumper to finish... $i (prev_count=$prev_count, count=$count)" + sleep 1 + prev_count=$count + count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap") + i=$((i+1)) +done + +kill_rm_pidfile "$PIDFILE_PCAP" +kill_rm_pidfile "$PIDFILE_NETCAT" +rm $FIFO + +# Add a numeral suffix to subsequent runs of the same test: +PCAP_FILENAME=$TTCN3_PCAP_PATH/$TESTCASE.pcap +if [ -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap.gz" ]; then + i=1 + while [ -f "$TTCN3_PCAP_PATH/$TESTCASE.$i.pcap.gz" ]; + do i=$((i+1)) + done + mv "$PCAP_FILENAME" "$TTCN3_PCAP_PATH/$TESTCASE.$i.pcap" + PCAP_FILENAME="$TTCN3_PCAP_PATH/$TESTCASE.$i.pcap" +fi +gzip -f "$PCAP_FILENAME" +mv "${PCAP_FILENAME}.gz" /data/ + +rm -f "$TTCN3_PCAP_PATH/.current_test" diff --git a/nplab-m3ua-test/test.sh b/nplab-m3ua-test/test.sh new file mode 100755 index 0000000..58ef8dd --- /dev/null +++ b/nplab-m3ua-test/test.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +/usr/local/bin/tcpdump-start.sh nplab-m3ua-test + +/usr/local/bin/runtest-junitxml.py -s 0.1 -t 10 -d /root /data/all-sgp-tests.txt > /data/junit-xml-m3ua.log + +/usr/local/bin/tcpdump-stop.sh nplab-m3ua-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initi...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email ) Change subject: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized ...................................................................... mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized Prior to this patch, osmo-mgw would wait until first IuUP Data frame would be received on RAN-side (from HNB) to trigger active initialization (Tx IuUP-Init) on CN-side conn towards CN. With this patch, this happens ASAP, whenever the CN-side conn is created by HNBGW when it receives the RAB-ASS-RESP from HNB. Related: OS#6685 Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 --- M include/osmocom/mgcp/mgcp_iuup.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_iuup.c 3 files changed, 44 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp_iuup.h b/include/osmocom/mgcp/mgcp_iuup.h index 4d2011f..f0af776 100644 --- a/include/osmocom/mgcp/mgcp_iuup.h +++ b/include/osmocom/mgcp/mgcp_iuup.h @@ -31,3 +31,4 @@ int mgcp_conn_iuup_dispatch_rtp(struct msgb *msg); int mgcp_conn_iuup_send_rtp(struct mgcp_conn_rtp *conn_src_rtp, struct mgcp_conn_rtp *conn_dest_rtp, struct msgb *msg); int mgcp_conn_iuup_send_dummy(struct mgcp_conn_rtp *conn_rtp); +int mgcp_conn_iuup_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn_rtp); diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 324f67d..28ccd2f 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -24,6 +24,7 @@ #include <osmocom/mgcp/mgcp.h> #include <osmocom/mgcp/mgcp_protocol.h> #include <osmocom/mgcp/mgcp_conn.h> +#include <osmocom/mgcp/mgcp_iuup.h> #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> @@ -677,7 +678,7 @@ } break; case MGCP_RTP_IUUP: - break; + return mgcp_conn_iuup_event_rx_crcx_mdcx(conn_rtp); default: return -523; } diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 468ea06..40ca100 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -753,3 +753,44 @@ return 0; } + +/* To be called every time an CRCX/MDCX is received. + * returns: 0 if conn can continue, MGCP negative code if an error ocurred during setup */ +int mgcp_conn_iuup_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn_rtp) +{ + struct mgcp_conn *peer_conn; + struct mgcp_conn_rtp *peer_conn_rtp; + OSMO_ASSERT(mgcp_conn_rtp_is_iuup(conn_rtp)); + + /* keep waiting to receive remote address through CRCX/MDCX */ + if (!mgcp_rtp_end_remote_addr_available(&conn_rtp->end)) + return 0; + + /* Conn already IuUP-configured/initialized, nothing to be done. */ + if (conn_rtp->iuup.configured) + return 0; + + /* Reached this point, conn_rtp is an IuUP conn which can be configured + * and was not yet configured. If its sister conn in the endpoint was + * already configured as IuUP "passive", then we know this one can be + * configured as IuUP "active" right now. In that case, do so. + * This usually happens on an HNBGW co-located MGW, where during + * RAB-ASS-REQ the RAN-side conn (sister conn here) was already + * configured and then upon rx of RAB-ASS-RESP it sets up (CRCX) the + * CN-side IuUP conn (rt_conn here). + */ + peer_conn = mgcp_find_dst_conn(conn_rtp->conn); + /* No peer conn yet, nothing to be done. */ + if (!peer_conn) + return 0; + peer_conn_rtp = mgcp_conn_get_conn_rtp(peer_conn); + + if (mgcp_conn_rtp_is_iuup(peer_conn_rtp) && + peer_conn_rtp->iuup.configured && + !conn_rtp->iuup.active_init) { + LOG_CONN_RTP(conn_rtp, LOGL_INFO, "Sister IuUP conn in endp configured as passive, init this one as active\n"); + OSMO_ASSERT(peer_conn_rtp->iuup.init_ind); + _conn_iuup_configure_as_active(conn_rtp, peer_conn_rtp->iuup.init_ind); + } + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 Gerrit-Change-Number: 39762 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Move endpoint/conn updating logic to helper function

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39761?usp=email ) Change subject: mgw: Move endpoint/conn updating logic to helper function ...................................................................... mgw: Move endpoint/conn updating logic to helper function Move code logic doing actions based on endpoint state (and its conns) out of the CRCX/MDCX MGCP handlers. Most of that logic present in CRCX and MDCX is actually the same and can be merged. This way we can also make the updating logic more complex without extending the CRCX/MDCX handlers for and more adding spaghetti code. Change-Id: I24dd15ec76bd6e949a178a3b998b76a44ddbab50 --- M include/osmocom/mgcp/mgcp_e1.h M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c 5 files changed, 77 insertions(+), 48 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp_e1.h b/include/osmocom/mgcp/mgcp_e1.h index fbd594c..84615b5 100644 --- a/include/osmocom/mgcp/mgcp_e1.h +++ b/include/osmocom/mgcp/mgcp_e1.h @@ -22,6 +22,6 @@ static const uint8_t e1_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; int mgcp_e1_endp_equip(struct mgcp_endpoint *endp, uint8_t ts, uint8_t ss, uint8_t offs); -void mgcp_e1_endp_update(struct mgcp_endpoint *endp); +int mgcp_e1_endp_update(struct mgcp_endpoint *endp); void mgcp_e1_endp_release(struct mgcp_endpoint *endp, uint8_t ts); int mgcp_e1_send_rtp(struct mgcp_endpoint *endp, struct mgcp_rtp_codec *codec, struct msgb *msg); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 9aaf7fa..4c1fb20 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -132,7 +132,7 @@ struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index); int mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid); -void mgcp_endp_update(struct mgcp_endpoint *endp); +int mgcp_endp_update(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb); bool mgcp_endp_is_wildcarded(const char *epname); bool mgcp_endp_is_null(const char *epname); struct mgcp_endpoint *mgcp_endp_by_name_trunk(int *cause, const char *epname, diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index dc0acca..7f139a1 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -546,7 +546,7 @@ /*! Update E1 related parameters (codec and sync pattern). * \param[in] endp endpoint to update. */ -void mgcp_e1_endp_update(struct mgcp_endpoint *endp) +int mgcp_e1_endp_update(struct mgcp_endpoint *endp) { struct mgcp_conn *conn; struct mgcp_conn_rtp *conn_rtp; @@ -577,6 +577,7 @@ /* Update sync pattern */ sync_pat_id = determine_trau_sync_pat(codec->subtype_name, endp->e1.scd.rate, endp->e1.last_amr_ft, endp); osmo_trau_sync_set_pat(endp->e1.trau_sync_fi, sync_pat_id); + return 0; } /*! Remove E1 resources from endpoint diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index a4ab860..324f67d 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -640,17 +640,78 @@ /*! update endpoint, updates internal endpoint specific data, should be * after when MDCX or CRCX has been executed successuflly. - * \param[in] endp endpoint to update. */ -void mgcp_endp_update(struct mgcp_endpoint *endp) + * \param[in] endp endpoint to update. + * \returns zero on success, mgcp negative error on failure. */ +static int mgcp_endp_update_virtual(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb) +{ + OSMO_ASSERT(conn); + OSMO_ASSERT(conn->type == MGCP_CONN_TYPE_RTP); + struct mgcp_trunk *trunk = endp->trunk; + struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); + char new_local_addr[INET6_ADDRSTRLEN]; + + /* CRCX: Find a local address for conn based on policy and initial SDP remote + * information, then find a free port for it. + * MDCX: msg may have provided a new remote address, which means we may need + * to update our announced IP addr and re-bind our local end. This can + * happen for instance if MGW initially provided an IPv4 during CRCX + * ACK, and now MDCX tells us the remote has an IPv6 address. + */ + if (mgcp_get_local_addr(new_local_addr, conn_rtp) < 0) + goto fail_bind_port_ret; + + if (strcmp(new_local_addr, conn_rtp->end.local_addr)) { + osmo_strlcpy(conn_rtp->end.local_addr, new_local_addr, sizeof(conn_rtp->end.local_addr)); + mgcp_rtp_end_free_port(&conn_rtp->end); + if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) + goto fail_bind_port_ret; + } + + switch (conn_rtp->type) { + case MGCP_RTP_DEFAULT: + break; + case MGCP_RTP_OSMUX: + if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "CRCX: Osmux handling failed!\n"); + return -500; + } + break; + case MGCP_RTP_IUUP: + break; + default: + return -523; + } + + return 0; + +fail_bind_port_ret: + switch (verb) { + case MGCP_VERB_CRCX: + rate_ctr_inc(rate_ctr_group_get_ctr(trunk->ratectr.mgcp_crcx_ctr_group, + MGCP_CRCX_FAIL_BIND_PORT)); + break; + case MGCP_VERB_MDCX: + rate_ctr_inc(rate_ctr_group_get_ctr(trunk->ratectr.mgcp_mdcx_ctr_group, + MGCP_MDCX_FAIL_BIND_PORT)); + break; + default: + break; + } + return -500; +} + +/*! update endpoint, updates internal endpoint specific data, should be + * after when MDCX or CRCX has been executed successuflly. + * \param[in] endp endpoint to update. + * \returns zero on success, mgcp negative error on failure. */ +int mgcp_endp_update(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb) { /* Allocate resources */ switch (endp->trunk->trunk_type) { case MGCP_TRUNK_VIRTUAL: - /* No updating initaliziation required for virtual endpoints. */ - break; + return mgcp_endp_update_virtual(endp, conn, verb); case MGCP_TRUNK_E1: - mgcp_e1_endp_update(endp); - break; + return mgcp_e1_endp_update(endp); default: OSMO_ASSERT(false); } diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bd2120f..e33ce35 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -763,26 +763,11 @@ rc = mgcp_conn_iuup_init(conn_rtp); } - /* Find a local address for conn based on policy and initial SDP remote - information, then find a free port for it */ - if (mgcp_get_local_addr(conn_rtp->end.local_addr, conn_rtp) < 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + rc = mgcp_endp_update(endp, conn, rq->verb); + if (rc < 0) { + error_code = -rc; goto error2; } - if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); - goto error2; - } - - /* Notify Osmux conn that CRCX was received */ - if (mgcp_conn_rtp_is_osmux(conn_rtp)) { - if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, "CRCX: Osmux handling failed!\n"); - goto error2; - } - } - - mgcp_endp_update(endp); LOGPCONN(conn, DLMGCP, LOGL_NOTICE, "CRCX: connection successfully created: %s\n", mgcp_conn_dump(conn)); @@ -885,7 +870,6 @@ struct mgcp_endpoint *endp = rq->endp; struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; - char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp *conn_rtp = NULL; @@ -981,30 +965,13 @@ if (mgcp_conn_rtp_is_osmux(conn_rtp)) { conn_rtp->osmux.remote_cid_present = true; conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; - if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Osmux handling failed!\n"); - goto error3; - } } - /* MDCX may have provided a new remote address, which means we may need - to update our announced IP addr and re-bind our local end. This can - happen for instance if MGW initially provided an IPv4 during CRCX - ACK, and now MDCX tells us the remote has an IPv6 address. */ - if (mgcp_get_local_addr(new_local_addr, conn_rtp) < 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_BIND_PORT)); + rc = mgcp_endp_update(endp, conn, rq->verb); + if (rc < 0) { + error_code = -rc; goto error3; } - if (strcmp(new_local_addr, conn_rtp->end.local_addr)) { - osmo_strlcpy(conn_rtp->end.local_addr, new_local_addr, sizeof(conn_rtp->end.local_addr)); - mgcp_rtp_end_free_port(&conn_rtp->end); - if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_BIND_PORT)); - goto error3; - } - } - - mgcp_endp_update(endp); LOGPCONN(conn, DLMGCP, LOGL_NOTICE, "MDCX: connection successfully modified: %s\n", mgcp_conn_dump(conn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I24dd15ec76bd6e949a178a3b998b76a44ddbab50 Gerrit-Change-Number: 39761 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initi...

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email ) Change subject: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 Gerrit-Change-Number: 39762 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 15:16:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025