- sr-dev - kamailio.org

[kamailio/kamailio] pkg: RPM packaging add kamailio-tls_wolfssl subpackage (PR #3591)
by space88man 05 Oct '23

05 Oct '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3591 -- Commit Summary -- * pkg: RPM packaging add kamailio-tls_wolfssl subpackage -- File Changes -- M pkg/kamailio/obs/kamailio.spec (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3591.patch https://github.com/kamailio/kamailio/pull/3591.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3591 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3591(a)github.com>

1 1

git:master:f04f8539: examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine
by Daniel-Constantin Mierla 05 Oct '23

05 Oct '23

Module: kamailio Branch: master Commit: f04f8539fccfc2afefb5e0badb4747adead2e378 URL: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-05T07:56:24+02:00 examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… Patch: https://github.com/kamailio/kamailio/commit/f04f8539fccfc2afefb5e0badb4747a… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index d3de2688243..fe9b131f570 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -340,7 +340,7 @@ end -- RTPProxy control function ksr_route_natmanage() - if not KSR.rtpproxy then + if not KSR.rtpproxy and not KSR.rtpengine then return 1; end if KSR.siputils.is_request()>0 then @@ -354,7 +354,19 @@ function ksr_route_natmanage() return 1; end - KSR.rtpproxy.rtpproxy_manage("co"); + if KSR.kx.ifdef('WITH_RTPENGINE') then + if KSR.nathelper.nat_uac_test(8)>0 then + KSR.rtpengine.rtpengine_manage("replace-origin replace-session-connection SIP-source-address"); + else + KSR.rtpengine.rtpengine_manage("replace-origin replace-session-connection"); + end + elseif KSR.kx.ifdef('WITH_RTPPROXY') then + if KSR.nathelper.nat_uac_test(8)>0 then + KSR.rtpproxy.rtpproxy_manage("co"); + else + KSR.rtpproxy.rtpproxy_manage("cor"); + end + end if KSR.siputils.is_request()>0 then if KSR.siputils.has_totag()<0 then

1 0

[kamailio/kamailio] examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine (PR #3587)
by Дилян Палаузов 05 Oct '23

05 Oct '23

A while ago I wanted to adjust my Lua configuration to work with rtpengine and I have adjusted this example accordingly. I have not tried the example, but if there are no obvious bugs with it, I think it will be useful. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3587 -- Commit Summary -- * examples/kamailio-basic-kemi-lua.lua: Add example for rtpengine -- File Changes -- M misc/examples/kemi/kamailio-basic-kemi-lua.lua (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3587.patch https://github.com/kamailio/kamailio/pull/3587.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3587 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3587(a)github.com>

2 2

git:master:ec14d709: tls_wolfssl: update to v5.6.3-stable of wolfSSL
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: ec14d7094374f6cb6184c997ec35951ba0134933 URL: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:22:24+08:00 tls_wolfssl: update to v5.6.3-stable of wolfSSL --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… Patch: https://github.com/kamailio/kamailio/commit/ec14d7094374f6cb6184c997ec35951… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index a7635da9e64..3b3c175af0e 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit a7635da9e64a43028d2f8f14bce75e4bed39f162 +Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f

1 0

git:5.7:ee9ed433: tls_wolfssl: clean up build
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: 5.7 Commit: ee9ed43318c8e49432445d33b475c67a3643d761 URL: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:15:45+08:00 tls_wolfssl: clean up build Allow module to build if user specifies prefix= exec-prefix= on commandline Cherry-pick from a327cc0e3e --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… Patch: https://github.com/kamailio/kamailio/commit/ee9ed43318c8e49432445d33b475c67… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..730076023a9 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,14 +23,14 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ --disable-aligndata --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) install + @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:a327cc0e: tls_wolfssl: clean up build
by S-P Chan 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: a327cc0e3e0a2d99680840667ba2985857fbe7fa URL: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-05T01:09:25+08:00 tls_wolfssl: clean up build Allow module to build if user specifies prefix= exec-prefix= on commandline --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… Patch: https://github.com/kamailio/kamailio/commit/a327cc0e3e0a2d99680840667ba2985… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 75ec31b204d..730076023a9 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,14 +23,14 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ --disable-aligndata --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) install + @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:ac0ecee2: github: move permissions definitions to jobs [skip ci]
by Victor Seva 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: ac0ecee2932f4dc1243847ece4d03d27601778a8 URL: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-04T15:43:31+02:00 github: move permissions definitions to jobs [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/cifuzz.yml Modified: .github/workflows/codeql.yml Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… Patch: https://github.com/kamailio/kamailio/commit/ac0ecee2932f4dc1243847ece4d03d2… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 33f4dc08884..511fad53447 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,13 +10,13 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} -permissions: - contents: read - packages: write + jobs: x86_64: runs-on: ubuntu-latest - + permissions: + contents: read + packages: write steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index d376f8a1b3c..a8294516c2a 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -4,11 +4,11 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" -permissions: - contents: read jobs: Fuzzing: runs-on: ubuntu-latest + permissions: + contents: read steps: - name: Build Fuzzers id: build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b6837bbdd0b..71c8e66cb6c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,8 +5,6 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" -permissions: - contents: read jobs: analyze: name: Analyze diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04885eaf034..8f1d028cda8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,11 +6,11 @@ name: build - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -permissions: - contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} volumes: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bfba0702bdf..a2fc539ddfc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,11 +6,11 @@ name: checks_pr - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -permissions: - contents: read # to fetch code (actions/checkout) jobs: check-format: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) steps: - uses: actions/checkout@v4 - uses: wolletd/clang-format-checker(a)v1.10 @@ -18,6 +18,8 @@ jobs: target-ref: master build: runs-on: ubuntu-latest + permissions: + contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} volumes:

1 0

git:master:d9111c69: pv: removed unnecessary break
by Daniel-Constantin Mierla 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: d9111c6978cdbb2742eb1ea7fd16dcb083a2c6f4 URL: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-04T10:21:44+02:00 pv: removed unnecessary break --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… Patch: https://github.com/kamailio/kamailio/commit/d9111c6978cdbb2742eb1ea7fd16dcb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index cb70b70ae41..7fe2901613b 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4623,7 +4623,6 @@ int pv_get_via_attr( return pv_get_null(msg, param, res); } return pv_get_sintval(msg, param, res, ocv.oc); - break; case 10: /* oc-algo */ if(parse_via_oc(msg, vb, &ocv) < 0) { return pv_get_null(msg, param, res);

1 0

git:master:b5cf0da2: pv: return via variable oc value as it is
by Daniel-Constantin Mierla 04 Oct '23

04 Oct '23

Module: kamailio Branch: master Commit: b5cf0da2fbae5ed0b887b0323b8bf8a44e29d80d URL: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-04T09:46:37+02:00 pv: return via variable oc value as it is --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… Patch: https://github.com/kamailio/kamailio/commit/b5cf0da2fbae5ed0b887b0323b8bf8a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 50e1abbd485..cb70b70ae41 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4622,11 +4622,7 @@ int pv_get_via_attr( if(parse_via_oc(msg, vb, &ocv) < 0) { return pv_get_null(msg, param, res); } - if(ocv.oc == 1) { - return pv_get_sintval(msg, param, res, 1); - } else { - return pv_get_sintval(msg, param, res, 2); - } + return pv_get_sintval(msg, param, res, ocv.oc); break; case 10: /* oc-algo */ if(parse_via_oc(msg, vb, &ocv) < 0) {

1 0

git:master:d2d17049: github: move login to ghcr.io on top [skip ci]
by Victor Seva 03 Oct '23

03 Oct '23

Module: kamailio Branch: master Commit: d2d17049b5e82b497c44b6b4a2a461917eaed4bb URL: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-03T08:45:56+02:00 github: move login to ghcr.io on top [skip ci] --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… Patch: https://github.com/kamailio/kamailio/commit/d2d17049b5e82b497c44b6b4a2a4619… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index afddd299f74..33f4dc08884 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -31,6 +31,14 @@ jobs: if: ${{ github.event_name == 'schedule' }} run: test -z "$(git rev-list --after='24 hours' ${{ github.sha }})" && echo "should_run=false" >> $GITHUB_OUTPUT || echo "should_run=true" >> $GITHUB_OUTPUT + - name: Login to GitHub Container Registry + if: ${{ steps.should_run.outputs.should_run != 'false' }} + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Compile Kamailio source if: ${{ steps.should_run.outputs.should_run != 'false' }} run: | @@ -93,14 +101,6 @@ jobs: suffix=-debug latest=false - - name: Login to GitHub Container Registry - if: ${{ steps.should_run.outputs.should_run != 'false' }} - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: temporal workarround for "-alpine" and "-debug" builds if: ${{ steps.should_run.outputs.should_run != 'false' }} run: |

1 0

git:master:2bf06119: github: define alpine permissions [skip ci]
by Victor Seva 03 Oct '23

03 Oct '23

Module: kamailio Branch: master Commit: 2bf06119773761ceb1446d3742c158d7f29fbda1 URL: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-03T08:40:26+02:00 github: define alpine permissions [skip ci] > unauthorized: access token has insufficient scopes --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… Patch: https://github.com/kamailio/kamailio/commit/2bf06119773761ceb1446d3742c158d… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index f6ced16554b..afddd299f74 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,7 +10,9 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} - +permissions: + contents: read + packages: write jobs: x86_64: runs-on: ubuntu-latest

1 0

git:master:6b6c0663: corex: reformat exports structures
by Daniel-Constantin Mierla 02 Oct '23

02 Oct '23

Module: kamailio Branch: master Commit: 6b6c0663d3ae894e8e686eb32288f71387739cc7 URL: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-02T11:48:41+02:00 corex: reformat exports structures --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_rpc.c Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71… Patch: https://github.com/kamailio/kamailio/commit/6b6c0663d3ae894e8e686eb32288f71…

1 0

git:master:0f4058a7: core: check if status with filter is implemented by memory manager
by Daniel-Constantin Mierla 02 Oct '23

02 Oct '23

Module: kamailio Branch: master Commit: 0f4058a7ff0abb59785d2d1dd3e65517ab4ceaa4 URL: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-02T11:01:44+02:00 core: check if status with filter is implemented by memory manager --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… Patch: https://github.com/kamailio/kamailio/commit/0f4058a7ff0abb59785d2d1dd3e6551… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 9a6b9dac2b1..540ac22ceb0 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -65,8 +65,14 @@ void pkg_print_manager(void); #endif #define pkg_status() _pkg_root.xstatus(_pkg_root.mem_block) -#define pkg_status_filter(fmatch, fp) \ - _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp) +#define pkg_status_filter(fmatch, fp) \ + do { \ + if(_pkg_root.xstatus_filter) { \ + _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp); \ + } else { \ + LM_ERR("pkg status with filter not implemented\n"); \ + } \ + while(0) #define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) #define pkg_report(mr) _pkg_root.xreport(_pkg_root.mem_block, mr) #define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 9cdadc10618..6d3a855fa7c 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -87,8 +87,14 @@ extern sr_shm_api_t _shm_root; #endif #define shm_status() _shm_root.xstatus(_shm_root.mem_block) -#define shm_status_filter(fmatch, fp) \ - _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp) +#define shm_status_filter(fmatch, fp) \ + do { \ + if(_shm_root.xstatus_filter) { \ + _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp); \ + } else { \ + LM_ERR("shm status with filter not implemented\n"); \ + } \ + while(0) #define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) #define shm_report(mr) _shm_root.xreport(_shm_root.mem_block, mr) #define shm_available() _shm_root.xavailable(_shm_root.mem_block)

1 0

git:master:f221a3ea: core: mem - defines for pkg/shm status filter functions
by Daniel-Constantin Mierla 29 Sep '23

29 Sep '23

Module: kamailio Branch: master Commit: f221a3eaf29b78671fb1c603813fe7e6c2314fbf URL: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-29T15:54:27+02:00 core: mem - defines for pkg/shm status filter functions --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… Patch: https://github.com/kamailio/kamailio/commit/f221a3eaf29b78671fb1c603813fe7e… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 9b0e5087d1d..9a6b9dac2b1 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -65,6 +65,8 @@ void pkg_print_manager(void); #endif #define pkg_status() _pkg_root.xstatus(_pkg_root.mem_block) +#define pkg_status_filter(fmatch, fp) \ + _pkg_root.xstatus_filter(_pkg_root.mem_block, fmatch, fp) #define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) #define pkg_report(mr) _pkg_root.xreport(_pkg_root.mem_block, mr) #define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index c83c9dd48a6..9cdadc10618 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -53,9 +53,8 @@ extern sr_shm_api_t _shm_root; #define shm_mallocxz(s) \ _shm_root.xmallocxz(_shm_root.mem_block, (s), _SRC_LOC_, _SRC_FUNCTION_, \ _SRC_LINE_, _SRC_MODULE_) -#define shm_mallocxp(s, loc, fname, nline, mname) \ - _shm_root.xmalloc(_shm_root.mem_block, (s), loc, fname, \ - nline, mname) +#define shm_mallocxp(s, loc, fname, nline, mname) \ + _shm_root.xmalloc(_shm_root.mem_block, (s), loc, fname, nline, mname) #define shm_malloc_unsafe(s) \ _shm_root.xmalloc_unsafe(_shm_root.mem_block, (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -65,9 +64,8 @@ extern sr_shm_api_t _shm_root; #define shm_reallocxf(p, s) \ _shm_root.xreallocxf(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) -#define shm_reallocxp(p, s, loc, fname, nline, mname) \ - _shm_root.xrealloc(_shm_root.mem_block, (p), (s), loc, \ - fname, nline, mname) +#define shm_reallocxp(p, s, loc, fname, nline, mname) \ + _shm_root.xrealloc(_shm_root.mem_block, (p), (s), loc, fname, nline, mname) #define shm_resize(p, s) \ _shm_root.xresize(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -89,6 +87,8 @@ extern sr_shm_api_t _shm_root; #endif #define shm_status() _shm_root.xstatus(_shm_root.mem_block) +#define shm_status_filter(fmatch, fp) \ + _shm_root.xstatus_filter(_shm_root.mem_block, fmatch, fp) #define shm_info(mi) _shm_root.xinfo(_shm_root.mem_block, mi) #define shm_report(mr) _shm_root.xreport(_shm_root.mem_block, mr) #define shm_available() _shm_root.xavailable(_shm_root.mem_block)

1 0

git:master:7018e978: core: mem - api function to print status with filter
by Daniel-Constantin Mierla 29 Sep '23

29 Sep '23

Module: kamailio Branch: master Commit: 7018e978b5c6fa3ac42a64985bb6bac24b7aab27 URL: https://github.com/kamailio/kamailio/commit/7018e978b5c6fa3ac42a64985bb6bac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-29T15:54:27+02:00 core: mem - api function to print status with filter --- Modified: src/core/mem/memapi.h Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/7018e978b5c6fa3ac42a64985bb6bac… Patch: https://github.com/kamailio/kamailio/commit/7018e978b5c6fa3ac42a64985bb6bac…

1 0

git:master:1947763c: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 28 Sep '23

28 Sep '23

Module: kamailio Branch: master Commit: 1947763c176f33bcd3cbdfc54d980648855dff8a URL: https://github.com/kamailio/kamailio/commit/1947763c176f33bcd3cbdfc54d98064… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-28T15:46:23+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/1947763c176f33bcd3cbdfc54d98064… Patch: https://github.com/kamailio/kamailio/commit/1947763c176f33bcd3cbdfc54d98064… --- diff --git a/src/modules/ims_qos/README b/src/modules/ims_qos/README index e9c150274eb..b0981a0c151 100644 --- a/src/modules/ims_qos/README +++ b/src/modules/ims_qos/README @@ -64,6 +64,7 @@ Carsten Bock 3.21. omit_flow_ports integer 3.22. rs_default_bandwidth integer 3.23. rr_default_bandwidth integer + 3.24. suspend_transaction integer 4. Functions @@ -101,8 +102,9 @@ Carsten Bock 1.21. omit_flow_ports parameter usage 1.22. rs_default_bandwidth parameter usage 1.23. rr_default_bandwidth parameter usage - 1.24. Rx_AAR_Register - 1.25. Rx_AAR + 1.24. suspend_transaction parameter usage + 1.25. Rx_AAR_Register + 1.26. Rx_AAR Chapter 1. Admin Guide @@ -139,6 +141,7 @@ Chapter 1. Admin Guide 3.21. omit_flow_ports integer 3.22. rs_default_bandwidth integer 3.23. rr_default_bandwidth integer + 3.24. suspend_transaction integer 4. Functions @@ -202,6 +205,7 @@ Chapter 1. Admin Guide 3.21. omit_flow_ports integer 3.22. rs_default_bandwidth integer 3.23. rr_default_bandwidth integer + 3.24. suspend_transaction integer 3.1. rx_dest_realm (string) @@ -492,6 +496,17 @@ modparam("ims_qos", "rs_default_bandwidth", 600) modparam("ims_qos", "rr_default_bandwidth", 2000) ... +3.24. suspend_transaction integer + + If eneabled, suspends the tm transaction while doing the AAR. + + Default value is 1 (enabled) + + Example 1.24. suspend_transaction parameter usage +... +modparam("ims_qos", "suspend_transaction", 2000) +... + 4. Functions 4.1. Rx_AAR_Register(route_block, domain) @@ -522,7 +537,7 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) p.s. this is executed asynchronously. See example on how to retrieve return value - Example 1.24. Rx_AAR_Register + Example 1.25. Rx_AAR_Register ... if(Rx_AAR_Register("REG_AAR_REPLY","location")==0){ exit; @@ -566,7 +581,7 @@ route[REG_AAR_REPLY] p.s. this is executed asynchronously. See example on how to retrieve return value - Example 1.25. Rx_AAR + Example 1.26. Rx_AAR ... if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig","",-1)==0){ exit;

1 0

git:master:21a685a2: ims_qos: Rename new parameter's C variable
by Stefan-Cristian Mititelu 28 Sep '23

28 Sep '23

Module: kamailio Branch: master Commit: 21a685a200e1ff638358dbbee607d4ab55c57359 URL: https://github.com/kamailio/kamailio/commit/21a685a200e1ff638358dbbee607d4a… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-09-28T16:43:47+03:00 ims_qos: Rename new parameter's C variable --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/21a685a200e1ff638358dbbee607d4a… Patch: https://github.com/kamailio/kamailio/commit/21a685a200e1ff638358dbbee607d4a…

1 0

git:master:d0262f82: ims_qos: Add suspend_transaction parameter
by Stefan Mititelu 28 Sep '23

28 Sep '23

Module: kamailio Branch: master Commit: d0262f82fd9cee8670ac01e4f06eb35626b34714 URL: https://github.com/kamailio/kamailio/commit/d0262f82fd9cee8670ac01e4f06eb35… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-09-28T16:35:52+03:00 ims_qos: Add suspend_transaction parameter --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/d0262f82fd9cee8670ac01e4f06eb35… Patch: https://github.com/kamailio/kamailio/commit/d0262f82fd9cee8670ac01e4f06eb35…

1 0

[kamailio/kamailio] ims_qos: Add suspend_transaction parameter (PR #3581)
by Stefan Mititelu 28 Sep '23

28 Sep '23

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Currently, when making an AAR, transaction is suspended and then continued. This is because one may want to block call upon AAR failure. In our use case, we don't want to block any calls, regardless of AAR return code. This makes suspend/continue of the transaction an overhead. Moreover, if the PCRF is slow, transaction blocks untill PCRF responds. Add a module parameter to control if one wants to suspend or not the tm transaction (default is the current behavior). Local basic tests work ok, more testing will follow. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3581 -- Commit Summary -- * ims_qos: Add suspend_transaction parameter -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (19) M src/modules/ims_qos/ims_qos_mod.c (49) M src/modules/ims_qos/rx_aar.c (57) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3581.patch https://github.com/kamailio/kamailio/pull/3581.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3581 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3581(a)github.com>

2 3

[kamailio/kamailio] Kamailio Behind nat. How Record-Route should be added ？ (Issue #3586)
by Lv Xiaobu 28 Sep '23

28 Sep '23

UA1(192.168.0.1) --> kamailio (internal:192.168.0.2 public:1.1.1.1) --> UA2(2.2.2.2) if in UA1 INVITE, I write KSR.rr.record_route(). so UA2(2.2.2.2) received sip msg (Record-Route: <sip:1.1.1.1:7080>), so Kamailio can received BYE/ACK from UA2. but，Kamailio can't received BYE/ACK from UA1. if in UA1 INVITE, i write KSR.rr.record_route_advertised_address("192.168.0.2"), then Kamailio can received BYE/ACK from UA1, but not from UA2. what can i do, let Kamailio receive BYE/ACK from both sides ？ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3586 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3586(a)github.com>

2 2

git:master:1bb1ba60: core: dns cache - warnings on put for unlinked items
by Daniel-Constantin Mierla 28 Sep '23

28 Sep '23

Module: kamailio Branch: master Commit: 1bb1ba60992ffa35e8d36ed1dab98fdc36a2ea30 URL: https://github.com/kamailio/kamailio/commit/1bb1ba60992ffa35e8d36ed1dab98fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-28T09:03:50+02:00 core: dns cache - warnings on put for unlinked items --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/1bb1ba60992ffa35e8d36ed1dab98fd… Patch: https://github.com/kamailio/kamailio/commit/1bb1ba60992ffa35e8d36ed1dab98fd… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 4ad478ba88d..7ff085b0300 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -164,9 +164,13 @@ inline static void dns_destroy_entry_shm_unsafe(struct dns_hash_entry *e) /* dec. the internal refcnt and if 0 deletes the entry */ void dns_hash_put(struct dns_hash_entry *e) { - if(e && atomic_dec_and_test(&e->refcnt)) { - /* atomic_sub_long(dns_cache_total_used, e->total_size); */ - dns_destroy_entry(e); + if(e != NULL) { + if(atomic_dec_and_test(&e->refcnt)) { + /* atomic_sub_long(dns_cache_total_used, e->total_size); */ + dns_destroy_entry(e); + } else if(e->next == NULL && e->prev == NULL) { + LM_WARN("unlinked item %p\n", e); + } } } @@ -175,9 +179,13 @@ void dns_hash_put(struct dns_hash_entry *e) * optimization) */ void dns_hash_put_shm_unsafe(struct dns_hash_entry *e) { - if(e && atomic_dec_and_test(&e->refcnt)) { - /* atomic_sub_long(dns_cache_total_used, e->total_size); */ - dns_destroy_entry_shm_unsafe(e); + if(e != NULL) { + if(atomic_dec_and_test(&e->refcnt)) { + /* atomic_sub_long(dns_cache_total_used, e->total_size); */ + dns_destroy_entry_shm_unsafe(e); + } else if(e->next == NULL && e->prev == NULL) { + LM_WARN("unlinked item %p\n", e); + } } }

1 0

Kamailio v5.7.2 Released
by Daniel-Constantin Mierla 27 Sep '23

27 Sep '23

Hello, Kamailio SIP Server v5.7.2 stable release is out. This is a maintenance release of the latest stable branch, 5.7, that includes fixes since the release of v5.7.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.7.x. Deployments running previous v5.7.x versions are strongly recommended to be upgraded to v5.7.2. For more details about version 5.7.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/09/kamailio-v5-7-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

git:5.7:29caa1c5: ChangeLog: content updated for v5.7.2
by Daniel-Constantin Mierla 27 Sep '23

27 Sep '23

Module: kamailio Branch: 5.7 Commit: 29caa1c5d420aaed5984ecb11978174dbc7a6992 URL: https://github.com/kamailio/kamailio/commit/29caa1c5d420aaed5984ecb11978174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-27T09:22:09+02:00 ChangeLog: content updated for v5.7.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/29caa1c5d420aaed5984ecb11978174… Patch: https://github.com/kamailio/kamailio/commit/29caa1c5d420aaed5984ecb11978174…

1 0

git:5.7:0a91d8a6: Makefile.defs: version set to 5.7.2
by Daniel-Constantin Mierla 27 Sep '23

27 Sep '23

Module: kamailio Branch: 5.7 Commit: 0a91d8a6f25c83094e0ff7cc0f16ecfe3488b378 URL: https://github.com/kamailio/kamailio/commit/0a91d8a6f25c83094e0ff7cc0f16ecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-27T09:00:32+02:00 Makefile.defs: version set to 5.7.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0a91d8a6f25c83094e0ff7cc0f16ecf… Patch: https://github.com/kamailio/kamailio/commit/0a91d8a6f25c83094e0ff7cc0f16ecf… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4ff899c93ef..287efecafa3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:5.7:5b31a87c: pkg: deb specs updated for v5.7.2
by Daniel-Constantin Mierla 27 Sep '23

27 Sep '23

Module: kamailio Branch: 5.7 Commit: 5b31a87cb90c4f81bc48b4f0f1fbd52825967de3 URL: https://github.com/kamailio/kamailio/commit/5b31a87cb90c4f81bc48b4f0f1fbd52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-27T08:45:03+02:00 pkg: deb specs updated for v5.7.2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/5b31a87cb90c4f81bc48b4f0f1fbd52… Patch: https://github.com/kamailio/kamailio/commit/5b31a87cb90c4f81bc48b4f0f1fbd52…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev