sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
237 discussions

git:master:ced8d46e: core: parser extended to handle diversion with multiple bodies
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: ced8d46eddb2bda614eaace98437b7dab2d123e3 URL: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:01:39+01:00 core: parser extended to handle diversion with multiple bodies - similar to PAI and PPI --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_diversion.h --- Diff: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Patch: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d…

1 0

[kamailio/kamailio] lib: big integers should not be treated as negative ones (#2106)
by Ivan Murashko 08 Dec '23

08 Dec '23

0xffffffff00000000ULL mask does not take into consideration signed 32 bit integers and as result 2147483648 will be stored as -2147483648. Another mask should be used to correct the issue: 0xffffffff80000000ULL. It processes correctly the case of integers that are greater than 2147483647. There are several gdb tests below: (gdb) p ((unsigned long long)2147483648 & 0xffffffff80000000ULL) $1= 2147483648 (gdb) p ((unsigned long long)2147483647 & 0xffffffff80000000ULL) $2 = 0 (gdb) p ((unsigned long long)2147483646 & 0xffffffff80000000ULL) $3 = 0 (gdb) p ((unsigned long long)4147483646 & 0xffffffff80000000ULL) $4 = 2147483648   #### 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/2106 -- Commit Summary -- * lib: big integers should not be treated as negative ones -- File Changes -- M src/lib/srdb1/db_ut.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2106.patch https://github.com/kamailio/kamailio/pull/2106.diff -- 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/pull/2106

4 6

git:master:6d14b4e4: lib/srdb1: rework store of long long values as number if value fits
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 6d14b4e439aec3d046addfa776a4be5f471a33f0 URL: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T10:23:20+01:00 lib/srdb1: rework store of long long values as number if value fits - GH #2106 --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Patch: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index c7a8887044e..9975672aeea 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -610,11 +610,16 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.rs.len = LL_LEN; db_longlong2str(dbval->val.ll_val, ll_buf, &pv.rs.len); pv.rs.s = ll_buf; - /* if it fits, also store as 32 bit integer*/ - if(!((unsigned long long)dbval->val.ll_val - & 0xffffffff00000000ULL)) { + /* if it fits, also store as long number */ + if(sizeof(long long) == sizeof(long)) { pv.flags |= PV_VAL_INT | PV_TYPE_INT; - pv.ri = (int)dbval->val.ll_val; + pv.ri = (long)dbval->val.ll_val; + } else { + if(dbval->val.ll_val >= LONG_MIN + && dbval->val.ll_val <= LONG_MAX) { + pv.flags |= PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.ll_val; + } } break; default:

1 0

git:master:c79f28b1: pv: Add PPI and PAI support to hfl and hflc
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: c79f28b11f2683d11aafa72427efb15c95196b8b URL: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:46:56+01:00 pv: Add PPI and PAI support to hfl and hflc --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Patch: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15…

1 0

[kamailio/kamailio] uac: fix socket length settings (PR #3664)
by Péter Barabás 08 Dec '23

08 Dec '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR fixes the setting of uac_req object's socket length. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3664 -- Commit Summary -- * uac: fix socket length settings -- File Changes -- M src/modules/uac/uac_send.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3664.patch https://github.com/kamailio/kamailio/pull/3664.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3664 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3664(a)github.com>

2 2

git:master:10519d19: uac: fix socket length settings
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 10519d199f6cac116399f4473bd82f2b08de72ba URL: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Author: Pe��ter Baraba��s <peter.barabas(a)securesoft.hu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:42:08+01:00 uac: fix socket length settings - set _uac_req.s_sock.len value to 0 in pv_set_uac_req() method in case of "all" case - change setting of _uac_req.s_apasswd.len to _uac_req.s_sock.len in pv_set_uac_req() method in case of "sock" case --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Patch: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c098feacff2..b2cdaad9066 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -210,6 +210,7 @@ int pv_set_uac_req( _uac_req.s_body.len = 0; _uac_req.s_method.len = 0; _uac_req.s_callid.len = 0; + _uac_req.s_sock.len = 0; _uac_req.evroute = 0; _uac_req.evtype = 0; _uac_req.evcode = 0; @@ -399,7 +400,7 @@ int pv_set_uac_req( break; case 12: if(tval == NULL) { - _uac_req.s_apasswd.len = 0; + _uac_req.s_sock.len = 0; return 0; } if(!(tval->flags & PV_VAL_STR)) {

1 0

[kamailio/kamailio] sslv3 errors showing up with 'tls_method' set as 'TLSv1.2+' (Issue #3085)
by Vinicius K. Ruoso 07 Dec '23

07 Dec '23

### Description Some users are having issues connecting to kamailio websocket using TLS. The logs show SSLv3 errors. Cannot find why that error would show up if SSLv2/3 is not enabled. Double checked it via SSLLabs that only TLSv1.2 is allowed in the service. Any pointers would be appreciated. Also, let me know if more debug information is needed. ### Troubleshooting #### Debugging Data This is the TLS config: ``` modparam("tls", "tls_method", "TLSv1.2+") modparam("tls", "verify_certificate", 0) modparam("tls", "require_certificate", 0) modparam("tls", "low_mem_threshold1", 0) modparam("tls", "low_mem_threshold2", 0) modparam("tls", "private_key", "/etc/certs/tls.key") modparam("tls", "certificate", "/etc/certs/tls.crt") ``` This is the output from tls module in kamcmd: ``` kamcmd> tls.info { max_connections: 2048 opened_connections: 353 clear_text_write_queued_bytes: 0 } kamcmd> tls.options { force_run: 0 method: TLSv1.2+ verify_certificate: 0 verify_depth: 9 require_certificate: 0 private_key: /etc/certs/tls.key ca_list: <null string> certificate: /etc/certs/tls.crt cipher_list: <null string> session_cache: 0 session_id: kamailio-tls-5.x.y config: <null string> log: 3 debug: 3 connection_timeout: 600 disable_compression: 1 ssl_release_buffers: -1 ssl_freelist_max: -1 ssl_max_send_fragment: -1 ssl_read_ahead: 0 send_close_notify: 0 low_mem_threshold1: 0 low_mem_threshold2: 0 ct_wq_max: 10485760 con_ct_wq_max: 65536 ct_wq_blk_size: 4096 } ``` #### Log Messages I see this log messages related to SSLv3: ``` 15(36) ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:14094416:SSL routines:ssl3_read_bytes:sslv3 alert certificate unknown 15(36) ERROR: <core> [core/tcp_read.c:1512]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7fafc8768190 r: 0x7fafc8768278 (-1) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.9 (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 6.3.0 ``` * **Operating System**: Debian 9.13. ``` Linux 4.19.112+ #1 SMP Wed Sep 23 07:53:39 PDT 2020 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3085 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3085(a)github.com>

3 5

git:5.7:63e87491: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: 5.7 Commit: 63e8749132257ef1f8c8d86ec78f6db2c699f1c8 URL: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:32:04+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 (cherry picked from commit 4b068f49b618dca5fa85a1687bd9054c1d98ae6a) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Patch: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db…

1 0

git:master:4b068f49: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 4b068f49b618dca5fa85a1687bd9054c1d98ae6a URL: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:07:09+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Patch: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054…

1 0

git:master:964c21e1: pv_headers: rearrange module parameters
by Victor Seva 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 964c21e16ab4da96d989c230ea18d95872257394 URL: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-07T12:28:02+01:00 pv_headers: rearrange module parameters * pvh_ prefix for global variables --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pv_headers.h Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_hash.h Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h Modified: src/modules/pv_headers/pvh_str.c Modified: src/modules/pv_headers/pvh_str.h Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Patch: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95…

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