sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
263 discussions

[kamailio/kamailio] nats: add a reply param to nats_publish and expose as nats_publish_request in KEMI (PR #3397)

by Seven Du

#### 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  I added `nats_publish_request` which calls the `natsConnection_PublishRequestString` to send a request to the NATS server with a `reply` string so the response can be easily replied back. I tested in Lua and the native route, not sure if it's the right way to implement. I can update docs if it sounds good. Thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3397 -- Commit Summary -- * nats: add a reply param to nats_publish and expose as nats_publish_request in KEMI -- File Changes -- M src/modules/nats/nats_mod.c (18) M src/modules/nats/nats_mod.h (2) M src/modules/nats/nats_pub.c (52) M src/modules/nats/nats_pub.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3397.patch https://github.com/kamailio/kamailio/pull/3397.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3397 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3397(a)github.com>

1 year, 7 months

Re: [kamailio/kamailio] nats: safety check on destroy for poll field (a6caaab)

by Victor Seva

``` nats_mod.c: In function 'nats_destroy_workers': nats_mod.c:600:53: error: invalid operands to binary != (have 'uv_poll_t' {aka 'struct uv_poll_s'} and 'void *') 600 | if(pub_worker->poll != NULL) { | ~~~~~~~~~~~~~~~~ ^~ | | | uv_poll_t {aka struct uv_poll_s} make[3]: *** [../../Makefile.rules:100: nats_mod.o] Error 1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/a6caaabe4bc85e1b41d5bd9b0b89380… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/a6caaabe4bc85e1b41d5bd9b0b8938069eace309/107767533(a)github.com>

1 year, 7 months

git:5.5:ad12445a: github: use bullseye tag for check build [skip ci]

by Victor Seva

Module: kamailio Branch: 5.5 Commit: ad12445a0994e6b82a4a872ecbbe46e1a4982a6c URL: https://github.com/kamailio/kamailio/commit/ad12445a0994e6b82a4a872ecbbe46e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T15:51:54+02:00 github: use bullseye tag for check build [skip ci] --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/ad12445a0994e6b82a4a872ecbbe46e… Patch: https://github.com/kamailio/kamailio/commit/ad12445a0994e6b82a4a872ecbbe46e… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d29d47a99..28cbb741ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,9 +21,9 @@ jobs: strategy: matrix: include: - - distribution: buster + - distribution: bullseye compilier: gcc - - distribution: buster + - distribution: bullseye compilier: clang - distribution: sid compilier: gcc

1 year, 7 months

git:5.5:4f24f446: github: use Github Packages registry [skip ci]

by Victor Seva

Module: kamailio Branch: 5.5 Commit: 4f24f446914393b56e990600e03484e1f410382c URL: https://github.com/kamailio/kamailio/commit/4f24f446914393b56e990600e03484e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T15:48:11+02:00 github: use Github Packages registry [skip ci] (cherry picked from commit 8bba1aa866b736f1fd98dace67fe4a4b1eeca5c7) (cherry picked from commit 8189ae69e563c1cffed0c4e12d57d258d2a541f6) --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/4f24f446914393b56e990600e03484e… Patch: https://github.com/kamailio/kamailio/commit/4f24f446914393b56e990600e03484e… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a745d88b04..1d29d47a995 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,17 +3,16 @@ name: build 'on': push: branches: - - master - pull_request: - branches: - - master + - '5.5' # 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 container: - image: kamailio/pkg-kamailio-docker:dev-${{ matrix.distribution }} + image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} volumes: - ${{ github.workspace }}:/code env: @@ -32,7 +31,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v2 - - uses: ammaraskar/gcc-problem-matcher(a)0.1 + - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | cd /code

1 year, 7 months

git:5.6:8189ae69: github: use Github Packages registry [skip ci]

by Victor Seva

Module: kamailio Branch: 5.6 Commit: 8189ae69e563c1cffed0c4e12d57d258d2a541f6 URL: https://github.com/kamailio/kamailio/commit/8189ae69e563c1cffed0c4e12d57d25… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T15:47:02+02:00 github: use Github Packages registry [skip ci] (cherry picked from commit 8bba1aa866b736f1fd98dace67fe4a4b1eeca5c7) --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/8189ae69e563c1cffed0c4e12d57d25… Patch: https://github.com/kamailio/kamailio/commit/8189ae69e563c1cffed0c4e12d57d25… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c94110f683..d8d76b85cdc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,17 +3,16 @@ name: build 'on': push: branches: - - master - pull_request: - branches: - - master + - '5.6' # 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 container: - image: kamailio/pkg-kamailio-docker:dev-${{ matrix.distribution }} + image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} volumes: - ${{ github.workspace }}:/code env: @@ -32,7 +31,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v2 - - uses: ammaraskar/gcc-problem-matcher(a)0.1 + - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | cd /code

1 year, 7 months

git:master:8bba1aa8: github: use Github Packages registry [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 8bba1aa866b736f1fd98dace67fe4a4b1eeca5c7 URL: https://github.com/kamailio/kamailio/commit/8bba1aa866b736f1fd98dace67fe4a4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T14:04:31+02:00 github: use Github Packages registry [skip ci] --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/8bba1aa866b736f1fd98dace67fe4a4… Patch: https://github.com/kamailio/kamailio/commit/8bba1aa866b736f1fd98dace67fe4a4… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10acce3a6e1..71b9d6c5480 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} + image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} volumes: - ${{ github.workspace }}:/code env: @@ -33,7 +33,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v2 - - uses: ammaraskar/gcc-problem-matcher(a)0.1 + - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | cd /code

1 year, 7 months

git:5.4:67b55267: pkg/kamailio/deb: remove warning build-depends-on-obsolete-package [skip ci]

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 67b552679d1ffefe2e3c9d059b99a97a4e7823bd URL: https://github.com/kamailio/kamailio/commit/67b552679d1ffefe2e3c9d059b99a97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T12:40:46+02:00 pkg/kamailio/deb: remove warning build-depends-on-obsolete-package [skip ci] > W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev (cherry picked from commit 387a8ca53f179437ae173b0bd5cb8d2d4922b60d) (cherry picked from commit dafb657950f97e7431770be6d0e9f2f04634fc21) (cherry picked from commit f1d8ff5b22b8a367fbf0c7062d9bc5aa7ae2a671) --- Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control --- Diff: https://github.com/kamailio/kamailio/commit/67b552679d1ffefe2e3c9d059b99a97… Patch: https://github.com/kamailio/kamailio/commit/67b552679d1ffefe2e3c9d059b99a97… --- diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index e2a95b425e..deb134222a 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -38,6 +38,9 @@ sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules # no lsb-base sed -i -e '/lsb-base/d' ${DIST}/control +# libncurses +sed -i -e 's/libncurses5-dev/libncurses-dev/g' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 03d5b0c67f..2e639b2c26 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -30,7 +30,7 @@ Build-Depends: libmongoc-dev, libmono-2.0-dev, libmosquitto-dev, - libncurses5-dev, + libncurses-dev, libpcre3-dev, libperl-dev, libphonenumber-dev (>= 7),

1 year, 7 months

git:5.4:0e8cd1b6: pkg/kamailio/deb: remove lsb-base dependency [skip ci]

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 0e8cd1b6a58984eb537a2b9e61298607b5aa5ead URL: https://github.com/kamailio/kamailio/commit/0e8cd1b6a58984eb537a2b9e6129860… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T12:40:35+02:00 pkg/kamailio/deb: remove lsb-base dependency [skip ci] * on newer version, there's no need to add it > E: kamailio: depends-on-obsolete-package Depends: lsb-base (cherry picked from commit 03755f93f98608d85591ba8aa184733e3871b92c) (cherry picked from commit a45f4ca901f76dae023e390d11e71873cb7e73ff) (cherry picked from commit 210b8de98a76f2b57d4f894dadb2ad03ef2e0b8f) --- Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control --- Diff: https://github.com/kamailio/kamailio/commit/0e8cd1b6a58984eb537a2b9e6129860… Patch: https://github.com/kamailio/kamailio/commit/0e8cd1b6a58984eb537a2b9e6129860… --- diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index 367b53bef04..e2a95b425e7 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -35,6 +35,9 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e 's/ python [ ,$]*//' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules +# no lsb-base +sed -i -e '/lsb-base/d' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 7867775e16b..03d5b0c67f7 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -67,7 +67,6 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, - lsb-base, python3, ${misc:Depends}, ${shlibs:Depends},

1 year, 7 months

git:5.4:2f7350d8: pkg/kamailio/deb: fix sid build

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 2f7350d82833ad03b506691138452c7b192185c9 URL: https://github.com/kamailio/kamailio/commit/2f7350d82833ad03b506691138452c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T12:40:07+02:00 pkg/kamailio/deb: fix sid build * no python2 and dh-systemd package available (cherry picked from commit 986b9bea258864bf40606afe9761dc17dead6476) (cherry picked from commit 32cce91f3e6514e9f99f26d2c0dabc56281b034c) --- Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules --- Diff: https://github.com/kamailio/kamailio/commit/2f7350d82833ad03b506691138452c7… Patch: https://github.com/kamailio/kamailio/commit/2f7350d82833ad03b506691138452c7… --- diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index 8161de7269e..367b53bef04 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -25,6 +25,16 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules +# no dh-systemd +sed -i -e '/dh-systemd/d' ${DIST}/control + +# no python2 +sed -i -e '/^ python,/d' -e '/python-dev/d' \ + -e '/^Package: kamailio-python-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ python [ ,$]*//' ${DIST}/rules +sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index ccc4a1cf46b..7867775e16b 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -9,7 +9,6 @@ Build-Depends: bison, debhelper (>= 9), default-libmysqlclient-dev, - dh-systemd (>= 1.5), docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, @@ -49,8 +48,6 @@ Build-Depends: libxml2-dev, openssl, pkg-config, - python, - python-dev, python3, python3-dev, ruby-dev, @@ -260,23 +257,6 @@ Description: The app_mono module for the Kamailio SIP server This package provides the app_mono module, an extension allowing to execute embedded Mono applications within the Kamailio SIP routing script. -Package: kamailio-python-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: The app_python module for the Kamailio SIP server - Kamailio is a very fast and flexible SIP (RFC3261) - server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the app_python module, an extension allowing to - execute embedded Python applications within the Kamailio SIP routing script. - Package: kamailio-python3-modules Architecture: linux-any Multi-Arch: same diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules index 2e59d0465d9..0460677fba3 100755 --- a/pkg/kamailio/deb/sid/rules +++ b/pkg/kamailio/deb/sid/rules @@ -21,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk export RADCLI=1 # modules not in the "main" kamailio package -EXCLUDED_MODULES= java +EXCLUDED_MODULES= java python # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -34,7 +34,7 @@ EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ - snmpstats carrierroute xmpp cpl redis python geoip geoip2 \ + snmpstats carrierroute xmpp cpl redisgeoip geoip2 \ sqlite json mono ruby ims sctp \ tls outbound websocket autheph kazoo cnxcc \ erlang systemd phonenum mongodb rabbitmq python3 mqtt

1 year, 7 months

git:5.5:f1d8ff5b: pkg/kamailio/deb: remove warning build-depends-on-obsolete-package [skip ci]

by Victor Seva

Module: kamailio Branch: 5.5 Commit: f1d8ff5b22b8a367fbf0c7062d9bc5aa7ae2a671 URL: https://github.com/kamailio/kamailio/commit/f1d8ff5b22b8a367fbf0c7062d9bc5a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-06T12:30:12+02:00 pkg/kamailio/deb: remove warning build-depends-on-obsolete-package [skip ci] > W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev (cherry picked from commit 387a8ca53f179437ae173b0bd5cb8d2d4922b60d) (cherry picked from commit dafb657950f97e7431770be6d0e9f2f04634fc21) --- Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control --- Diff: https://github.com/kamailio/kamailio/commit/f1d8ff5b22b8a367fbf0c7062d9bc5a… Patch: https://github.com/kamailio/kamailio/commit/f1d8ff5b22b8a367fbf0c7062d9bc5a… --- diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index e2a95b425e7..deb134222af 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -38,6 +38,9 @@ sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules # no lsb-base sed -i -e '/lsb-base/d' ${DIST}/control +# libncurses +sed -i -e 's/libncurses5-dev/libncurses-dev/g' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 572eee98fc8..8f40c440777 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -30,7 +30,7 @@ Build-Depends: libmongoc-dev, libmono-2.0-dev, libmosquitto-dev, - libncurses5-dev, + libncurses-dev, libpcre3-dev, libperl-dev, libphonenumber-dev (>= 7),

1 year, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023