sr-dev

sr-dev@lists.kamailio.org

20 participants
45174 discussions

git:master:38d2a6a1: tls_wolfssl: add wolfssl@e722c15be8 as a submodule
by S-P Chan 23 Jun '22

23 Jun '22

Module: kamailio Branch: master Commit: 38d2a6a16179cb72e97dd6eec600405e57f4be12 URL: https://github.com/kamailio/kamailio/commit/38d2a6a16179cb72e97dd6eec600405… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-23T15:32:22+08:00 tls_wolfssl: add wolfssl@e722c15be8 as a submodule --- Added: src/modules/tls_wolfssl/.gitignore Added: src/modules/tls_wolfssl/lib/wolfssl Modified: .gitmodules Modified: src/modules/tls_wolfssl/Makefile Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/38d2a6a16179cb72e97dd6eec600405… Patch: https://github.com/kamailio/kamailio/commit/38d2a6a16179cb72e97dd6eec600405…

1 0

git:master:85a2523d: tls_wolfssl: reduce overhead per fragment to maintain 16 byte alignment
by S-P Chan 23 Jun '22

23 Jun '22

Module: kamailio Branch: master Commit: 85a2523db649009332af059f6260ab4467b30360 URL: https://github.com/kamailio/kamailio/commit/85a2523db649009332af059f6260ab4… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-23T10:37:31+08:00 tls_wolfssl: reduce overhead per fragment to maintain 16 byte alignment --- Modified: src/modules/tls_wolfssl/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/85a2523db649009332af059f6260ab4… Patch: https://github.com/kamailio/kamailio/commit/85a2523db649009332af059f6260ab4… --- diff --git a/src/modules/tls_wolfssl/tls_init.c b/src/modules/tls_wolfssl/tls_init.c index 9993c4a3d5..5a468525c6 100644 --- a/src/modules/tls_wolfssl/tls_init.c +++ b/src/modules/tls_wolfssl/tls_init.c @@ -222,32 +222,28 @@ static const int MAX_ALIGN = __alignof__(max_align_t); static void* ser_malloc(size_t size) { - char* ptr = shm_malloc(size + 2*MAX_ALIGN); - int pad = MAX_ALIGN - ((long) ptr % MAX_ALIGN); + char* ptr = shm_malloc(size + MAX_ALIGN); + int pad = MAX_ALIGN - ((long) ptr % MAX_ALIGN); // 8 or 16 bytes - *(size_t*)ptr = size; - - memset(ptr + MAX_ALIGN, pad, pad); - return ptr + MAX_ALIGN + pad; + memset(ptr, pad, pad); + return ptr + pad; } static void* ser_realloc(void *ptr, size_t new_size) { if(!ptr) return ser_malloc(new_size); - int pad = *((unsigned char*)ptr - 1); - unsigned char *real_ptr = (unsigned char*)ptr - pad - MAX_ALIGN; - int size = *(size_t*)real_ptr; + int pad = *((char*)ptr - 1); // 8 or 16 bytes + char *real_ptr = (char*)ptr - pad; - char *new_ptr = shm_realloc(real_ptr, new_size+2*MAX_ALIGN); - *(size_t*)new_ptr = new_size; + char *new_ptr = shm_realloc(real_ptr, new_size+MAX_ALIGN); int new_pad = MAX_ALIGN - ((long) new_ptr % MAX_ALIGN); if (new_pad != pad) { - memmove(new_ptr + MAX_ALIGN + new_pad, new_ptr + MAX_ALIGN + pad, new_size); - memset(new_ptr + MAX_ALIGN, new_pad, new_pad); + memmove(new_ptr + new_pad, new_ptr + pad, new_size); + memset(new_ptr, new_pad, new_pad); } - return new_ptr + MAX_ALIGN + new_pad; + return new_ptr + new_pad; } #endif /* LIBRESSL_VERSION_NUMBER */ @@ -255,7 +251,7 @@ static void ser_free(void *ptr) { if (ptr) { int pad = *((unsigned char *)ptr - 1); - shm_free((unsigned char*)ptr - pad - MAX_ALIGN); + shm_free((unsigned char*)ptr - pad); } }

1 0

git:master:4484a5eb: tls_wolfssl: ser_realloc realign memory correctly to 16-bytes
by S-P Chan 23 Jun '22

23 Jun '22

Module: kamailio Branch: master Commit: 4484a5eb9e0dd6e6723390cb96c378f88f1fd074 URL: https://github.com/kamailio/kamailio/commit/4484a5eb9e0dd6e6723390cb96c378f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-23T10:10:11+08:00 tls_wolfssl: ser_realloc realign memory correctly to 16-bytes If shm_realloc returns a different 8/16 byte alignment we need to memmove the correct amount. --- Modified: src/modules/tls_wolfssl/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/4484a5eb9e0dd6e6723390cb96c378f… Patch: https://github.com/kamailio/kamailio/commit/4484a5eb9e0dd6e6723390cb96c378f… --- diff --git a/src/modules/tls_wolfssl/tls_init.c b/src/modules/tls_wolfssl/tls_init.c index 1fcac5549d..9993c4a3d5 100644 --- a/src/modules/tls_wolfssl/tls_init.c +++ b/src/modules/tls_wolfssl/tls_init.c @@ -243,7 +243,7 @@ static void* ser_realloc(void *ptr, size_t new_size) *(size_t*)new_ptr = new_size; int new_pad = MAX_ALIGN - ((long) new_ptr % MAX_ALIGN); if (new_pad != pad) { - memmove(new_ptr + MAX_ALIGN + new_pad, new_ptr + MAX_ALIGN + pad, size); + memmove(new_ptr + MAX_ALIGN + new_pad, new_ptr + MAX_ALIGN + pad, new_size); memset(new_ptr + MAX_ALIGN, new_pad, new_pad); }

1 0

[kamailio/kamailio] shm_malloc to align on __alignof__(_max_align_t) like malloc = 16 bytes (Issue #3157)
by space88man 23 Jun '22

23 Jun '22

### Description I am creating a module that uses a 3rd party library(wolfSSL), that depending on build flags, requires alignment of memory blocks to be the same as `malloc`, i.e., 16 bytes on gcc/AMD64. It seems that `shm_malloc` returns memory aligned to 8 bytes. Since system malloc always returns 16-byte aligned memory, it might be good to match that behaviour in `shm_malloc` in case future kamailio modules use libraries that expect this. ### Expected behavior `shm_malloc` returns memory aligned on `__alignof__(_max_align_t) == 16` #### Actual observed behavior `shm_malloc` returns blocks aligned on 8-bytes #### Debugging Data When allocating `*SSL_CTX` and `*SSL ` structs by tls module they occassionally will have 8 byte (and not necessarily 16-byte) alignments. OpenSSL does not require 16-byte alignments but wolfSSL requires 16-byte alignments. ### Possible Solutions * The custom memory allocators in WIP `tls_wolfssl/` could try to wrap around `shm_malloc`. * have a static build of wolfSSL that does not require 16-byte alignment ### Additional Information The default `./configure` build of wolfSSL has structs that require 16-byte alignment. wolfSSL library has a configure flag `--enable-aligndata=no` that relaxes this requirement. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3157 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3157(a)github.com>

2 4

[kamailio/kamailio] The acc modules writes a random string into the sip_reason field for an ACK message (FAKED_REPLY) (Issue #2981)
by Frits Wiersma 22 Jun '22

22 Jun '22

### Description While upgrading to kamailio version 5.5.2 I noticed that the sip reason is not always filled in correctly. In our current setup with kamailio version 4.4 the acc module writes the INVITE, ACK end BYE messages to a postgres database. Also the missed calls are logged. With version 5.5.2 but also with version 5.5.3 the sip reason seems to contain a random 2 digits. It gets even worse when a call is missed and kamailio generates a 408 timeout. Then a random string of 15 characters is written to the database. Sometimes this results in a fatal error because the postgres driver can't escape the string. ### Troubleshooting The relevant part in de code is in the function env_set_code_status in file acc_logic.c if (reply==FAKED_REPLY || reply==NULL) { /* code */ acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ acc_env.reason.s = error_text(code); acc_env.reason.len = strlen(acc_env.reason.s); } The sip reason is only filled in when the len is 0, but once the length is set it looks like it's not being reset to 0 again somewhere. I can fix the problem by removing the if statement, but that is probably not the intention of the programmer. #### Reproduction The wrong reason in the ACK can probably be reproduces with any call, but in my test setup an Asterisk system answers the call. After the "OK" an ACK is received which is seen as a FAKED_REPLY. The reason.len however is still 2 and the reason is not set. The new function "env_set_reason" is not being called in this case. The issue with the 408 can be reproduced by calling an endpoint and let kamailio timeout. This has to be done twice to reproduce the error. This time kamailio wants to write the missed INVITE to the database with a random string of 15 characters for the sip reason. To me it looks like the length of 15 comes from the length of the "Request Timeout" string but the pointer reason.s point to a memory part of a previous transaction which is already gone ? #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.2 (x86_64/linux) 55e232 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 55e232 compiled on 15:45:52 Dec 9 2021 with gcc 8.3.0 ``` * **Operating System**: ``` Linux 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2981 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2981(a)github.com>

3 5

[kamailio/kamailio] acc: Fix reason code for locally generated replies. (PR #3137)
by Frits Wiersma 22 Jun '22

22 Jun '22

- Use heap memory for the reason code instead of the stack memory. - See issue #2981   #### 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 - [x] Tested changes locally - [x] Related to issue #2981 (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/3137 -- Commit Summary -- * acc: Fix reason code for locally generated replies. -- File Changes -- M src/modules/acc/acc_logic.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3137.patch https://github.com/kamailio/kamailio/pull/3137.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3137 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3137(a)github.com>

3 5

git:master:e74cb237: acc: Fix reason code for locally generated replies. (#3137)
by GitHub 22 Jun '22

22 Jun '22

Module: kamailio Branch: master Commit: e74cb2371ab879874a8981818139024f1c2beb9e URL: https://github.com/kamailio/kamailio/commit/e74cb2371ab879874a8981818139024… Author: Frits Wiersma <cfwiersma(a)solcon.nl> Committer: GitHub <noreply(a)github.com> Date: 2022-06-22T21:50:44+02:00 acc: Fix reason code for locally generated replies. (#3137) * acc: Fix reason code for locally generated replies. - Use heap memory for the reason code instead of the stack memory. - See issue #2981 * acc: Remove code which was commented out. - Code was commented out in the previous pull request. (#3137). - This has now been corrected. --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/e74cb2371ab879874a8981818139024… Patch: https://github.com/kamailio/kamailio/commit/e74cb2371ab879874a8981818139024… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e045b8c95ac..169a4222fbf 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -93,25 +93,20 @@ void env_set_totag(struct cell *t, struct sip_msg *reply) tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); } -int env_set_reason(struct sip_msg *reply, str *buff) { - int i; - char *p; +int env_set_reason(struct sip_msg *reply, str *buff, int code) { + if (reply!=FAKED_REPLY || !buff || !buff->s || buff->len < 20) return 0; if (strncmp(buff->s, "SIP/2.0 ", 8) != 0) { LM_ERR("not a SIP reply\n"); return 0; } - p = buff->s + 12; - for (i=12;i<buff->len;i++) { - if (*p == '\r' || *p == '\n') { - acc_env.reason.s = buff->s+12; - acc_env.reason.len = i-12; - LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); - return 1; - } - p++; - } + + /* Set the reason to a pointer in heap memory. It will contain the last seen FAKED_REPLY */ + acc_env.reason.s = error_text(code); + acc_env.reason.len = strlen(acc_env.reason.s); + LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); + return 0; } @@ -139,7 +134,8 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ - if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ + /* In case of an ACK the reply == NULL, but the reason must be set when report_ack is 1 */ + if (acc_env.reason.len == 0 || reply==NULL) { /* already extracted in case of locally generated replies */ acc_env.reason.s = error_text(code); acc_env.reason.len = strlen(acc_env.reason.s); } @@ -719,7 +715,7 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) LM_DBG("acc callback called for t(%p) event type %d, reply code %d\n", t, type, ps->code); if (type&TMCB_RESPONSE_OUT) { - env_set_reason(ps->rpl, &ps->send_buf); + env_set_reason(ps->rpl, &ps->send_buf, ps->code); acc_onreply( t, ps->req, ps->rpl, ps->code); } else if (type&TMCB_E2EACK_IN) { acc_onack( t, t->uas.request, ps->req, ps->code);

1 0

[kamailio/kamailio] topos: don't insert contact header for 4xx replies (PR #3158)
by Victor Seva 22 Jun '22

22 Jun '22

#### 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 - [x] Tested changes locally #### Description Topos is adding Contact header to the 407 reply ![image](https://user-images.githubusercontent.com/63080/174794224-b9a6f9d9-f496-4be0-b903-489bd8a4a261.png) ![image](https://user-images.githubusercontent.com/63080/174794351-14000f4c-185c-48b9-adde-476ba6744c30.png) Related to https://github.com/kamailio/kamailio/pull/3149 even with https://github.com/kamailio/kamailio/commit/414c7dd608584df18f871b42e05f401… applied You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3158 -- Commit Summary -- * topos: don't insert contact header for 4xx replies -- File Changes -- M src/modules/topos/tps_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3158.patch https://github.com/kamailio/kamailio/pull/3158.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3158 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3158(a)github.com>

2 2

git:master:f49f14a8: topos: don't insert contact header for 4xx replies
by Daniel-Constantin Mierla 22 Jun '22

22 Jun '22

Module: kamailio Branch: master Commit: f49f14a87606314e98a253ee29b1624ae814dccf URL: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-22T21:45:35+02:00 topos: don't insert contact header for 4xx replies unless original msg has contact --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… Patch: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 6f5633119d..798885df56 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1167,6 +1167,11 @@ int tps_response_sent(sip_msg_t *msg) && msg->contact==NULL) { contact_keep = 1; } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>=400 + && msg->first_line.u.reply.statuscode<500 + && msg->contact==NULL) { + contact_keep = 1; + } if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); if(direction==TPS_DIR_DOWNSTREAM) {

1 0

git:5.6:315781e5: core: fix freeaddrinfo coredump
by Victor Seva 22 Jun '22

22 Jun '22

Module: kamailio Branch: 5.6 Commit: 315781e547e359354b6deaf53355a029fdb3e869 URL: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-22T12:47:18+02:00 core: fix freeaddrinfo coredump > #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 > #1 0x00007fbb5e515537 in __GI_abort () at abort.c:79 > #2 0x00007fbb5e56e768 in __libc_message (action=action@entry=do_abort, fmt=fmt@entry=0x7fbb5e67ce2d "%s\n") at ../sysdeps/posix/libc_fatal.c:155 > #3 0x00007fbb5e575a5a in malloc_printerr (str=str@entry=0x7fbb5e67b05a "free(): invalid pointer") at malloc.c:5347 > #4 0x00007fbb5e576c14 in _int_free (av=<optimized out>, p=<optimized out>, have_lock=0) at malloc.c:4173 > #5 0x00007fbb5e5d8da0 in __GI_freeaddrinfo (ai=ai@entry=0x7fbb5e83ba10) at ../sysdeps/posix/getaddrinfo.c:2520 > #6 0x000055ba099dcd0b in log_init () at core/dprint.c:482 > #7 0x000055ba09970d7a in main (argc=10, argv=0x7ffde85a1788) at main.c:2055 (cherry picked from commit 71502d2bb733340db310bf4e0c47e4b194f49113) --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… Patch: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9b01dc8af9a..f4780bb4d47 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -459,7 +459,8 @@ static str log_prefix_str = STR_NULL; void log_init(void) { - struct addrinfo hints, *info; + struct addrinfo hints; + struct addrinfo *info = NULL; int gai_result; char hostname[1024];

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev