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

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix Contact and URI headers during MT call precondition

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37334?usp=email ) Change subject: asterisk: IMS: Fix Contact and URI headers during MT call precondition ...................................................................... asterisk: IMS: Fix Contact and URI headers during MT call precondition Change-Id: Id0036adf850d71eda92d6c0f07eeb873bdfa9d0c --- M asterisk/IMS_ConnectionHandler.ttcn M asterisk/SIP_ConnectionHandler.ttcn M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 4 files changed, 30 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index ec163f5..4b50c31 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1127,7 +1127,7 @@ var charstring tx_sdp; var default d_trying, d_ringing; var charstring branch_value; - var Contact calling_contact; + var Contact calling_contact, called_contact; /* RFC 3261 8.1.1.3 From */ g_pars.subscr.cp.from_addr := valueof(ts_From(g_pars.subscr.cp.calling.addr, g_pars.subscr.cp.calling.params)); @@ -1238,11 +1238,12 @@ g_pars.subscr.cp.peer_sdp.media_list[0].attributes)); } + called_contact := g_rx_sip_resp.msgHeader.contact; /* Update To with the tags received from peer: */ g_pars.subscr.cp.to_addr := g_rx_sip_resp.msgHeader.toField; /* Tx PRACK */ - req := ts_SIP_PRACK(g_pars.subscr.cp.to_addr.addressField.nameAddr.addrSpec, + req := ts_SIP_PRACK(called_contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec, g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, @@ -1263,11 +1264,11 @@ "PRACK", 200, g_rx_sip_resp.msgHeader.cSeq.seqNumber + 1, "OK", body := omit); - as_SIP_expect_resp(exp, fail_others := false); + as_SIP_expect_resp(exp); /* Tx UPDATE */ tx_sdp := f_gen_sdp(IMS_GEN_SDP_MO_UPDATE); - req := ts_SIP_UPDATE(g_pars.subscr.cp.to_addr.addressField.nameAddr.addrSpec, + req := ts_SIP_UPDATE(called_contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec, g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, @@ -1283,11 +1284,11 @@ from_addr_exp, to_addr_exp, f_tr_Via_response(via), - omit, + called_contact, "UPDATE", 200, g_rx_sip_resp.msgHeader.cSeq.seqNumber + 1, "OK", body := ?); - as_SIP_expect_resp(exp, fail_others := false); + as_SIP_expect_resp(exp); /* Validate SDP in 200 OK (UPDATE) contains the preconditions: * a=curr:qos local sendrecv @@ -1318,13 +1319,15 @@ g_pars.subscr.cp.sip_seq_nr, "INVITE"); d_ringing := activate(as_SIP_ignore_resp(exp)); + called_contact := g_rx_sip_resp.msgHeader.contact; + /* Wait for 200 OK (INVITE) answer */ exp := tr_SIP_Response( g_pars.subscr.cp.sip_call_id, from_addr_exp, to_addr_exp, f_tr_Via_response(via), - *, + called_contact, "INVITE", 200, g_pars.subscr.cp.sip_seq_nr, "OK", body := *); @@ -1341,7 +1344,8 @@ /* Transmit ACK */ g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; - req := ts_SIP_ACK(g_pars.subscr.cp.sip_call_id, + req := ts_SIP_ACK(called_contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec, + g_pars.subscr.cp.sip_call_id, g_pars.subscr.cp.from_addr, g_pars.subscr.cp.to_addr, via, diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 0cb6167..f688fe0 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -531,7 +531,8 @@ g_pars.cp.to_addr := g_rx_sip_resp.msgHeader.toField; /* Transmit ACK */ - req := ts_SIP_ACK(g_pars.cp.sip_call_id, + req := ts_SIP_ACK(g_pars.cp.to_addr.addressField.nameAddr.addrSpec, + g_pars.cp.sip_call_id, g_pars.cp.from_addr, g_pars.cp.to_addr, via, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 3d2112c..c05ab02 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -995,13 +995,14 @@ template (value) PDU_SIP_Request -ts_SIP_ACK(template (value) CallidString call_id, +ts_SIP_ACK(template (value) SipUrl uri, + template (value) CallidString call_id, template (value) From from_addr, template (value) To to_addr, template (value) Via via, integer seq_nr, template (omit) charstring body) := { - requestLine := ts_SIP_ReqLine(ACK_E, to_addr.addressField.nameAddr.addrSpec), + requestLine := ts_SIP_ReqLine(ACK_E, uri), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, ts_Contact({ ts_ContactAddress(from_addr.addressField, from_addr.fromParams) }), "ACK", seq_nr, diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 74e0688..6064372 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -295,7 +295,8 @@ } [] SIP.receive { setverdict(fail, "Received unexpected SIP response"); - SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, + SIP.send(ts_SIP_ACK(to_addr.addressField.nameAddr.addrSpec, + cp.comp.sip_call_id, from_addr, to_addr, via, cp.comp.sip_seq_nr, omit)); @@ -363,7 +364,8 @@ body := expect_sdp_to_sip)); /* OSC <- SIP: SIP world acknowledges "200 OK" */ - SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, + SIP.send(ts_SIP_ACK(to_addr.addressField.nameAddr.addrSpec, + cp.comp.sip_call_id, from_addr, to_addr, via, cp.comp.sip_seq_nr, omit)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37334?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: Id0036adf850d71eda92d6c0f07eeb873bdfa9d0c Gerrit-Change-Number: 37334 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Fix missing COORD messages during IMS MT call test

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37336?usp=email ) Change subject: asterisk: Fix missing COORD messages during IMS MT call test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37336?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: I1aab078d52d31382933511e5ca9ec427e0552ce1 Gerrit-Change-Number: 37336 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jul 2024 13:30:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix seq_nr during MT calls

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37335?usp=email ) Change subject: asterisk: IMS: Fix seq_nr during MT calls ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37335?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: Ieeb9fb803ab3b1d02b5bfd8198702780914ec318 Gerrit-Change-Number: 37335 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jul 2024 13:30:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix Contact and URI headers during MT call precondition

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37334?usp=email ) Change subject: asterisk: IMS: Fix Contact and URI headers during MT call precondition ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37334?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: Id0036adf850d71eda92d6c0f07eeb873bdfa9d0c Gerrit-Change-Number: 37334 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jul 2024 13:30:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix To tag not updated when sending PRACK in MT call

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37333?usp=email ) Change subject: asterisk: IMS: Fix To tag not updated when sending PRACK in MT call ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37333?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: I55716b7a48b63bc97ea936904a712e53899f03f6 Gerrit-Change-Number: 37333 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jul 2024 13:30:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Avoid waiting for 183 to signal DedicatedBearerStatus Up

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37332?usp=email ) Change subject: asterisk: Avoid waiting for 183 to signal DedicatedBearerStatus Up ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37332?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: Icca6268f484d2a723d4d70de8755b7ec605b9194 Gerrit-Change-Number: 37332 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jul 2024 13:30:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[M] Change in docker-playground[master]: jenkins-common.sh: Store IP subnet prefix in global variable

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37331?usp=email ) Change subject: jenkins-common.sh: Store IP subnet prefix in global variable ...................................................................... jenkins-common.sh: Store IP subnet prefix in global variable Change-Id: Icc492aea1ddb91f672c7a0cec764b42711789fb6 --- M jenkins-common.sh M osmo-ran/jenkins.sh M ttcn3-asterisk-ims-ue-test/jenkins.sh M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-hss-test-ogs/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-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 24 files changed, 54 insertions(+), 41 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index 8ec6b29..af52b7f 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -2,6 +2,9 @@ KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)" DEBIAN_DEFAULT="bookworm" +SUB4_PREFIX="172.18" +SUB6_PREFIX="fd02:db8" + docker_image_exists() { test -n "$(docker images -q "$REPO_USER/$1")" } @@ -251,8 +254,8 @@ for i in $(seq 1 30); do SUBNET="$(echo "($SUBNET + 1) % 256" | bc)" NET_NAME="$SUITE_NAME-$SUBNET" - SUB4="172.18.$SUBNET.0/24" - SUB6="fd02:db8:$SUBNET::/64" + SUB4="$SUB4_PREFIX.$SUBNET.0/24" + SUB6="$SUB6_PREFIX:$SUBNET::/64" set +x echo "Creating network $NET_NAME, trying SUBNET=$SUBNET..." set -x @@ -291,8 +294,8 @@ network_clean network_remove fi - SUB4="172.18.$NET.0/24" - SUB6="fd02:db8:$NET::/64" + SUB4="$SUB4_PREFIX.$NET.0/24" + SUB6="$SUB6_PREFIX:$NET::/64" set +x echo "Creating network $NET_NAME" set -x @@ -300,7 +303,7 @@ --driver=bridge \ --subnet $SUB4 \ --ipv6 --subnet $SUB6 \ - -o "com.docker.network.bridge.host_binding_ipv4"="172.18.$NET.1" \ + -o "com.docker.network.bridge.host_binding_ipv4"="$SUB4_PREFIX.$NET.1" \ $NET_NAME } @@ -369,8 +372,8 @@ sed \ -i \ -E \ - -e "s/172\.18\.[0-9]{1,3}\./172.18.$SUBNET./g" \ - -e "s/fd02:db8:[0-9]{1,3}:/fd02:db8:$SUBNET:/g" \ + -e "s/172\.18\.[0-9]{1,3}\./$SUB4_PREFIX.$SUBNET./g" \ + -e "s/$SUB6_PREFIX:[0-9]{1,3}:/$SUB6_PREFIX:$SUBNET:/g" \ "$i" done @@ -383,7 +386,7 @@ docker_network_params() { NET=$1 ADDR_SUFIX=$2 - echo --network $NET_NAME --ip "172.18.$NET.$ADDR_SUFIX" --ip6 "fd02:db8:$NET::$ADDR_SUFIX" + echo --network $NET_NAME --ip "$SUB4_PREFIX.$NET.$ADDR_SUFIX" --ip6 "$SUB6_PREFIX:$NET::$ADDR_SUFIX" } fix_perms() { diff --git a/osmo-ran/jenkins.sh b/osmo-ran/jenkins.sh index 1b5d93a..120d2a0 100755 --- a/osmo-ran/jenkins.sh +++ b/osmo-ran/jenkins.sh @@ -9,6 +9,7 @@ "systemd" \ "osmo-ran$IMAGE_SUFFIX" +SUB4_PREFIX=${SUB4_PREFIX:-"172.18"} SUBNET=${SUBNET:-25} IPSUFFIX=200 NET_NAME="osmo-ran-subnet$SUBNET" @@ -20,7 +21,7 @@ mkdir $VOL_RAN_DIR/osmocom cp osmocom/* $VOL_RAN_DIR/osmocom/ -DOCKER_IN_IP="172.18.$SUBNET.$IPSUFFIX" +DOCKER_IN_IP="$SUB4_PREFIX.$SUBNET.$IPSUFFIX" SGSN_IP="${SGSN_IP:-192.168.30.1}" STP_IP="${STP_IP:-192.168.30.1}" TRX_IP="${TRX_IP:-192.168.30.100}" diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index eba4bd8..2e10f76 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -24,7 +24,7 @@ network_create network_replace_subnet_in_configs -SUBNET_IP_PREFIX="172.18.$SUBNET" +SUBNET_IP_PREFIX="$SUB4_PREFIX.$SUBNET" ASTERISK_IP_SUFFIX="10" TTCN3_IP_SUFFIX="103" IMSCORE_IP_SUFFIX="104" diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 219d813..e9a130d 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -59,7 +59,7 @@ /bin/sh -c "/usr/local/bin/respawn.sh \ osmo-bts-omldummy \ $BTS_FEATURES \ - 172.18.$SUBNET.20 \ + $SUB4_PREFIX.$SUBNET.20 \ $((i + 1234)) \ 1 \ >>/data/osmo-bts-omldummy-${i}.log 2>&1" @@ -70,7 +70,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 0a3128c..f0274ad 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -59,7 +59,7 @@ /bin/sh -c "/usr/local/bin/respawn.sh \ osmo-bts-omldummy \ $BTS_FEATURES \ - 172.18.$SUBNET.20 \ + $SUB4_PREFIX.$SUBNET.20 \ $(($1 + 1234)) \ $2 \ >>/data/osmo-bts-omldummy-$1.log 2>&1" @@ -74,7 +74,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 35415cd..40c00ac 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -72,11 +72,11 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ - -R 172.18.$SUBNET.20 \ - -r 172.18.$SUBNET.22 \ - --trx TRX1@172.18.$SUBNET.20:5700/1 \ - --trx TRX2@172.18.$SUBNET.20:5700/2 \ - --trx TRX3@172.18.$SUBNET.20:5700/3 \ + -R $SUB4_PREFIX.$SUBNET.20 \ + -r $SUB4_PREFIX.$SUBNET.22 \ + --trx TRX1@$SUB4_PREFIX.$SUBNET.20:5700/1 \ + --trx TRX2@$SUB4_PREFIX.$SUBNET.20:5700/2 \ + --trx TRX3@$SUB4_PREFIX.$SUBNET.20:5700/3 \ >>/data/fake_trx.out 2>&1" } @@ -91,7 +91,7 @@ $DOCKER_ARGS \ $REPO_USER/osmocom-bb-host-master \ /bin/sh -c "trxcon \ - -i 172.18.$SUBNET.21 \ + -i $SUB4_PREFIX.$SUBNET.21 \ -s /data/unix/osmocom_l2 \ >>/data/trxcon.log 2>&1" } @@ -116,7 +116,7 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4241" \ -v $VOL_BASE_DIR/bts-tester-${variant}:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 6026df0..584d0b7 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -33,7 +33,7 @@ $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4264" \ -v $VOL_BASE_DIR/cbc-tester:/data \ --name ${BUILD_TAG}-ttcn3-cbc-test \ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 72dc4af..9d90129 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -61,7 +61,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4246" \ -e "WAIT_FOR_NETDEV=hdlc8" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 861be39..c07f389 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -39,7 +39,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4246" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index bd0fae1..57ccfbb 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -61,13 +61,13 @@ -v "$KERNEL_TEST_DIR:/kernel-test:ro" -v "$CACHE_DIR:/cache" " - OSMO_SUT_HOST="172.18.$SUBNET.200" + OSMO_SUT_HOST="$SUB4_PREFIX.$SUBNET.200" else GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) " - OSMO_SUT_HOST="172.18.$SUBNET.201" + OSMO_SUT_HOST="$SUB4_PREFIX.$SUBNET.201" fi docker run --rm \ --cap-add=NET_ADMIN \ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 66d102e..c716add 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -34,7 +34,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4258" \ -v $VOL_BASE_DIR/hlr-tester:/data \ --name ${BUILD_TAG}-ttcn3-hlr-test \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 21647ed..d886378 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -67,7 +67,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4261" \ -v $base_dir/hnbgw-tester:/data \ -v $base_dir/unix:/data/unix \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index cdc47b0..d3ae816 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -38,7 +38,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4273" \ -v $VOL_BASE_DIR/hnodeb-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index eb60835..d8932aa 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -24,7 +24,7 @@ network_create network_replace_subnet_in_configs -MONGOD_ADDR="172.18.$SUBNET.103" +MONGOD_ADDR="$SUB4_PREFIX.$SUBNET.103" DBCTL="open5gs-dbctl --db_uri=mongodb://$MONGOD_ADDR/open5gs" # start container with mongod in background diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 5395fa3..4add209 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -34,7 +34,7 @@ --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_HOST=$SUB4_PREFIX.$SUBNET.180" \ -e "OSMO_SUT_PORT=4243" \ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 6a0f3d5..46844d5 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -51,7 +51,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4254" \ -v $VOL_BASE_DIR/msc-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index dcd0ce9..6147a73 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -46,7 +46,7 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.101" \ -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 158a352..281b00d 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -32,7 +32,7 @@ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \ /bin/sh -c "pcscd; \ osmo-remsim-bankd \ - -i 172.18.$SUBNET.10 \ + -i $SUB4_PREFIX.$SUBNET.10 \ >/data/osmo-remsim-bankd.log 2>&1" } diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 7eadd5d..03a630c 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -29,8 +29,8 @@ $DOCKER_ARGS \ $REPO_USER/osmo-stp-master \ /bin/sh -c "sccp_demo_user \ - -l 172.18.$SUBNET.200 \ - -r 172.18.$SUBNET.203 \ + -l $SUB4_PREFIX.$SUBNET.200 \ + -r $SUB4_PREFIX.$SUBNET.203 \ -C /data/sccp_demo_user.cfg \ >>/data/sccp_demo_user.log 2>&1" diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9238096..e1f40f6 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -49,7 +49,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4245" \ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 5ccbdf5..6558875 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -39,7 +39,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4256" \ -v $VOL_BASE_DIR/sip-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index ab284b3..5bcdcbe 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -47,7 +47,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4271" \ -v $VOL_BASE_DIR/smlc-tester:/data \ --name ${BUILD_TAG}-ttcn3-smlc-test \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index b1f02b9..9975f5e 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -40,7 +40,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.200" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.200" \ -e "OSMO_SUT_PORT=4239" \ -v $VOL_BASE_DIR/stp-tester:/data \ --name ${BUILD_TAG}-ttcn3-stp-test \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index 8bb19e2..47b892c 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -33,7 +33,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4275" \ -v $VOL_BASE_DIR/upf-tester:/data \ --name ${BUILD_TAG}-ttcn3-upf-test \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37331?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: Icc492aea1ddb91f672c7a0cec764b42711789fb6 Gerrit-Change-Number: 37331 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> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37330?usp=email ) Change subject: ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir ...................................................................... ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir Other files belonging to other containers are already placed in subdirs, so do the same for these ones too. Change-Id: Ie2b3de22df9ab155f42a717bccf718fccd388fc6 --- M ttcn3-asterisk-ims-ue-test/Dockerfile M ttcn3-asterisk-ims-ue-test/jenkins.sh R ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg R ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh 4 files changed, 16 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/ttcn3-asterisk-ims-ue-test/Dockerfile b/ttcn3-asterisk-ims-ue-test/Dockerfile index 1a2f8aa..3f37803 100644 --- a/ttcn3-asterisk-ims-ue-test/Dockerfile +++ b/ttcn3-asterisk-ims-ue-test/Dockerfile @@ -8,6 +8,7 @@ VOLUME /data -COPY Asterisk_Tests.cfg /data/Asterisk_Tests.cfg +COPY ttcn3/Asterisk_Tests.cfg /data/Asterisk_Tests.cfg +COPY ttcn3/ttcn3.sh /data/ttcn3.sh CMD ttcn3-docker-run asterisk Asterisk_Tests diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index a5da1d0..eba4bd8 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -15,8 +15,8 @@ mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester/unix -cp ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/ -cp Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/ +cp ttcn3/ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/ +cp ttcn3/Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/asterisk-ims-ue-tester/Asterisk_Tests.cfg" mkdir $VOL_BASE_DIR/asterisk diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg similarity index 100% rename from ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg rename to ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg diff --git a/ttcn3-asterisk-ims-ue-test/ttcn3.sh b/ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh similarity index 100% rename from ttcn3-asterisk-ims-ue-test/ttcn3.sh rename to ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37330?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: Ie2b3de22df9ab155f42a717bccf718fccd388fc6 Gerrit-Change-Number: 37330 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-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Avoid waiting for 183 to signal DedicatedBearerStatus Up

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37332?usp=email to look at the new patch set (#2). Change subject: asterisk: Avoid waiting for 183 to signal DedicatedBearerStatus Up ...................................................................... asterisk: Avoid waiting for 183 to signal DedicatedBearerStatus Up Change-Id: Icca6268f484d2a723d4d70de8755b7ec605b9194 --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/37332/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37332?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: Icca6268f484d2a723d4d70de8755b7ec605b9194 Gerrit-Change-Number: 37332 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Expect P-Early-Media supported in MO INVITE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37325?usp=email ) Change subject: asterisk: IMS: Expect P-Early-Media supported in MO INVITE ...................................................................... asterisk: IMS: Expect P-Early-Media supported in MO INVITE Change-Id: I21f2c84b50be9b16fc45fa1fe72af40d715ee883 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 1305e1d..51f96ea 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1413,6 +1413,7 @@ tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), ?, accept := tr_Accept(superset(tr_AcceptBody("application/sdp"), tr_AcceptBody("application/3gpp-ims+xml"))), + p_early_media := tr_P_Early_Media(superset("supported")), supported := tr_Supported(superset("timer")), body := ?); var charstring sip_expect_str := log2str(exp_req); @@ -1516,6 +1517,7 @@ g_pars.subscr.cp.to_addr, invite_via, g_pars.subscr.cp.sip_seq_nr, + p_early_media := ts_P_Early_Media({"recvonly"}), rseq := ts_RSeq(1), body := tx_sdp); SIP.send(tx_resp); diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index bfb3655..3d2112c 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -325,6 +325,16 @@ p_assoc_uris := p_assoc_uris } +// RFC5009 +template (present) P_Early_Media tr_P_Early_Media(template Em_param_List em_param_list := *) := { + fieldName := P_EARLY_MEDIA_E, + em_param_list := em_param_list +} +template (value) P_Early_Media ts_P_Early_Media(template (omit) Em_param_List em_param_list := omit) := { + fieldName := P_EARLY_MEDIA_E, + em_param_list := em_param_list +} + // [RFC6050] template (present) P_Preferred_Service tr_P_Preferred_Service(template (present) Service_ID_List p_ps := ?) := { fieldName := P_PREFERRED_SERVICE_E, @@ -738,6 +748,7 @@ template (omit) MinExpires minExpires := omit, template (omit) Min_SE min_SE := omit, template (omit) P_Associated_Uri p_associated_uri := omit, + template (omit) P_Early_Media p_early_media := omit, template (omit) RAck rack := omit, template (omit) Require require := omit, template (omit) RSeq rseq := omit, @@ -769,6 +780,7 @@ minExpires := minExpires, min_SE := min_SE, p_associated_uri := p_associated_uri, + p_Early_Media := p_early_media, rack := rack, require := require, rseq := rseq, @@ -799,6 +811,7 @@ template Expires expires := *, template Min_SE min_SE := *, template P_Associated_Uri p_associated_uri := *, + template P_Early_Media p_early_media := *, template RAck rack := *, template Require require := *, template RSeq rseq := *, @@ -829,6 +842,7 @@ fromField := from_addr, min_SE := min_SE, p_associated_uri := p_associated_uri, + p_Early_Media := p_early_media, rack := rack, require := require, rseq := rseq, @@ -905,6 +919,7 @@ template (value) Contact contact, integer seq_nr, template (omit) Accept accept := omit, + template (omit) P_Early_Media p_early_media := omit, template (omit) Min_SE min_SE := omit, template (omit) Session_expires session_expires := omit, template (omit) Supported supported := omit, @@ -917,6 +932,7 @@ content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), accept := accept, min_SE := min_SE, + p_early_media := p_early_media, session_expires := session_expires, supported := supported), messageBody := body, @@ -930,6 +946,7 @@ template Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr, template Accept accept := *, + template P_Early_Media p_early_media := *, template Min_SE min_SE := *, template Session_expires session_expires := *, template Supported supported := *, @@ -939,6 +956,7 @@ via, "INVITE", seq_nr, accept := accept, min_SE := min_SE, + p_early_media := p_early_media, session_expires := session_expires), messageBody := body, payload := omit @@ -1185,6 +1203,7 @@ Via via, integer seq_nr, charstring method := "INVITE", + template (omit) P_Early_Media p_early_media := omit, template (omit) Require require := ts_Require({"100rel", "precondition"}), template (omit) RSeq rseq := ts_RSeq(1), template (omit) charstring body := omit) := { @@ -1193,6 +1212,7 @@ via, content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + p_early_media := p_early_media, require := require, rseq := rseq), messageBody := body, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37325?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: I21f2c84b50be9b16fc45fa1fe72af40d715ee883 Gerrit-Change-Number: 37325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024