From 37d521218bbe1c91ebe20f625ede8f0a64f7e6b7 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Thu, 15 May 2025 12:59:38 -0700 Subject: [PATCH 1/4] Use --rtp_proxy_client option for the rtp.io case. Make RTPP_SOCK_RTP_IO overridable. --- functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions b/functions index 4b67815..799ee84 100755 --- a/functions +++ b/functions @@ -50,7 +50,7 @@ RTPP_SOCK_CUNIX="cunix:${BASEDIR}/rtpproxy.csock" RTPP_SOCK_UDP6="udp6:::1:22222" RTPP_SOCK_TCP="tcp:127.0.0.1:22222" RTPP_SOCK_TCP6="tcp6:::1:22222" -RTPP_SOCK_RTP_IO="rtp.io:" +RTPP_SOCK_RTP_IO="${RTPP_SOCK_RTP_IO:-"rtp.io:"}" fail_rc() { RC=${1} From aa48dd703e723f5c70a2eaa41a7417348edb946d Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Thu, 8 May 2025 17:00:28 -0700 Subject: [PATCH 2/4] Disable tcp6 / udp6 for now until the https://github.com/actions/runner-images/issues/12166 is resolved. --- .github/workflows/main.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25141cb..5b4a218 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,26 +33,20 @@ jobs: fail-fast: false matrix: mm-branch: ['master', '3.5', '3.4', '3.3', '3.2'] - rtppc-type: ['unix', 'udp', 'udp6', 'tcp', 'tcp6'] + rtppc-type: ['unix', 'udp', 'tcp'] include: - mm-branch: '2.4' rtppc-type: 'unix' - mm-branch: '2.4' rtppc-type: 'udp' - - mm-branch: '2.4' - rtppc-type: 'udp6' - mm-branch: '3.0' rtppc-type: 'unix' - mm-branch: '3.0' rtppc-type: 'udp' - - mm-branch: '3.0' - rtppc-type: 'udp6' - mm-branch: '3.1' rtppc-type: 'unix' - mm-branch: '3.1' rtppc-type: 'udp' - - mm-branch: '3.1' - rtppc-type: 'udp6' # Alice->OpenSIPS(RFC8760)->Bob opensips_rfc8760: @@ -66,7 +60,7 @@ jobs: strategy: fail-fast: false matrix: - rtppc-type: ['unix', 'udp', 'udp6', 'tcp', 'tcp6'] + rtppc-type: ['unix', 'udp', 'tcp'] mm-auth: ['passtr', 'UAC', 'UAS/auth', 'UAS/auth_db/calculate_ha1', 'UAS/auth_db/ha1'] # Alice->Sippy Python B2B->Bob @@ -81,8 +75,8 @@ jobs: strategy: fail-fast: false matrix: - mm-branch: ['master', 'PRACK'] - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] + mm-branch: ['wip', 'PRACK'] + rtppc-type: ['unix', 'cunix', 'udp', 'tcp'] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13-dev'] # Alice->Sippy GO B2B->Bob @@ -95,7 +89,7 @@ jobs: strategy: fail-fast: false matrix: - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] + rtppc-type: ['unix', 'cunix', 'udp', 'tcp'] # Alice->Kamailio->Bob kamailio: @@ -109,7 +103,7 @@ jobs: fail-fast: false matrix: mm-branch: ['master', '6.0', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '4.4'] - rtppc-type: ['unix', 'udp', 'udp6'] + rtppc-type: ['unix', 'udp'] publish: needs: [opensips, opensips_rfc8760, sippy_py_b2bua, sippy_go_b2bua, kamailio] From 36dc6e865f35b50ec992a2ac85373d6b8d5396ce Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Fri, 23 May 2025 19:07:17 -0700 Subject: [PATCH 3/4] Use correct method (test_reinvite.on_reinvite_failed, not a_test1.on_reinvite...). --- test_cases/reinv_bad_ack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_cases/reinv_bad_ack.py b/test_cases/reinv_bad_ack.py index ae17da5..4678e27 100644 --- a/test_cases/reinv_bad_ack.py +++ b/test_cases/reinv_bad_ack.py @@ -52,7 +52,7 @@ def on_reinvite_connected(self, ua): def on_reinvite_failed(self, ua, event): if isinstance(event, CCEventFail): ua.global_config['_sip_tm'].sendACK(ua.tr) - a_test1.on_reinvite_failed(self, ua, event) + test_reinvite.on_reinvite_failed(self, ua, event) def disconnect(self, ua): if not self.disconnect_done: From a1aace219c94764f5aa5e3b94ee63629d374895a Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Fri, 23 May 2025 19:10:10 -0700 Subject: [PATCH 4/4] Update counters to match b2bua code. --- rtpproxy.b2bua.output | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtpproxy.b2bua.output b/rtpproxy.b2bua.output index 20b084e..7032e9d 100644 --- a/rtpproxy.b2bua.output +++ b/rtpproxy.b2bua.output @@ -1,5 +1,5 @@ nsess_created=48 nsess_destroyed=44 nsess_timeout=4 nsess_complete=30 nsess_nortp=26 nsess_owrtp=0 nsess_nortcp=26 nsess_owrtcp=0 -ncmds_rcvd=171 ncmds_succd=166 ncmds_errs=4 ncmds_repld=170 +ncmds_rcvd=172 ncmds_succd=167 ncmds_errs=4 ncmds_repld=171 nsess_created=48 nsess_destroyed=48 nsess_timeout=8 nsess_complete=30 nsess_nortp=30 nsess_owrtp=0 nsess_nortcp=30 nsess_owrtcp=0 -ncmds_rcvd=177 ncmds_succd=168 ncmds_errs=8 ncmds_repld=176 +ncmds_rcvd=178 ncmds_succd=169 ncmds_errs=8 ncmds_repld=177 MEMDEB(rtpproxy): all clear