From 92c0afb48c80fa05746c5905228e8ee285a165ad Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 10 Apr 2023 20:38:30 -0700 Subject: [PATCH 01/10] Allow sub-class has its own handler for re-INVITE failure transaction. This is needed in case of bad-ACK generator in case when re-INVITE fails to not keep UAS sending us retransmits over and over again. --- test_cases/reinv_bad_ack.py | 7 +++++++ test_cases/reinvite.py | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/test_cases/reinv_bad_ack.py b/test_cases/reinv_bad_ack.py index 2e48c20..7f83560 100644 --- a/test_cases/reinv_bad_ack.py +++ b/test_cases/reinv_bad_ack.py @@ -26,6 +26,8 @@ from .t1 import a_test1, b_test1 from .reinvite import test_reinvite +from sippy.CCEvents import CCEventFail + class a_test_reinv_bad_ack(test_reinvite, a_test1): cld = 'bob_reinv_bad_ack' cli = 'alice_reinv_bad_ack' @@ -46,6 +48,11 @@ def on_reinvite_connected(self, ua): ua.tr.ack.getHFBody('cseq').cseq = 0 ua.global_config['_sip_tm'].sendACK(ua.tr) + 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) + def disconnect(self, ua): if not self.disconnect_done: self.nerrs += 1 diff --git a/test_cases/reinvite.py b/test_cases/reinvite.py index 0e6b075..3712534 100644 --- a/test_cases/reinvite.py +++ b/test_cases/reinvite.py @@ -81,17 +81,22 @@ def recvEvent(self, event, ua): elif (isinstance(event, CCEventDisconnect) or \ isinstance(event, CCEventFail)): self.nerrs += 1 - raise ScenarioFailure('%s: re-INVITE has failed' % (self.failed_msg(),)) rval = super(test_reinvite, self).recvEvent(event, ua) if isinstance(event, CCEventConnect): self.reinvite_done = True self.on_reinvite_connected(ua) #print('self.reinvite_done = True') + elif isinstance(event, CCEventDisconnect) or \ + isinstance(event, CCEventFail): + self.on_reinvite_failed(ua, event) return rval def on_reinvite_connected(self, ua): pass + def on_reinvite_failed(self, ua, event): + raise ScenarioFailure('%s: re-INVITE has failed' % (self.failed_msg(),)) + def process_reinvite(self, ua): if self.reinv_answ_delay > 0: Timeout(self._process_reinvite, self.reinv_answ_delay, 1, \ From 5d5a041dfcc66f0a49397e0185474fd23c057e11 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 10 Apr 2023 20:48:25 -0700 Subject: [PATCH 02/10] Allow actions in branches. --- .github/workflows/RFC8760.yml | 4 ++-- .github/workflows/b2bua.yml | 4 ++-- .github/workflows/go-b2bua.yml | 4 ++-- .github/workflows/kamailio.yml | 4 ++-- .github/workflows/opensips.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/RFC8760.yml b/.github/workflows/RFC8760.yml index 39e9ed7..df1b44e 100644 --- a/.github/workflows/RFC8760.yml +++ b/.github/workflows/RFC8760.yml @@ -6,9 +6,9 @@ name: Alice->OpenSIPS(RFC8760)->Bob on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] +# branches: [ master ] pull_request: - branches: [ master ] +# branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/b2bua.yml b/.github/workflows/b2bua.yml index 38f4567..1814031 100644 --- a/.github/workflows/b2bua.yml +++ b/.github/workflows/b2bua.yml @@ -6,9 +6,9 @@ name: Alice->Sippy Python B2B->Bob on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] +# branches: [ master ] pull_request: - branches: [ master ] +# branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/go-b2bua.yml b/.github/workflows/go-b2bua.yml index a14324f..4b45e0c 100644 --- a/.github/workflows/go-b2bua.yml +++ b/.github/workflows/go-b2bua.yml @@ -6,9 +6,9 @@ name: Alice->Sippy GO B2B->Bob on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] +# branches: [ master ] pull_request: - branches: [ master ] +# branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/kamailio.yml b/.github/workflows/kamailio.yml index 108cfc2..55cfe39 100644 --- a/.github/workflows/kamailio.yml +++ b/.github/workflows/kamailio.yml @@ -6,9 +6,9 @@ name: Alice->Kamailio->Bob on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] +# branches: [ master ] pull_request: - branches: [ master ] +# branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index c03ffcf..cf95047 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -6,9 +6,9 @@ name: Alice->OpenSIPS->Bob on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] +# branches: [ master ] pull_request: - branches: [ master ] +# branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 4dcf44d4d9773f16f03039f5c9658416becb2b0f Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 10 Apr 2023 21:22:45 -0700 Subject: [PATCH 03/10] Goodbye Python 2.7, it's time to move on New horizons await, with Python 3 as our dawn With better features and security too We bid farewell to the old, and welcome the new. --- .github/workflows/RFC8760.yml | 4 ++-- .github/workflows/b2bua.yml | 2 +- .github/workflows/go-b2bua.yml | 4 ++-- .github/workflows/kamailio.yml | 4 ++-- .github/workflows/opensips.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/RFC8760.yml b/.github/workflows/RFC8760.yml index df1b44e..3d80c66 100644 --- a/.github/workflows/RFC8760.yml +++ b/.github/workflows/RFC8760.yml @@ -29,8 +29,8 @@ jobs: MM_AUTH: ${{ matrix.mm-auth }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.8' - PYTHON_CMD: "python3.8" + python-version: '3.10' + PYTHON_CMD: "python3.10" strategy: matrix: diff --git a/.github/workflows/b2bua.yml b/.github/workflows/b2bua.yml index 1814031..4a0a437 100644 --- a/.github/workflows/b2bua.yml +++ b/.github/workflows/b2bua.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: - python-version: ['2.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] mm-branch: ['master', 'PRACK'] rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] diff --git a/.github/workflows/go-b2bua.yml b/.github/workflows/go-b2bua.yml index 4b45e0c..961af68 100644 --- a/.github/workflows/go-b2bua.yml +++ b/.github/workflows/go-b2bua.yml @@ -27,8 +27,8 @@ jobs: MM_BRANCH: master RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.8' - PYTHON_CMD: "python3.8" + python-version: '3.10' + PYTHON_CMD: "python3.10" strategy: matrix: diff --git a/.github/workflows/kamailio.yml b/.github/workflows/kamailio.yml index 55cfe39..c13b722 100644 --- a/.github/workflows/kamailio.yml +++ b/.github/workflows/kamailio.yml @@ -27,8 +27,8 @@ jobs: MM_BRANCH: ${{ matrix.mm-branch }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.8' - PYTHON_CMD: "python3.8" + python-version: '3.10' + PYTHON_CMD: "python3.10" strategy: matrix: diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index cf95047..be9735c 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -27,8 +27,8 @@ jobs: MM_BRANCH: ${{ matrix.mm-branch }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.8' - PYTHON_CMD: "python3.8" + python-version: '3.10' + PYTHON_CMD: "python3.10" strategy: matrix: From a753256700f5ad0019119d8d8e4cc08036be3eb6 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 29 May 2023 02:37:50 -0700 Subject: [PATCH 04/10] Clean up workspace. --- .github/workflows/RFC8760.yml | 71 ---------------------------------- .github/workflows/b2bua.yml | 63 ------------------------------ .github/workflows/go-b2bua.yml | 64 ------------------------------ .github/workflows/kamailio.yml | 62 ----------------------------- 4 files changed, 260 deletions(-) delete mode 100644 .github/workflows/RFC8760.yml delete mode 100644 .github/workflows/b2bua.yml delete mode 100644 .github/workflows/go-b2bua.yml delete mode 100644 .github/workflows/kamailio.yml diff --git a/.github/workflows/RFC8760.yml b/.github/workflows/RFC8760.yml deleted file mode 100644 index 3d80c66..0000000 --- a/.github/workflows/RFC8760.yml +++ /dev/null @@ -1,71 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->OpenSIPS(RFC8760)->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "30 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ${{ matrix.os }} - env: - MM_TYPE: opensips - MM_BRANCH: master - MM_REPO: https://github.com/OpenSIPS/opensips.git - MM_AUTH: ${{ matrix.mm-auth }} - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.10' - PYTHON_CMD: "python3.10" - - strategy: - matrix: - os: [ubuntu-latest] - rtppc-type: ['unix', 'udp', 'udp6', 'tcp', 'tcp6'] - mm-auth: ['passtr', 'UAC', 'UAS/auth', 'UAS/auth_db/calculate_ha1', 'UAS/auth_db/ha1'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - with: - ref: master - - - name: Set up Python ${{ env.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ env.python-version }} - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - name: transform_var - id: transform_var - run: echo "::set-output name=mm_auth::`echo ${{ matrix.mm-auth }} | sed 's|/|.|g'`" - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.rtppc-type }}_${{ steps.transform_var.outputs.mm_auth }} - path: | - opensips.cfg - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/b2bua.yml b/.github/workflows/b2bua.yml deleted file mode 100644 index 4a0a437..0000000 --- a/.github/workflows/b2bua.yml +++ /dev/null @@ -1,63 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Sippy Python B2B->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "0 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - env: - MM_TYPE: b2bua - MM_BRANCH: ${{ matrix.mm-branch }} - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - PYTHON_CMD: "python${{ matrix.python-version }}" - - strategy: - matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - mm-branch: ['master', 'PRACK'] - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.python-version }}_${{ matrix.mm-branch }}_${{ matrix.rtppc-type }} - path: | - b2bua.log - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/go-b2bua.yml b/.github/workflows/go-b2bua.yml deleted file mode 100644 index 961af68..0000000 --- a/.github/workflows/go-b2bua.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Sippy GO B2B->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "10 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - env: - MM_TYPE: go-b2bua - MM_BRANCH: master - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.10' - PYTHON_CMD: "python3.10" - - strategy: - matrix: - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ env.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ env.python-version }} - - - name: Install Golang - run: sudo apt-get update && sudo apt-get -y install golang-go - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.rtppc-type }} - path: | - b2bua.log - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/kamailio.yml b/.github/workflows/kamailio.yml deleted file mode 100644 index c13b722..0000000 --- a/.github/workflows/kamailio.yml +++ /dev/null @@ -1,62 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Kamailio->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "20 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-20.04 - env: - MM_TYPE: kamailio - MM_BRANCH: ${{ matrix.mm-branch }} - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.10' - PYTHON_CMD: "python3.10" - - strategy: - matrix: - mm-branch: ['master', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0', '4.4', '4.3', '4.2'] - rtppc-type: ['unix', 'udp', 'udp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ env.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ env.python-version }} - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.mm-branch }}_${{ matrix.rtppc-type }} - path: | - kamailio.cfg - bob.log - alice.log - rtpproxy.log From e90da63ffa86a89374c478ffe243bb3a7f99248d Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 29 May 2023 02:38:07 -0700 Subject: [PATCH 05/10] Test a specific revision. --- .github/workflows/opensips.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index be9735c..239cb88 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - mm-branch: ['master', '3.3', '3.2', '3.1', '3.0', '2.4'] + mm-branch: ['master', '7eb2c1c21069942d06e7e7674548ef2372563fa4'] rtppc-type: ['unix', 'udp', 'udp6'] include: - mm-branch: 'master' From a24c45c8986b063ba3bcc68da2c495a2bbd69b76 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 29 May 2023 02:43:02 -0700 Subject: [PATCH 06/10] Test range of revisions one of which is believed to be faulty. --- .github/workflows/opensips.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index 239cb88..955697f 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -25,6 +25,7 @@ jobs: env: MM_TYPE: opensips MM_BRANCH: ${{ matrix.mm-branch }} + MM_REV: ${{ matrix.mm-rev }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} python-version: '3.10' @@ -33,7 +34,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - mm-branch: ['master', '7eb2c1c21069942d06e7e7674548ef2372563fa4'] + mm-branch: ['master'] + mm-rev: ['63309e55fae3c774bac29a3be365a48fc50c3f03', 'd572bd423f1af1b0931a51d566a0c4989dee4732', '712fdd2d0337caad088a7fab668e9fe3b739a359', 'efd40feee29f347be8acd2d60a2ee3229a5d4001', '77435247076a001a32b351d6c253462aad9e1259', '672540900f4e2a262978369853795dcf85420cd4', 'b3644964573d7083001e2fbf12d4580808b664dc', '7eb2c1c21069942d06e7e7674548ef2372563fa4'] rtppc-type: ['unix', 'udp', 'udp6'] include: - mm-branch: 'master' From 7c5572e5b58c21cd1c8d2bdc3605102c8f6c883c Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 29 May 2023 02:55:43 -0700 Subject: [PATCH 07/10] Exclude revs that are too old. --- .github/workflows/opensips.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index 955697f..7ad5e04 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -35,7 +35,7 @@ jobs: matrix: os: [ubuntu-latest] mm-branch: ['master'] - mm-rev: ['63309e55fae3c774bac29a3be365a48fc50c3f03', 'd572bd423f1af1b0931a51d566a0c4989dee4732', '712fdd2d0337caad088a7fab668e9fe3b739a359', 'efd40feee29f347be8acd2d60a2ee3229a5d4001', '77435247076a001a32b351d6c253462aad9e1259', '672540900f4e2a262978369853795dcf85420cd4', 'b3644964573d7083001e2fbf12d4580808b664dc', '7eb2c1c21069942d06e7e7674548ef2372563fa4'] + mm-rev: ['0da5765655c4c54471929042629e2f51484826bb', '63309e55fae3c774bac29a3be365a48fc50c3f03', 'd572bd423f1af1b0931a51d566a0c4989dee4732', '712fdd2d0337caad088a7fab668e9fe3b739a359', 'efd40feee29f347be8acd2d60a2ee3229a5d4001', '77435247076a001a32b351d6c253462aad9e1259', '672540900f4e2a262978369853795dcf85420cd4', 'b3644964573d7083001e2fbf12d4580808b664dc'] rtppc-type: ['unix', 'udp', 'udp6'] include: - mm-branch: 'master' @@ -44,15 +44,6 @@ jobs: - mm-branch: 'master' os: ubuntu-latest rtppc-type: 'tcp6' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'unix' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'udp' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'udp6' # Steps represent a sequence of tasks that will be executed as part of the job steps: From 3423c3d8d017c3469fcbc615cf8bfe48ae073b56 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Mon, 29 May 2023 07:53:39 -0700 Subject: [PATCH 08/10] Limit to just two revisionss. --- .github/workflows/opensips.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index 7ad5e04..eadd52e 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -35,7 +35,7 @@ jobs: matrix: os: [ubuntu-latest] mm-branch: ['master'] - mm-rev: ['0da5765655c4c54471929042629e2f51484826bb', '63309e55fae3c774bac29a3be365a48fc50c3f03', 'd572bd423f1af1b0931a51d566a0c4989dee4732', '712fdd2d0337caad088a7fab668e9fe3b739a359', 'efd40feee29f347be8acd2d60a2ee3229a5d4001', '77435247076a001a32b351d6c253462aad9e1259', '672540900f4e2a262978369853795dcf85420cd4', 'b3644964573d7083001e2fbf12d4580808b664dc'] + mm-rev: ['0da5765655c4c54471929042629e2f51484826bb', 'b3644964573d7083001e2fbf12d4580808b664dc'] rtppc-type: ['unix', 'udp', 'udp6'] include: - mm-branch: 'master' From 973974fc1054a2f77146974eb2abc42f5fe160f1 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Tue, 30 May 2023 03:45:30 -0700 Subject: [PATCH 09/10] -E option has been deprecated and replaced with a configuration parameter in opensips master / 3.4, so adjust scripts and config accordingly. --- scenarios/UAC/opensips.cfg.in | 5 +++++ scenarios/UAS/auth/opensips.cfg.in | 5 +++++ scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in | 5 +++++ scenarios/UAS/auth_db/ha1/opensips.cfg.in | 5 +++++ scenarios/passtr/opensips.cfg.in | 5 +++++ scenarios/simple/opensips.cfg.in | 5 +++++ test_run.sh | 7 ++++++- 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/scenarios/UAC/opensips.cfg.in b/scenarios/UAC/opensips.cfg.in index 3f6e309..9125c0d 100644 --- a/scenarios/UAC/opensips.cfg.in +++ b/scenarios/UAC/opensips.cfg.in @@ -33,6 +33,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/scenarios/UAS/auth/opensips.cfg.in b/scenarios/UAS/auth/opensips.cfg.in index 5233c7b..5d90fbe 100644 --- a/scenarios/UAS/auth/opensips.cfg.in +++ b/scenarios/UAS/auth/opensips.cfg.in @@ -39,6 +39,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in b/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in index 2e10644..a8adbf7 100644 --- a/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in +++ b/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in @@ -43,6 +43,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/scenarios/UAS/auth_db/ha1/opensips.cfg.in b/scenarios/UAS/auth_db/ha1/opensips.cfg.in index d244521..c7d89bc 100644 --- a/scenarios/UAS/auth_db/ha1/opensips.cfg.in +++ b/scenarios/UAS/auth_db/ha1/opensips.cfg.in @@ -43,6 +43,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/scenarios/passtr/opensips.cfg.in b/scenarios/passtr/opensips.cfg.in index 5683acc..6abe475 100644 --- a/scenarios/passtr/opensips.cfg.in +++ b/scenarios/passtr/opensips.cfg.in @@ -70,6 +70,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/scenarios/simple/opensips.cfg.in b/scenarios/simple/opensips.cfg.in index 8f47d88..a9ad5d1 100644 --- a/scenarios/simple/opensips.cfg.in +++ b/scenarios/simple/opensips.cfg.in @@ -54,6 +54,11 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 +#if OPENSIPS_VER_FULL == master +stderror_enabled=yes +syslog_enabled=no +#endif + route { XLOG("OpenSIPS received a request $rm from $si\n"); ## initial sanity checks -- messages with diff --git a/test_run.sh b/test_run.sh index c93287b..fcfc717 100755 --- a/test_run.sh +++ b/test_run.sh @@ -81,7 +81,12 @@ start_mm() { echo "--- Config Begins ---" cat -n "${MM_CFG}" echo "--- Config Ends ---" - ${BUILDDIR}/dist/opensips/opensips -f "${MM_CFG}" ${MM_ARGS} -F -E -n 1 & + _MM_ARGS="-f ${MM_CFG} ${MM_ARGS} -F -n 1" + if [ "${MM_BRANCH}" != "master" ] + then + _MM_ARGS="${_MM_ARGS} -E" + fi + ${BUILDDIR}/dist/opensips/opensips ${_MM_ARGS} & MM_PID=${!} ALICE_ARGS="-46" ;; From 12d4e704d7daa24e17f14daed464802ee69c8160 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Tue, 30 May 2023 03:53:51 -0700 Subject: [PATCH 10/10] Test the broken revision and the last revision. --- .github/workflows/opensips.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index eadd52e..9a3b295 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -35,15 +35,8 @@ jobs: matrix: os: [ubuntu-latest] mm-branch: ['master'] - mm-rev: ['0da5765655c4c54471929042629e2f51484826bb', 'b3644964573d7083001e2fbf12d4580808b664dc'] + mm-rev: ['b3644964573d7083001e2fbf12d4580808b664dc', 'e00300c46178eb0e22d3bc062b6fc0abf63ca9fb'] rtppc-type: ['unix', 'udp', 'udp6'] - include: - - mm-branch: 'master' - os: ubuntu-latest - rtppc-type: 'tcp' - - mm-branch: 'master' - os: ubuntu-latest - rtppc-type: 'tcp6' # Steps represent a sequence of tasks that will be executed as part of the job steps: