- sr-dev - kamailio.org

git:master:38aa7e5f: tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: 38aa7e5fffcb68979a9bb5771aaa6ef9e14b517d URL: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T19:07:59+08:00 tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Patch: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 3b3c175af0e..37884f864d6 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f +Subproject commit 37884f864d6fd9b04f44677cb04da15d0c9d6526

1 0

git:master:dea9b252: tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: dea9b25299ee273e45b0e08acacff8de87b7ceb9 URL: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T12:21:03+08:00 tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Patch: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 730076023a9..fe2e7d8d4ed 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -25,7 +25,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: if [ ! -f "Makefile" ]; then \ 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-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \

1 0

[kamailio/kamailio] topos: BYE sent by caller before call was connected was badly managed (PR #3644)
by Frédéric Gaisnon 17 Nov '23

17 Nov '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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When caller sent a BYE instead a CANCEL into a non connected call, route are badly reappend by topos. regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3644 -- Commit Summary -- * topos: BYE sent by caller before call was connected was badly managed -- File Changes -- M src/modules/topos/tps_msg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3644.patch https://github.com/kamailio/kamailio/pull/3644.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3644 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3644(a)github.com>

3 8

git:master:9898c586: topos: BYE sent by caller before call was connected was badly managed
by Henning Westerholt 17 Nov '23

17 Nov '23

Module: kamailio Branch: master Commit: 9898c586095bd75cd31f0ca383ba0a347bfc4891 URL: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-17T14:48:35+01:00 topos: BYE sent by caller before call was connected was badly managed regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Patch: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 942629568b9..4d680e53f45 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -962,7 +962,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; }

1 0

Problems with fsn
by aaron.soto＠dialapplet.com 17 Nov '23

17 Nov '23

Hello to all, I am having a problem that when I send an invite from kamailio, when I change the variable $fsn by an alias it takes the ip well, but the port sends it by a random port, when observing the capture with the sngrep it is shown as the source port is completely random. If someone can help me, let me know what kind of information you can help. Thanks

1 0

Kamailio v5.7.3 Released
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Hello, Kamailio SIP Server v5.7.3 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.2. 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.3. For more details about version 5.7.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/11/kamailio-v5-7-3-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

[kamailio/kamailio] Allow function set_advertised_address to receive variable as parameter (#2137)
by pwakano 17 Nov '23

17 Nov '23

### Description Currently the functions set_advertised_address and set_advertised_port only accept strings as parameters. Trying to use it with variable causes an error. Having the function using a hard coded value is not a good practice and in order to add flexibility to the script in different installations it would be nice to have this function accepting variables. Also, the 'advertise' option on the 'listen' parameter is not always desired because it apply for all messages sent via the socket, and there are situations where different advertised IP for the same interface are necessary. ### Expected behavior set_advertised_address should receive a variable as parameter and use its value to change the SIP headers. ### Actual observed behavior Kamailio won't start if set_advertised_address is used with a variable due to script parse error or it will set the SIP message with the literal string "$var(test)" for example, instead of using the value of $var(test). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # uname -a Linux voice-conn-kamailio-1 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2137

7 9

git:5.7:e4d96bd4: ChangeLog: content updated for v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: e4d96bd4f7cdf6482ac5c08400ccd09f241541bf URL: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T10:24:45+01:00 ChangeLog: content updated for v5.7.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Patch: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09…

1 0

git:5.7:1ec50936: Makefile.defs: version set to 5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: 1ec5093657959b4af1c9d4e0ea48879ed1105f4d URL: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:56:00+01:00 Makefile.defs: version set to 5.7.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Patch: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 287efecafa3..5d485bb2c74 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.7:2fa62091: pkg: deb specs updated for v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: 2fa620918979548af5182114f8d44df67776b76f URL: https://github.com/kamailio/kamailio/commit/2fa620918979548af5182114f8d44df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:52:09+01:00 pkg: deb specs updated for v5.7.3 --- 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/2fa620918979548af5182114f8d44df… Patch: https://github.com/kamailio/kamailio/commit/2fa620918979548af5182114f8d44df…

1 0

git:5.7:ec6c7ac6: pkg: version set to 5.7.3 for rpms and alpine specs
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: ec6c7ac6c7758cf2ff2a554985204315bd72859a URL: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:47:30+01:00 pkg: version set to 5.7.3 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… Patch: https://github.com/kamailio/kamailio/commit/ec6c7ac6c7758cf2ff2a55498520431… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 45ae00469f5..bf51c6ce047 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.7.2 +pkgver=5.7.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d57ec65039a..28ebdc70ee4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.7.2 +%define ver 5.7.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Hello, I am considering to release Kamailio v5.7.3 (out of branch 5.7) soon (likely on Friday 17 or during the beginning of next week). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 1

git:5.7:5879b5d1: core: copy the value between quotes for #!defexps
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 5879b5d10d41f8a8a7b458873a4afaf7777fe27d URL: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T20:06:10+01:00 core: copy the value between quotes for #!defexps - GH #3631 (cherry picked from commit c26e9877419ac53fb109a24aefb3fcd711fae1d7) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… Patch: https://github.com/kamailio/kamailio/commit/5879b5d10d41f8a8a7b458873a4afaf… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 0

[kamailio/kamailio] config file: defexps not working in modparam (Issue #3631)
by space88man 16 Nov '23

16 Nov '23

### Description When an ID is defined using `!#defexps` it cannot be used in modparam ### Troubleshooting ``` #!define TEST1 "key=s:value" ## this works modparam("pv", "varset", TEST1) # in shell: export TEST2='key=s:value' #!defenvs TEST2 modparam("pv", "varset", TEST2) # this does not work #!defexps TEST3 "key=s:value" modparam("pv", "varset", TEST3) 0(2437437) CRITICAL: <core> [core/cfg.y:3900]: yyerror_at(): parse error in config file kamailio.cfg, line 85, column 26-32: syntax error ``` #### Reproduction * in config file, define ID with `#!defexps` then use in `modparam()` #### Debugging Data -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3631 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3631(a)github.com>

3 4

git:master:c26e9877: core: copy the value between quotes for #!defexps
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: c26e9877419ac53fb109a24aefb3fcd711fae1d7 URL: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T19:50:13+01:00 core: copy the value between quotes for #!defexps - GH #3631 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… Patch: https://github.com/kamailio/kamailio/commit/c26e9877419ac53fb109a24aefb3fcd… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index ba7c1263fab..262a7931cd2 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -523,7 +523,7 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) } if(qmode == 1) { res[0] = '"'; - memcpy(res, sval.s + 1, sval.len); + memcpy(res + 1, sval.s, sval.len); res[sval.len + 1] = '"'; res[sval.len + 2] = '\0'; LM_DBG("expression quoted string result: [%s]\n", res);

1 0

git:master:996b61eb: kamctl: missing space from previous commit
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 996b61ebfdabcae8729725b5d06f268aefcd33a4 URL: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:26:27+01:00 kamctl: missing space from previous commit --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… Patch: https://github.com/kamailio/kamailio/commit/996b61ebfdabcae8729725b5d06f268… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 197c6e43035..47a96e1b488 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -44,7 +44,7 @@ if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kama . /etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi -if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc RC_FILE_SOURCED="true" fi

1 0

git:master:64cd9336: kamctl: Fix source order
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 64cd9336039bc05944fd9693e08edfab5fbd2f14 URL: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T18:25:23+01:00 kamctl: Fix source order - Add check for already sourced rc file in kamctl --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… Patch: https://github.com/kamailio/kamailio/commit/64cd9336039bc05944fd9693e08edfa… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index ad4262b7fc0..197c6e43035 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -18,6 +18,7 @@ else fi ### include config files +RC_FILE_SOURCED="false" # check for rc file at same location with kamctl which greadlink >/dev/null 2>&1 @@ -39,11 +40,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then +if [ $RC_FILE_SOURCED = "false" ] && [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi -if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then +if[ $RC_FILE_SOURCED = "false" ] && [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc + RC_FILE_SOURCED="true" fi if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc @@ -3255,4 +3258,3 @@ case $1 in exit 1 ;; esac -

1 0

[kamailio/kamailio] kamctl: Source only one kamctlrc (PR #3594)
by Xenofon Karamanos 16 Nov '23

16 Nov '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 - [x] 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  kamctl now sources the kamctlrc from only one location if available in this order: 1. same folder as kamctl, 2. {intstall_prefix}/etc/kamailio/, 3. ~/.kamctlrc 4. /etc/kamailio/. If no kamctlrc is found, it continues just like before. Should it stop? #### Issue description `kamctl` uses env variables from all the config files above, and retains the env value of the latest config that declares it. Let's say we have 3 kamctlrc files right now: ``` # first config file (same folder that kamctl resides) # {prefix_install}/sbin/kamctlrc ... SIP_DOMAIN=kamailio.org DBENGINE is commented ... ``` ``` # second config file # /etc/kamailio/kamctlrc ... SIP_DOMAIN=kam02.tst.nbg.gilawa.net DBENGINE=MYSQL ... ``` ``` # third config file # {prefix_install}/etc/kamailio/kamctlrc ... SIP_DOMAIN is commented DBENGINE=MYSQL ... ``` Running `{install_prefix}/sbin/kamctl` (before changes in order) it prints : ``` Loading config file /home/xenofon/kamailio-source-install/sbin/kamctlrc Loading config file /etc/kamailio/kamctlrc Loading config file /home/xenofon/kamailio-source-install/etc/kamailio//kamctlrc SIP_DOMAIN env var is kam02.tst.nbg.gilawa.net DBENGINE env var is MYSQL ``` suggesting that env variables from multiple sources are gathered and overwritten in cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3594 -- Commit Summary -- * kamctl: Source only one kamctlrc -- File Changes -- M utils/kamctl/kamctl (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3594.patch https://github.com/kamailio/kamailio/pull/3594.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3594 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3594(a)github.com>

3 19

Obsoleting unmaintained modules
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Hello, during the Kamailio Developers Meeting 2023 in Dusseldorf that took place last week, it was proposed to obsolete modules that seem to be unmaintained and no activity about them was noticed during the past years. It is quite some overhead in packaging them and trying to keep them compiling when they have external dependencies, therefore such step should spare some resources in the future. The list (see below) was built based on the options of those present at the meeting, now we want to discuss it on the larger communities of developers and users. If you are using any of these modules or you think any of them worth keeping, reply with the names of the modules that you want to be kept. The proposed action is to relocate the obsoleted modules to a new git repository "kamailio-obsolete" to still keep some visibility to them and in the eventually of future interest on any of them, it can be reintroduced in the main repository. Next is the initial list of modules proposed to be considered obsolete: - app_java - app_lua_sr - app_mono - app_python - app_sqlang - auth_identity - call_control - db2_ldap - db2_ops - db_cassandra - db_perldvdb - dnssec - domainpolicy - h350 - mediaproxy - osp - peering - print - print_lib - pua_xmpp - ratelimit - uid_auth_db - uid_avp_db - uid_domain - uid_gflags - uid_uri_db - uri_db - xmpp - xprint Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

3 4

git:master:06ce65a2: topos: detect direction for early dialog NOTIFY
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 06ce65a2bbea826b890a3712cf1ac4f8b53e54cd URL: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T17:39:11+01:00 topos: detect direction for early dialog NOTIFY --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Patch: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0e697e8580e..942629568b9 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -915,7 +915,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if(metid & (METHOD_BYE | METHOD_UPDATE)) { + if(metid & (METHOD_BYE | METHOD_UPDATE | METHOD_NOTIFY)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error;

1 0

git:5.7:3e979157: core: fix indentation on tcp_main.c
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 3e9791570645dee833737077b3326ca6acde6aef URL: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:29:18-05:00 core: fix indentation on tcp_main.c (cherry picked from commit 243951bc487c5c67c81062445d4f4d7ee725684f) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Patch: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 49ad05a7fbb..d7bd4534d59 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 0

git:master:243951bc: core: fix indentation on tcp_main.c
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 243951bc487c5c67c81062445d4f4d7ee725684f URL: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:27:21-05:00 core: fix indentation on tcp_main.c --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Patch: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7b46ccbafde..00a1796ec5a 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 0

git:5.7:308506c3: core: fix compilation for older kernels
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 308506c3dacf9c22c63059166f5b674d0199eb44 URL: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:26:17-05:00 core: fix compilation for older kernels (cherry picked from commit 34054fbd144102d414318249de217cedf8e5bd39) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… Patch: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e6e028c15fd..49ad05a7fbb 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1280,12 +1280,15 @@ inline static int find_listening_sock_info( int optval = 1; su2ip_addr(&ip, &si->su); *from = &si->su; +#if !defined(TCP_DONT_REUSEADDR) if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); /* continue, not critical */ } +#endif +#ifdef SO_REUSEPORT optval = 1; if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) @@ -1293,6 +1296,7 @@ inline static int find_listening_sock_info( LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); /* continue, not critical */ } +#endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { LM_WARN("binding to source address %s failed: %s [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno);

1 0

git:master:34054fbd: core: fix compilation for older kernels
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 34054fbd144102d414318249de217cedf8e5bd39 URL: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T09:29:00-05:00 core: fix compilation for older kernels --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… Patch: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 1b131a3311a..7b46ccbafde 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1280,12 +1280,15 @@ inline static int find_listening_sock_info( int optval = 1; su2ip_addr(&ip, &si->su); *from = &si->su; +#if !defined(TCP_DONT_REUSEADDR) if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); /* continue, not critical */ } +#endif +#ifdef SO_REUSEPORT optval = 1; if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) @@ -1293,6 +1296,7 @@ inline static int find_listening_sock_info( LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); /* continue, not critical */ } +#endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { LM_WARN("binding to source address %s failed: %s [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno);

1 0

git:5.7:c30e0a3a: pua_dialoginfo: safety check for request pointer
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: c30e0a3a6dbe9b80b591ecb9caa53574ebc2988f URL: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T08:55:51-05:00 pua_dialoginfo: safety check for request pointer (cherry picked from commit 4e614ba6b7a5663bd88f353a3ce7a0976d8e878f) --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… Patch: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index deecc32f7e1..6efcdc0a880 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -579,9 +579,10 @@ static void __dialog_sendpublish( if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 - || (request->flags - & (1U << (unsigned int) - refresh_pubruri_avps_flag)))) { + || (request + && (request->flags + & (1U << (unsigned int) + refresh_pubruri_avps_flag))))) { lock_release(&dlginfo->lock); } }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev