sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

[kamailio/kamailio] uac: Fix restore for replies on upstream in-dialog requests (PR #4303)
by Bastian Triller 08 Jul '25

08 Jul '25

2 5

git:master:0d4ffb74: uac: Fix From/To header restore with dialog store
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 0d4ffb74a949ae6e390d334b30ec51cedb001226 URL: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:13:58+02:00 uac: Fix From/To header restore with dialog store When replacing From/To header and using dialog module to store original URIs (modparam restore_dlg=1), restoring of headers does not work for replies to in-dialog requests sent upstream. Add in-dialog request's direction to TM callback parameter, so correct URIs are restored for replies to upstream in-dialog requests. --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… Patch: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index f13a661ca95..b7a2b8b38dd 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -810,15 +810,22 @@ void restore_uris_reply(struct cell *t, int type, struct tmcb_params *p) struct sip_msg *req; struct sip_msg *rpl; int_str avp_value; + unsigned int direction = 0; if(!t || !t->uas.request || !p->rpl) return; + if(*p->param) { + direction = (unsigned int)(unsigned long)*p->param; + } + req = t->uas.request; rpl = p->rpl; - if(req->msg_flags & FL_USE_UAC_FROM) { - + if(((req->msg_flags & FL_USE_UAC_FROM) + && (!direction || direction == DLG_DIR_DOWNSTREAM)) + || ((req->msg_flags & FL_USE_UAC_TO) + && direction == DLG_DIR_UPSTREAM)) { /* parse FROM in reply */ if(parse_from_header(rpl) < 0) { LM_ERR("failed to find/parse FROM hdr\n"); @@ -835,8 +842,11 @@ void restore_uris_reply(struct cell *t, int type, struct tmcb_params *p) LM_ERR("failed to restore FROM\n"); } } - if(req->msg_flags & FL_USE_UAC_TO) { + if(((req->msg_flags & FL_USE_UAC_TO) + && (!direction || direction == DLG_DIR_DOWNSTREAM)) + || ((req->msg_flags & FL_USE_UAC_FROM) + && direction == DLG_DIR_UPSTREAM)) { /* parse TO in reply */ if(rpl->to == 0 && (parse_headers(rpl, HDR_TO_F, 0) != 0 || rpl->to == 0)) { @@ -997,8 +1007,9 @@ static void replace_callback( /* register tm callback to change replies, * but only if not registered earlier */ if(!(msg->msg_flags & (FL_USE_UAC_FROM | FL_USE_UAC_TO)) - && uac_tmb.register_tmcb( - msg, 0, TMCB_RESPONSE_IN, restore_uris_reply, 0, 0) + && uac_tmb.register_tmcb(msg, 0, TMCB_RESPONSE_IN, + restore_uris_reply, + (void *)(unsigned long)_params->direction, 0) != 1) { LM_ERR("failed to install TM callback\n"); return;

1 0

git:master:2048aac0: textops: use core function to decode hex string with whitespaces
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 2048aac0a55f562436ce8fea53d748c2dd1bca42 URL: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:04:38+02:00 textops: use core function to decode hex string with whitespaces --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c… Patch: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c…

1 0

git:master:5c83f2ea: core: ut - convenience function to decode hexa with whitespaces
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 5c83f2ea04cfc02dc53532b53888a33be295a997 URL: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:04:38+02:00 core: ut - convenience function to decode hexa with whitespaces --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… Patch: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… --- diff --git a/src/core/ut.c b/src/core/ut.c index cac9fcaf00b..317a0384a12 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -498,3 +498,79 @@ void *ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) return NULL; } + +/** + * decode hexa value in shex, storing in sraw + * - on success sraw->s is pkg-allocated and has to be pkg-freed + * - return 0 on success, -1 on failure + */ +int ksr_hex_decode_ws(str *shex, str *sraw) +{ + int i; + char v; + + if(shex == NULL || shex->s == NULL || shex->len == 0) { + LM_ERR("invalid body parameter\n"); + return -1; + } + + sraw->len = shex->len / 2 + 2; + sraw->s = pkg_malloc(sraw->len * sizeof(char)); + if(sraw->s == NULL) { + LM_ERR("no more pkg memory\n"); + sraw->len = 0; + return -1; + } + memset(sraw->s, 0, sraw->len * sizeof(char)); + + sraw->len = 0; + for(i = 0; i < shex->len; i++) { + if(shex->s[i] == ' ' || shex->s[i] == '\t') { + continue; + } + if(i + 1 == shex->len) { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + v = 0; + if(shex->s[i] >= '0' && shex->s[i] <= '9') { + v = (shex->s[i] - '0') << 4; + } else if(shex->s[i] >= 'A' && shex->s[i] <= 'F') { + v = (shex->s[i] - 'A' + 10) << 4; + } else if(shex->s[i] >= 'a' && shex->s[i] <= 'f') { + v = (shex->s[i] - 'a' + 10) << 4; + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + i++; + if(shex->s[i] >= '0' && shex->s[i] <= '9') { + v += (shex->s[i] - '0'); + } else if(shex->s[i] >= 'A' && shex->s[i] <= 'F') { + v += (shex->s[i] - 'A' + 10); + } else if(shex->s[i] >= 'a' && shex->s[i] <= 'f') { + v += (shex->s[i] - 'a' + 10); + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + sraw->s[sraw->len++] = v; + } + if(sraw->len == 0) { + /* only white spaces */ + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, shex->s, + shex->len, i); + goto error; + } + + return 0; + +error: + pkg_free(sraw->s); + sraw->s = NULL; + sraw->len = 0; + return -1; +} diff --git a/src/core/ut.h b/src/core/ut.h index 3a3d66202b6..a0b01e23dfb 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1294,4 +1294,6 @@ void *ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2); */ void *ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2); +int ksr_hex_decode_ws(str *shex, str *sraw); + #endif

1 0

Ideas for developer meeting 2: Rearchitect TLS
by Richard Chan 08 Jul '25

08 Jul '25

(Apologies for the long wall of text) Ideas for developer meeting 2: Rearchitect TLS Background: Kamailio uses OpenSSL in fork() for load balancing (TLS followed by SIP).The TLS state must be in shared memory so that each worker can pick up where the previous worker has left off. Over the years this has caused much friction - only OpenSSL 3 and wolfSSL can be used in this manner because they include hooks for memory management Problems with current architecture Original OpenSSL 3+ has gone heavily down the way of using pthreads, especially thread-local variables. OpenSSL lookalikes - boringSSL, libreSSL, AWS-LC - don't support memory management to redirect functions to shared memory pools A pure GPL library like GnuTLS also not enable memory management hooks Today Kamailio is "fighting" its primary TLS provider, namely OpenSSL 3. We require pthread symbol overrides (which is a code smell) and have to do thread local tricks for the workers to have a clean state. With OpenSSL 3 - Kamailio users have an unhappy relationship with memory management. Structures are duplicated per worker(SSL_CTX) to avoid unexpected failures when an SSL object derived from worker A is used in worker B. Using a single SSL_CTX in the main process - in an attempt to conserve memory - has not been solved yet (my assessment is that this problem can be solved within the current architecture). History It seems that Kamailio code base has vestiges of when TLS was handled in core (possibly the TCP manager process?). Proposal 2 This proposal has the spirit that we should not be fighting the libraries we use especially if this library is a key component of many distributions/containers with many eyes on the way we use and abuse OpenSSL. The Zen of OpenSSL(I just made that up) would suggest we embrace their path forward and have Kamailio work within that boundary. The GPL of Kamailio would also suggest that we should validate this approach with the ability to use something like GnuTLS. This proposal is to perform TLS in a thread-pool in the TCP manager so that all TLS related operations are confined to a single process. When the TCP manager terminates or initiates TLS it should perform TLS in a hairpin socketpair(managed by a thread pool). The socket fd used in sendmsg/recvmsg with the worker is this internal proxy'ied socket but carries metadata about the original connection. In other words: Kamailio TCP manager internally implements a TLS/TCP bridge like Nginx/HAProxy do with HTTPS/HTTP or TLS/TCP. These proxies send headers so the worker is informed about the nature of the original connection. Benefits - use OpenSSL/AWS-LC/boringSSL/libreSSL in the way they are intended to be used; even GnuTLS - no pthreads hackery - a well-defined boundary for TLS operations, certificate and key management: allowing for easier scrutiny and audit The offloading of both TLS/SIP dates from the days when threading was poor on Linux. Today that is no longer the case, so the TLS Manager could handle all TLS and the worker should handle SIP/TCP. In fact this proposal was inspired by the recent work on UDP enhancement. Optional riff: we may be able to off-load TLS entirely to HAProxy(or any other TLS/TLS bridge). Instead of handling TLS ourselves Kamailio creates a new type of listener/speaker haproxy-in, haproxy-out. Kamailio "knows" that these sockets are not SIP traffic but internal hairpins to decrypt/encrypt the streams via HAProxy et al. Think of Kamailio as using HAProxy as a filter object: the sendmsg/recvmsg will use the haproxy-in socket (which is what the worker will see - TCP only). See the sidenode below. t_relay would have to taught that it doesn't need to look for "real" TLS sockets but instead a proxy socket should suffice. Sidenote: Today TLS can be solved with external TLS/TCP bridges. The main issue with this approach is the config file occasionally needs to force TCP otherwise Kamailio will look for a non-existent TLS socket - so it is not an entirely happy experience for users. Richard (Shih-Ping)

2 4

Dispatcher coherence: marking destinations and running event routes
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Hello, there is (still) some incoherence in dispatcher module regarding the marking of a destination (e.g., to inactive state) and execution of event route. First, which I tried to address earlier today, was that ds_mark_dst() was taking in consideration the value of ds_probing_threshold, which was intended for keepalives, so the use of the function was not having any effect (as documented) till it was used so many times as the parameter value, probably not noticed so far because the default value for the parameter is 1. Similar would be for setting destination active and the value of ds_inactive_threshold. Going on the same execution path as with setting the state of a destination based on keepalives, the use of ds_mark_dst() results in running the event routes, which I am not sure it is really expected. But then, setting the state of a destination via RPC is not running event routes and it was done immediately via reinitialising the state, without any relation to ds_probing_threshold or ds_inactive_threshold. So the questions would be: 1) the documented way is the expected one on admin-instructed state update (via config functions or rpc), respectively do it immediately, without considering ds_probing_threshold or ds_inactive_threshold? It is like now in git master branch, but for many years the config functions took in consideration the parameters. 2) shall event routes be executed only on SIP keepalives, or also on admin-instructed state update (via config functions or rpc)? Or leave it only for keepalives and config functions, like it is now, with updating documentation to be clear. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

2 1

Ideas for developer meeting 2b: Teach TCP sockets that they are TLS proxies
by Richard Chan 08 Jul '25

08 Jul '25

Ideas for developer meeting 2b: Teach TCP sockets that they are TLS proxies Background: This is a follow-on for Proposal 2 - it is for each of use TLS offloading to external proxies. When using external TLS/TCP bridges users encounter a mismatch when the URI/socket matcher cannnot find a matching TLS socket. Users can work around this by forcing t_relay_to but it is not a natural map. Some dancing with record-route headers is usually necessary Proposal 2b This proposal is to have a marker in config file on TCP listeners that they are in fact proxy'd TLS connections. So the look-and-feel should be TLS except that they skip mod_tls processing. When the config searches for matching socket this type of TLS-proxy will be found. Benefits: - can sidestep more exotic mod_tls problems with OpenSSL; user just offloads to HAProxy et al - seamless config: these proxy'ied sockets have enough metadata that look like TLS socket for URIs, record-route etc handling Richard (Shih-Ping)

3 2

[kamailio/kamailio] core: Add null and empty check for AVP name (PR #4302)
by Tomohare 08 Jul '25

08 Jul '25

3 16

[kamailio/kamailio] core/cmake: Allow definitions to be visible in kamailio flags (PR #4310)
by Xenofon Karamanos 08 Jul '25

08 Jul '25

#### 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  Include the nessecary headers so that the preprocessor definitions regarding memory debug are available when printing the list of compiled options. `DBG_[Q|F|TLSF]_MALLOC` are all defined in the respective headers when `DBG_SR_MEMORY` is defined (https://github.com/kamailio/kamailio/blob/1b4da61baa592a306235cb838e1082fd3…) but `ver_defs.h` does not see it due to missing headers. Therefore `kamailio -I` will not print them when `DBG_SR_MEMORY` is defined. (If it's provided by the user as a definition it will show up ofc but we still miss the information if not). Before patch and only `DBG_SR_MEMORY` provided: ``` sbin/kamailio -I Print out of kamailio internals Version: kamailio 6.1.0-dev1 (x86_64/Linux) 17d577-dirty Default config: /home/xenofon/kamailio-installs/permissions_group/etc/kamailio/kamailio.cfg Default paths to modules: /home/xenofon/kamailio-installs/permissions_group/lib/kamailio/modules Default path to runtime dir: /run/kamailio Compile 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 ``` After patch and only `DBG_SR_MEMORY` provided: ``` sbin/kamailio -I Print out of kamailio internals Version: kamailio 6.1.0-dev1 (x86_64/Linux) ae8fcb-dirty Default config: /home/xenofon/kamailio-installs/http_client_leak/etc/kamailio/kamailio.cfg Default paths to modules: /home/xenofon/kamailio-installs/http_client_leak/lib/kamailio/modules Default path to runtime dir: /run/kamailio Compile flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, DBG_SYS_MEMORY, Q_MALLOC, F_MALLOC, TLSF_MALLOC, **DBG_SR_MEMORY, DBG_QM_MALLOC, DBG_F_MALLOC, DBG_TLSF_MALLOC**, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ``` --- Also added the `EXTRA_DEFS` cmake cache variable that one can provide for yet to be defined as an option in the cmake for a convenience. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4310 -- Commit Summary -- * core: Include memcore so that defintions of can be added to compile flags * cmake: Update and add options -- File Changes -- M cmake/defs.cmake (42) M src/core/mem/f_malloc.h (2) M src/core/mem/memcore.h (3) M src/core/mem/q_malloc.h (2) M src/core/ver.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4310.patch https://github.com/kamailio/kamailio/pull/4310.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4310 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4310(a)github.com>

1 0

git:master:1b4da61b: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 1b4da61baa592a306235cb838e1082fd31f4ec46 URL: https://github.com/kamailio/kamailio/commit/1b4da61baa592a306235cb838e1082f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-08T13:01:09+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/1b4da61baa592a306235cb838e1082f… Patch: https://github.com/kamailio/kamailio/commit/1b4da61baa592a306235cb838e1082f…

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