sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
326 discussions

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://… [View More]

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 … [View More]

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/… [View More]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; [View Less]

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/… [View More]

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 … [View More]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; [View Less]

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 … [View More]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> [View Less]

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 … [View More]

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 … [View More]

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 … [View More]

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: … [View More]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; [View Less]

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023