- sr-dev - kamailio.org

git:master:e18adca6: github: add checkout before clang-format-checker [skip ci]
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: master Commit: e18adca6d62ab327cb8b8c23291eef8ab4543d53 URL: https://github.com/kamailio/kamailio/commit/e18adca6d62ab327cb8b8c23291eef8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T12:41:24+02:00 github: add checkout before clang-format-checker [skip ci] > https://github.com/WolleTD/clang-format-checker/issues/15 --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/e18adca6d62ab327cb8b8c23291eef8… Patch: https://github.com/kamailio/kamailio/commit/e18adca6d62ab327cb8b8c23291eef8… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 1ea695d874..d515b8ff56 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,6 +12,7 @@ jobs: check-format: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - uses: wolletd/clang-format-checker(a)v1.10 with: target-ref: main

1 0

git:master:2c36d50a: github: update clang-format-checker action to v1.10 [skip ci]
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 2c36d50ac56663c92bc007c85b18199a1fdff363 URL: https://github.com/kamailio/kamailio/commit/2c36d50ac56663c92bc007c85b18199… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T12:35:14+02:00 github: update clang-format-checker action to v1.10 [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/2c36d50ac56663c92bc007c85b18199… Patch: https://github.com/kamailio/kamailio/commit/2c36d50ac56663c92bc007c85b18199… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f340ff425d..1ea695d874 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: check-format: runs-on: ubuntu-latest steps: - - uses: wolletd/clang-format-checker@v1 + - uses: wolletd/clang-format-checker(a)v1.10 with: target-ref: main build:

1 0

git:master:2b4cceb3: github: add clang-format-checker for pull-request [skip ci]
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 2b4cceb35bf49fc581fdb7af10c080f927a93a4a URL: https://github.com/kamailio/kamailio/commit/2b4cceb35bf49fc581fdb7af10c080f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T12:18:07+02:00 github: add clang-format-checker for pull-request [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/2b4cceb35bf49fc581fdb7af10c080f… Patch: https://github.com/kamailio/kamailio/commit/2b4cceb35bf49fc581fdb7af10c080f… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 197361aaf21..f340ff425d8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -9,6 +9,12 @@ name: checks_pr permissions: contents: read # to fetch code (actions/checkout) jobs: + check-format: + runs-on: ubuntu-latest + steps: + - uses: wolletd/clang-format-checker@v1 + with: + target-ref: main build: runs-on: ubuntu-latest container:

1 0

git:5.7:f1e91d66: ChangeLog: content updated for v5.7.0
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: f1e91d6684a55d1b8ae1489d50c0dd338ad01102 URL: https://github.com/kamailio/kamailio/commit/f1e91d6684a55d1b8ae1489d50c0dd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T11:33:43+02:00 ChangeLog: content updated for v5.7.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/f1e91d6684a55d1b8ae1489d50c0dd3… Patch: https://github.com/kamailio/kamailio/commit/f1e91d6684a55d1b8ae1489d50c0dd3…

1 0

git:5.7:4ef477e6: Makefile.defs: version set to 5.7.0
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: 4ef477e6c33af829d9b7064019741eefcfdbfc44 URL: https://github.com/kamailio/kamailio/commit/4ef477e6c33af829d9b7064019741ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T11:30:37+02:00 Makefile.defs: version set to 5.7.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/4ef477e6c33af829d9b7064019741ee… Patch: https://github.com/kamailio/kamailio/commit/4ef477e6c33af829d9b7064019741ee… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 78a2dcc87ec..da88735ad3b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.7:f34ae12f: topos: small formatting fixes
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: f34ae12f63f0ed8d0577de3b36843cd5b96a7a36 URL: https://github.com/kamailio/kamailio/commit/f34ae12f63f0ed8d0577de3b36843cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T10:00:13+02:00 topos: small formatting fixes (cherry picked from commit 991de5e51e799a0110b7aa489eb27f4f01f5dfd2) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f34ae12f63f0ed8d0577de3b36843cd… Patch: https://github.com/kamailio/kamailio/commit/f34ae12f63f0ed8d0577de3b36843cd… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index bda9d931811..78872329588 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -776,7 +776,7 @@ int tps_mask_callid(sip_msg_t *msg) return -1; } - LM_DBG("updated (masked) call-id: [%.*s]\n",out.len, out.s); + LM_DBG("updated (masked) call-id: [%.*s]\n", out.len, out.s); if(out.s==NULL) { LM_ERR("cannot encode callid\n"); return -1; @@ -820,22 +820,20 @@ int tps_unmask_callid(sip_msg_t *msg) in=msg->callid->body; umask_ret=thb.unmask_callid(&in, &out); if(umask_ret == 1) { - LM_DBG("Unmask not required\n"); + LM_DBG("unmask not required\n"); return 0; - }else if(umask_ret != 0) { + } else if(umask_ret != 0) { LM_ERR("cannot decode callid\n"); return -1; } LM_DBG("updated (unmasked) call-id: [%.*s]\n", out.len, out.s); - if(out.s==NULL) - { + if(out.s==NULL) { LM_ERR("cannot decode callid\n"); return -1; } l=del_lump(msg, msg->callid->body.s-msg->buf, msg->callid->body.len, 0); - if (l==0) - { + if (l==0) { LM_ERR("failed deleting callid\n"); pkg_free(out.s); return -1;

1 0

git:5.7:520d1b4a: topoh: don't set 0 twice at the end of masked/unmasked call-id
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: 520d1b4acb749b1052a13c12a51fae188df1378d URL: https://github.com/kamailio/kamailio/commit/520d1b4acb749b1052a13c12a51fae1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T10:00:23+02:00 topoh: don't set 0 twice at the end of masked/unmasked call-id - fomatting updates (cherry picked from commit 4c524547e1fdd4aa6dfa0ed0ada57b002296a258) --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/520d1b4acb749b1052a13c12a51fae1… Patch: https://github.com/kamailio/kamailio/commit/520d1b4acb749b1052a13c12a51fae1… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index 122d0935a5e..7dcec501360 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -96,19 +96,20 @@ char* th_mask_encode(char *in, int ilen, str *prefix, int *olen) *olen = (((ilen+2)/3)<<2) + ((prefix!=NULL&&prefix->len>0)?prefix->len:0); out = (char*)pkg_malloc((*olen+1)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + + /* set 0 at the end of the value */ memset(out, 0, (*olen+1)*sizeof(char)); - if(prefix!=NULL&&prefix->len>0) + if(prefix!=NULL&&prefix->len>0) { memcpy(out, prefix->s, prefix->len); + } p = out + (int)((prefix!=NULL&&prefix->len>0)?prefix->len:0); - for(idx=0; idx<ilen; idx+=3) - { + for(idx=0; idx<ilen; idx+=3) { left = ilen - idx - 1 ; left = (left>1)?2:left; @@ -149,24 +150,21 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) out = (char*)pkg_malloc((*olen+1+extra)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + /* set 0 at the end of the value */ memset(out, 0, (*olen+1+extra)*sizeof(char)); end = ilen - n; i = (prefix!=NULL&&prefix->len>0)?prefix->len:0; - for(idx=0; i<end; idx+=3) - { + for(idx=0; i<end; idx+=3) { block = 0; - for(j=0; j<4 && i<end ; j++) - { + for(j=0; j<4 && i<end ; j++) { c = _th_DB64[(int)in[i++]]; - if(c<0) - { + if(c<0) { LM_ERR("invalid input string\"%.*s\"\n", ilen, in); pkg_free(out); *olen = 0; @@ -175,11 +173,11 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) block += c << (18 - 6*j); } - for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) + for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) { out[idx+j] = (char)((block >> n) & 0xff); + } } return out; } - diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 8698b7ab5d9..0bc9fda97d9 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -562,8 +562,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len; @@ -572,7 +570,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - str out; if(th_param_mask_callid==0) @@ -597,8 +594,6 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len;

1 0

git:5.7:c5a22a4b: Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: c5a22a4bfc9310f41facf8dfe8aa9c610f432817 URL: https://github.com/kamailio/kamailio/commit/c5a22a4bfc9310f41facf8dfe8aa9c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T11:29:20+02:00 Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1 - one can set LIBSSL_SET_MUTEX_SHARED=0 in make command line to switch to detection mode if it is need to set it or not based on libssl version - GH #3458, GH #3384 (cherry picked from commit 5e0fb402a7755ea22c41c0b8fcefbdf9694442b8) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c5a22a4bfc9310f41facf8dfe8aa9c6… Patch: https://github.com/kamailio/kamailio/commit/c5a22a4bfc9310f41facf8dfe8aa9c6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index bd15e29269d..78a2dcc87ec 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -181,7 +181,7 @@ LD_EXTRA_OPTS ?= # enable workaround for libssl 1.1+ to set shared mutex attribute -LIBSSL_SET_MUTEX_SHARED ?= +LIBSSL_SET_MUTEX_SHARED ?= 1 ifneq ($(LIBSSL_SET_MUTEX_SHARED), 1) ifeq ($(CROSS_COMPILE),)

1 0

git:5.7:ac118abd: topoh: memory leak fix for API call
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: ac118abdcb89e5e4ace524d9dbd27c0795f178d9 URL: https://github.com/kamailio/kamailio/commit/ac118abdcb89e5e4ace524d9dbd27c0… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T10:00:02+02:00 topoh: memory leak fix for API call th_mask_callid_str & th_unmask_callid_str funtions used for API call to encode/decode call-ID uses static array declaration for callid_mbuf was unable to free callid data lump after use and leads to memory leak. when these futions was used through API call for topos memory leak bug as reported qm_free(): BUG: bad pointer 0x7faec4a7xxxx (out of memory block!) called from core: core/data_lump.c: free_lump(470) (cherry picked from commit 85b62cefa8d33bc736f1ab16e7c40646c903c812) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ac118abdcb89e5e4ace524d9dbd27c0… Patch: https://github.com/kamailio/kamailio/commit/ac118abdcb89e5e4ace524d9dbd27c0… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 4762691845a..8698b7ab5d9 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -542,11 +542,8 @@ int th_unmask_callid(sip_msg_t *msg) return 0; } -#define TH_CALLID_SIZE 256 - int th_mask_callid_str(str *icallid, str *ocallid) { - static char th_callid_mbuf[TH_CALLID_SIZE]; str out; if(th_param_mask_callid==0) @@ -565,19 +562,9 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_mbuf, out.s, out.len); - th_callid_mbuf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_mbuf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0; @@ -585,7 +572,7 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - static char th_callid_buf[TH_CALLID_SIZE]; + str out; if(th_param_mask_callid==0) @@ -610,18 +597,9 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_buf, out.s, out.len); - th_callid_buf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_buf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0;

1 0

[kamailio/kamailio] tls: build does not apply TLS_PTHREAD_MUTEX_SHARED on systems with libssl 1.1+ and without pkg-config (Issue #3384)
by shaneqld 17 May '23

17 May '23

### Description On systems running libssl 1.1+, the compile flag `TLS_PTHREAD_MUTEX_SHARED` is set to avoid an issue with deadlocks. However, if the system does not have `pkg-config` installed, the build completes successfully without setting this compile flag. As such, users with this particular configuration are at risk of TLS-related deadlocks. ### Troubleshooting This scenario arose for me when I experienced suspected TLS-related deadlocks in Kamailio 5.4.1. Particularly, in a simple configuration, multiple UDP workers were using t_relay to near-simultaneously connect to the same TLS host. After some time, the UDP workers stopped responding while executing this simple route block. I cannot definitively conclude this issue was the same deadlock bug. The compile flag `TLS_PTHREAD_MUTEX_SHARED` was not set and `pkg-config` was not installed. I found [this mailing list thread](https://lists.kamailio.org/pipermail/sr-users/2019-December/107759.… discussing TLS deadlocks and the build process and the user was running Kamailio 5.3.1, libssl 1.1 but did not have `TLS_PTHREAD_MUTEX_SHARED` set. This issue may explain how this user ended up in that situation. #### Reproduction Tested against Kamailio 5.4.1 and latest master. On a system with libssl 1.1+, build (including the `tls` module) with `pkg-config` installed and run `kamailio -I`. `TLS_PTHREAD_MUTEX_SHARED` flag is set. ``` Version: kamailio 5.7.0-dev3 (x86_64/linux) b75b6e Default config: /usr/local/etc/kamailio/kamailio.cfg Default paths to modules: /usr/local/lib64/kamailio/modules Compile flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ``` Uninstall `pkg-config` and rebuild. `TLS_PTHREAD_MUTEX_SHARED` flag is not set. ``` Version: kamailio 5.7.0-dev3 (x86_64/linux) b75b6e Default config: /usr/local/etc/kamailio/kamailio.cfg Default paths to modules: /usr/local/lib64/kamailio/modules Compile flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, HAVE_RESOLV_RES ``` When `pkg-config` is not installed, the build also outputs the following log lines, however the build does not fail. ``` /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found /bin/sh: 1: pkg-config: not found ``` ### Possible Solutions Some thoughts about options: 1. It looks like effort has been applied in other areas to support the absence of `pkg-config`, so potentially support libssl 1.1+ detection without `pkg-config`. 2. Require `pkg-config` on build and fail without it. 3. Enable `TLS_PTHREAD_MUTEX_SHARED` by default as I assume most people are running libssl 1.1+ these days, and disable it if libssl < 1.1 detected. Personally I have installed `pkg-config` and rebuilt, however I think for the safety of others building from source that the compile flag should be correctly set or the build should fail. ### Operating System ``` Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux debian-kamailio 4.19.0-20-amd64 #1 SMP Debian 4.19.235-1 (2022-03-17) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3384 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3384(a)github.com>

2 2

[kamailio/kamailio] TLS module deadlocks with libssl 1.1.x on systems with multiple OpenSSL versions (e.g. CentOS7) (Issue #3458)
by Tobias Schlager 17 May '23

17 May '23

The current build of kamailio (master) does not set `TLS_PTHREAD_MUTEX_SHARED` when building with `--with-openssl11` on systems with multiple versions of OpenSSL installed resulting in deadlocks in the TLS module. All module Makefiles look for the `SSL_BUILDER` environment variable to provide a `pkg-config` command to find the `libssl` to link against. The variable is set to `pkg-config libssl11` by the RPM build when specifying `--with-openssl11`. Unfortunately, in `src/Makefile.defs`, there is an alternative way to look for a similar `pkg-config` command. However, this one always uses the `pkg-config libssl`, which - on systems with multiple versions of OpenSSL - usually points to OpenSSL 1.0.x. In turn the build thinks it will link against OpenSSL 1.0.x and will not set `KSR_PTHREAD_MUTEX_SHARED`. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3458 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3458(a)github.com>

2 5

git:master:5e0fb402: Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 5e0fb402a7755ea22c41c0b8fcefbdf9694442b8 URL: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T11:24:58+02:00 Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1 - one can set LIBSSL_SET_MUTEX_SHARED=0 in make command line to switch to detection mode if it is need to set it or not based on libssl version - GH #3458, GH #3384 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… Patch: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a40cfa55cd3..ca7d525b688 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -181,7 +181,7 @@ LD_EXTRA_OPTS ?= # enable workaround for libssl 1.1+ to set shared mutex attribute -LIBSSL_SET_MUTEX_SHARED ?= +LIBSSL_SET_MUTEX_SHARED ?= 1 ifneq ($(LIBSSL_SET_MUTEX_SHARED), 1) ifeq ($(CROSS_COMPILE),)

1 0

git:master:2eb17e9c: github: GitHub Actions Version Updater
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 2eb17e9ccfa3963813215e6ddf2fdadeb588f485 URL: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T10:09:53+02:00 github: GitHub Actions Version Updater > https://github.com/marketplace/actions/github-actions-version-updater * PAT created using kamailio-sync * organization secret WORKFLOW_SECRET created --- Added: .github/workflows/updater.yml --- Diff: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… Patch: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… --- diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 00000000000..d517b85edbe --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,17 @@ +name: GitHub Actions Version Updater +on: + schedule: + # Automatically run on every Sunday + - cron: '0 0 * * 0' +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.WORKFLOW_SECRET }} + - name: Run GitHub Actions Version Updater + uses: saadmk11/github-actions-version-updater(a)v0.7.4 + with: + token: ${{ secrets.WORKFLOW_SECRET }} + pull_request_user_reviewers: linuxmaniac

1 0

git:master:4c524547: topoh: don't set 0 twice at the end of masked/unmasked call-id
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 4c524547e1fdd4aa6dfa0ed0ada57b002296a258 URL: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:57:20+02:00 topoh: don't set 0 twice at the end of masked/unmasked call-id - fomatting updates --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… Patch: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index 122d0935a5..7dcec50136 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -96,19 +96,20 @@ char* th_mask_encode(char *in, int ilen, str *prefix, int *olen) *olen = (((ilen+2)/3)<<2) + ((prefix!=NULL&&prefix->len>0)?prefix->len:0); out = (char*)pkg_malloc((*olen+1)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + + /* set 0 at the end of the value */ memset(out, 0, (*olen+1)*sizeof(char)); - if(prefix!=NULL&&prefix->len>0) + if(prefix!=NULL&&prefix->len>0) { memcpy(out, prefix->s, prefix->len); + } p = out + (int)((prefix!=NULL&&prefix->len>0)?prefix->len:0); - for(idx=0; idx<ilen; idx+=3) - { + for(idx=0; idx<ilen; idx+=3) { left = ilen - idx - 1 ; left = (left>1)?2:left; @@ -149,24 +150,21 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) out = (char*)pkg_malloc((*olen+1+extra)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + /* set 0 at the end of the value */ memset(out, 0, (*olen+1+extra)*sizeof(char)); end = ilen - n; i = (prefix!=NULL&&prefix->len>0)?prefix->len:0; - for(idx=0; i<end; idx+=3) - { + for(idx=0; i<end; idx+=3) { block = 0; - for(j=0; j<4 && i<end ; j++) - { + for(j=0; j<4 && i<end ; j++) { c = _th_DB64[(int)in[i++]]; - if(c<0) - { + if(c<0) { LM_ERR("invalid input string\"%.*s\"\n", ilen, in); pkg_free(out); *olen = 0; @@ -175,11 +173,11 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) block += c << (18 - 6*j); } - for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) + for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) { out[idx+j] = (char)((block >> n) & 0xff); + } } return out; } - diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 8698b7ab5d..0bc9fda97d 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -562,8 +562,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len; @@ -572,7 +570,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - str out; if(th_param_mask_callid==0) @@ -597,8 +594,6 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len;

1 0

git:master:991de5e5: topos: small formatting fixes
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 991de5e51e799a0110b7aa489eb27f4f01f5dfd2 URL: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:53:03+02:00 topos: small formatting fixes --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… Patch: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index bda9d93181..7887232958 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -776,7 +776,7 @@ int tps_mask_callid(sip_msg_t *msg) return -1; } - LM_DBG("updated (masked) call-id: [%.*s]\n",out.len, out.s); + LM_DBG("updated (masked) call-id: [%.*s]\n", out.len, out.s); if(out.s==NULL) { LM_ERR("cannot encode callid\n"); return -1; @@ -820,22 +820,20 @@ int tps_unmask_callid(sip_msg_t *msg) in=msg->callid->body; umask_ret=thb.unmask_callid(&in, &out); if(umask_ret == 1) { - LM_DBG("Unmask not required\n"); + LM_DBG("unmask not required\n"); return 0; - }else if(umask_ret != 0) { + } else if(umask_ret != 0) { LM_ERR("cannot decode callid\n"); return -1; } LM_DBG("updated (unmasked) call-id: [%.*s]\n", out.len, out.s); - if(out.s==NULL) - { + if(out.s==NULL) { LM_ERR("cannot decode callid\n"); return -1; } l=del_lump(msg, msg->callid->body.s-msg->buf, msg->callid->body.len, 0); - if (l==0) - { + if (l==0) { LM_ERR("failed deleting callid\n"); pkg_free(out.s); return -1;

1 0

git:master:85b62cef: topoh: memory leak fix for API call
by Daniel-Constantin Mierla 17 May '23

17 May '23

Module: kamailio Branch: master Commit: 85b62cefa8d33bc736f1ab16e7c40646c903c812 URL: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:52:29+02:00 topoh: memory leak fix for API call th_mask_callid_str & th_unmask_callid_str funtions used for API call to encode/decode call-ID uses static array declaration for callid_mbuf was unable to free callid data lump after use and leads to memory leak. when these futions was used through API call for topos memory leak bug as reported qm_free(): BUG: bad pointer 0x7faec4a7xxxx (out of memory block!) called from core: core/data_lump.c: free_lump(470) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… Patch: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 4762691845..8698b7ab5d 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -542,11 +542,8 @@ int th_unmask_callid(sip_msg_t *msg) return 0; } -#define TH_CALLID_SIZE 256 - int th_mask_callid_str(str *icallid, str *ocallid) { - static char th_callid_mbuf[TH_CALLID_SIZE]; str out; if(th_param_mask_callid==0) @@ -565,19 +562,9 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_mbuf, out.s, out.len); - th_callid_mbuf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_mbuf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0; @@ -585,7 +572,7 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - static char th_callid_buf[TH_CALLID_SIZE]; + str out; if(th_param_mask_callid==0) @@ -610,18 +597,9 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_buf, out.s, out.len); - th_callid_buf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_buf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0;

1 0

[kamailio/kamailio] topoh: memory leak fix for API call (PR #3456)
by Harish S 17 May '23

17 May '23

th_mask_callid_str & th_unmask_callid_str functions used for API call to encode/decode call-ID uses static array declaration for callid_mbuf was unable to free callid data lump after use and leads to memory leak. when these functions was used through API call for topos module memory leak bug as reported qm_free(): BUG: bad pointer 0x7faec4a7xxxx (out of memory block!) called from core: core/data_lump.c: free_lump(470) This two funtions are not used other than API.   #### 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/3456 -- Commit Summary -- * topoh: memory leak fix for API call -- File Changes -- M src/modules/topoh/th_msg.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3456.patch https://github.com/kamailio/kamailio/pull/3456.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3456 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3456(a)github.com>

2 1

git:master:fe4c47bb: siptrace: fix destination target parameter on ki_sip_trace_msg
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: master Commit: fe4c47bb47e466af2eddc0a8987c13cb976e5a3b URL: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T09:22:10+02:00 siptrace: fix destination target parameter on ki_sip_trace_msg fixes #3457 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… Patch: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 0a2d9b327e1..538e3b6a70b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1231,7 +1231,14 @@ static int w_sip_trace_msg(sip_msg_t *msg, char *vmsg, char *saddr, char *taddr, static int ki_sip_trace_msg(sip_msg_t *msg, str *vmsg, str *saddr, str *taddr, str *duri, str *corrid) { - trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&duri:NULL, + dest_info_t dest; + if(duri && duri->len>0) { + if (siptrace_parse_uri(duri, &dest) < 0) { + LM_ERR("failed to parse mirroring destination uri\n"); + return -1; + } + } + trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&dest:NULL, (corrid && corrid->len>0)?corrid:NULL); return 1;

1 0

git:5.7:a6513043: pkg/kamailio/obs: packaged math module
by Sergey Safarov 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: a651304380283854f916b8e6fae8ff0a4937d411 URL: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-05-17T10:24:24+03:00 pkg/kamailio/obs: packaged math module (cherry picked from commit bafefbc841eb7a6929baeff0b3fbe185860f4290) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… Patch: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bb608525b54..838aaf7530e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1570,6 +1570,7 @@ fi %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy %doc %{_docdir}/kamailio/modules/README.mangler +%doc %{_docdir}/kamailio/modules/README.math %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy @@ -1731,6 +1732,7 @@ fi %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so %{_libdir}/kamailio/modules/mangler.so +%{_libdir}/kamailio/modules/math.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so

1 0

[kamailio/kamailio] build warning (Issue #3457)
by sergey-safarov 17 May '23

17 May '23

**incompatible-pointer-types** ``` make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M sipcapture.so] sipcapture.so CC (gcc) [M siptrace.so] siptrace.o siptrace.c: In function 'ki_sip_trace_msg': siptrace.c:1234:74: warning: passing argument 4 of 'trace_send_hep_duplicate' from incompatible pointer type [-Wincompatible-pointer-types] trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&duri:NULL, ^ In file included from siptrace.c:58: siptrace_hep.h:30:34: note: expected 'struct dest_info *' but argument is of type 'str **' {aka 'struct _str **'} str *body, str *from, str *to, struct dest_info *, str *correlation_id); ^~~~~~~~~~~~~~~~~~ CC (gcc) [M siptrace.so] siptrace_hep.o CC (gcc) [M siptrace.so] siptrace_send.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3457 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3457(a)github.com>

2 1

git:master:bafefbc8: pkg/kamailio/obs: packaged math module
by Sergey Safarov 17 May '23

17 May '23

Module: kamailio Branch: master Commit: bafefbc841eb7a6929baeff0b3fbe185860f4290 URL: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-05-17T09:23:07+03:00 pkg/kamailio/obs: packaged math module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… Patch: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bb608525b54..838aaf7530e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1570,6 +1570,7 @@ fi %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy %doc %{_docdir}/kamailio/modules/README.mangler +%doc %{_docdir}/kamailio/modules/README.math %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy @@ -1731,6 +1732,7 @@ fi %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so %{_libdir}/kamailio/modules/mangler.so +%{_libdir}/kamailio/modules/math.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so

1 0

git:5.7:72db97b7: pkg/kamailio/deb: version set 5.7.0 [skip ci]
by Victor Seva 17 May '23

17 May '23

Module: kamailio Branch: 5.7 Commit: 72db97b7b8618e6cc9eed80ef670495547b7c2d0 URL: https://github.com/kamailio/kamailio/commit/72db97b7b8618e6cc9eed80ef670495… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T08:13:45+02:00 pkg/kamailio/deb: version set 5.7.0 [skip ci] --- 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/72db97b7b8618e6cc9eed80ef670495… Patch: https://github.com/kamailio/kamailio/commit/72db97b7b8618e6cc9eed80ef670495…

1 0

Releasing Kamailio v5.7.0
by Daniel-Constantin Mierla 17 May '23

17 May '23

Hello, with a few public holidays coming soon around here, I am considering to release 5.7.0 this week on Wednesday, May 17, 2023. Rather short notice, but there were no major bug reports that need to be tracked. The list of new features is being built in the wiki: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/features/new-in-5.… The other tutorials related to this major release should be ready by then as well. Should anyone think more time is needed, then it can be postponed, not a problem at all. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 1

git:5.7:422d469f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 May '23

16 May '23

Module: kamailio Branch: 5.7 Commit: 422d469fb52c31074ff00eec445eff45fdfebb39 URL: https://github.com/kamailio/kamailio/commit/422d469fb52c31074ff00eec445eff4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-16T18:16:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/422d469fb52c31074ff00eec445eff4… Patch: https://github.com/kamailio/kamailio/commit/422d469fb52c31074ff00eec445eff4… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 1f8e8c191dd..be21cb2ef51 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -171,6 +171,7 @@ Chapter 1. Admin Guide requests). * database module - to store the data for topology stripping and restoring. + * topoh module - in case of Call-ID mask for Call-ID masking. 2.2. External Libraries or Applications @@ -228,11 +229,11 @@ modparam("topos", "db_url", "dbdriver://username:password@dbhost/dbname") 3.3. mask_callid (int) - Note: this functionality is not implemented yet - the parameter is - present in order to be in pair with topoh module. - - Whether to replace or not the Call-ID with another unique id generated - by Kamailio. + Whether to encode the Call-id: header. Some SIP extensions include the + Call-id in the SIP message payload or header, so it is safe to not + encode Call-id in such cases. Well-known extensions such as call + transfer or conference join will be added to work with encoded Call-id. + Topoh module should be loaded with use_mode paramerter set to 1 Default value is 0 (do not mask).

1 0

git:5.7:7e1f330e: Topos: Added CallID Mask Document for Topos
by Daniel-Constantin Mierla 16 May '23

16 May '23

Module: kamailio Branch: 5.7 Commit: 7e1f330e2dc916138aa9a899da49c452b9f59740 URL: https://github.com/kamailio/kamailio/commit/7e1f330e2dc916138aa9a899da49c45… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T18:03:54+02:00 Topos: Added CallID Mask Document for Topos Added document for Call-ID Mask in Topos Module (cherry picked from commit 14d4b2422c0fed27fecf01665197f9d0669aa24e) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e1f330e2dc916138aa9a899da49c45… Patch: https://github.com/kamailio/kamailio/commit/7e1f330e2dc916138aa9a899da49c45… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index dcf61a0fed6..82e7c1e45eb 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -57,6 +57,12 @@ for topology stripping and restoring. </para> </listitem> + <listitem> + <para> + <emphasis>topoh module</emphasis> - in case of Call-ID mask + for Call-ID masking. + </para> + </listitem> </itemizedlist> </para> </section> @@ -130,14 +136,14 @@ modparam("topos", "db_url", "&exampledb;") <section id="topos.p.mask_callid"> <title><varname>mask_callid</varname> (int)</title> <para> - Note: this functionality is not implemented yet - the - parameter is present in order to be in pair with topoh - module. - </para> - <para> - Whether to replace or not the Call-ID with another - unique id generated by &kamailio;. + Whether to encode the Call-id: header. Some SIP extensions include + the Call-id in the SIP message payload or header, so it is safe to + not encode Call-id in such cases. Well-known extensions such as + call transfer or conference join will be added to work with encoded + Call-id. + Topoh module should be loaded with use_mode paramerter set to 1 </para> + <para> <emphasis> Default value is 0 (do not mask).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev