sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
281 discussions

[kamailio/kamailio] [kamctl] Dispatcher operations in a case of db_text are mostly incorrect (#2464)

by Igor Olhovskiy

### Description On creating dispatcher with `kamctl` in the case of `db_text` it fails ### Troubleshooting #### Reproduction Point `kamctlrc` to DB_TEXT. Run `kamctl dispatcher add 1 sip:asterisk_2:5060 1 3` Run 'kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 'prefix=123' 'test1'' Run 'kamctl dispatcher show' Run 'kamctl dispatcher reload' #### Debugging Data ``` # kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 attrs cannot be empty or null -e \E[37;31mERROR: dispatcher - SQL Error ``` ``` # kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 'prefix=123' 'test1' Traceback (most recent call last): File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1243, in <module> main(sys.argv) File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1230, in main dataset = conn.Execute(' '.join(argv[1:])) File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 423, in Execute self.WriteTempTable() File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1138, in WriteTempTable self.temp_file.write(header.strip() + '\n') File "/usr/lib/python3.7/tempfile.py", line 620, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' -e \E[37;31mERROR: dispatcher - SQL Error ``` dump is showing active dispatchers, show - is not. ``` # kamctl dispatcher dump { "jsonrpc": "2.0", "result": { "NRSETS": 1, "RECORDS": [{ "SET": { "ID": 1, "TARGETS": [{ "DEST": { "URI": "sip:asterisk_2:5060", "FLAGS": "AP", "PRIORITY": 0 } }] } }] }, "id": 124 } root@e529c8cb4f62:/# kamctl dispatcher show -e dispatcher gateways ``` No result on reload ``` # kamctl dispatcher reload { "jsonrpc": "2.0", "result": { }, "id": 160 } ``` ### Possible Solutions I've tried to add data to the table manually, but here I got another issue. But on Kamailio load, the only first dispatcher is processed. Will add another issue on this. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /# kamailio -v version: kamailio 5.4.1 (x86_64/linux) 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_BLACKLIST, 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**: Debian 10/Docker ``` # uname -a Linux 9b7efa852274 5.3.18-lp152.36-default #1 SMP Tue Aug 18 17:09:44 UTC 2020 (885251f) 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/2464

2 years, 5 months

git:master:d695c9cc: tls_wolfssl: less verbose during build

by S-P Chan

Module: kamailio Branch: master Commit: d695c9cca02d584e295d12fe574e99085c7adecd URL: https://github.com/kamailio/kamailio/commit/d695c9cca02d584e295d12fe574e990… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-06-24T11:08:11+08:00 tls_wolfssl: less verbose during build --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d695c9cca02d584e295d12fe574e990… Patch: https://github.com/kamailio/kamailio/commit/d695c9cca02d584e295d12fe574e990… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 3f1ecd0caa..6dd9e1b770 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -25,9 +25,9 @@ lib/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ - --disable-shared --disable-silent-rules --disable-examples \ + --disable-shared --disable-examples \ --prefix=$(MOD_DIR)/lib \ --exec-prefix=$(MOD_DIR)/lib; \ sed -i s/-Werror// Makefile; \ @@ -44,5 +44,5 @@ clean-module: @rm -f *.o *.so clean-all: clean-wolfssl clean-module - + .PHONY: clean-wolfssl clean-module clean-all

2 years, 5 months

git:5.6:10c3a432: pkg/kamailio/obs: added CentOS 9 support

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: 10c3a432d8f032788bf57e304ccf728c3a379740 URL: https://github.com/kamailio/kamailio/commit/10c3a432d8f032788bf57e304ccf728… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-06-23T22:36:13+03:00 pkg/kamailio/obs: added CentOS 9 support (cherry picked from commit 19edea067f890814c767581fef65713046c768c6) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/10c3a432d8f032788bf57e304ccf728… Patch: https://github.com/kamailio/kamailio/commit/10c3a432d8f032788bf57e304ccf728…

2 years, 5 months

git:master:19edea06: pkg/kamailio/obs: added CentOS 9 support

by Sergey Safarov

Module: kamailio Branch: master Commit: 19edea067f890814c767581fef65713046c768c6 URL: https://github.com/kamailio/kamailio/commit/19edea067f890814c767581fef65713… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-06-23T22:32:50+03:00 pkg/kamailio/obs: added CentOS 9 support --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/19edea067f890814c767581fef65713… Patch: https://github.com/kamailio/kamailio/commit/19edea067f890814c767581fef65713…

2 years, 5 months

git:master:38d2a6a1: tls_wolfssl: add wolfssl@e722c15be8 as a submodule

by S-P Chan

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…

2 years, 5 months

git:master:85a2523d: tls_wolfssl: reduce overhead per fragment to maintain 16 byte alignment

by S-P Chan

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); } }

2 years, 5 months

git:master:4484a5eb: tls_wolfssl: ser_realloc realign memory correctly to 16-bytes

by S-P Chan

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); }

2 years, 5 months

[kamailio/kamailio] shm_malloc to align on __alignof__(_max_align_t) like malloc = 16 bytes (Issue #3157)

by space88man

### 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 years, 5 months

[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

### 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>

2 years, 5 months

[kamailio/kamailio] acc: Fix reason code for locally generated replies. (PR #3137)

by Frits Wiersma

- 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>

2 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022