sr-dev

sr-dev@lists.kamailio.org

12 participants
45245 discussions

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

git:master:fae8b832: textops: docs for set_body_hex(...)
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: fae8b8321d59280309d7a02b6ba4fe7d3f9ad22f URL: https://github.com/kamailio/kamailio/commit/fae8b8321d59280309d7a02b6ba4fe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T12:45:50+02:00 textops: docs for set_body_hex(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fae8b8321d59280309d7a02b6ba4fe7… Patch: https://github.com/kamailio/kamailio/commit/fae8b8321d59280309d7a02b6ba4fe7… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9560eb6d663..ce61cccb4d8 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -881,6 +881,39 @@ set_body("test", "text/plain"); </example> </section> + <section id="textops.f.set_body_hex"> + <title> + <function moreinfo="none">set_body_hex(htxt, content_type)</function> + </title> + <para> + Set body to a SIP message with the hexa-decoded value of htxt. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>htxt</emphasis> - hexa-encoded value for the body, + can include pseudo-variables. White spaces and tabs are ignored. + </para> + </listitem> + <listitem> + <para><emphasis>content_type</emphasis> - value of Content-Type header, + can include pseudo-variables. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>set_body_hex</function> usage</title> + <programlisting format="linespecific"> +... +set_body_hex("b0 8e 4a f2", "binary/data"); +... +</programlisting> + </example> + </section> + <section id="textops.f.set_reply_body"> <title> <function moreinfo="none">set_reply_body(txt, content_type)</function>

1 0

git:master:d57c14e5: textops: remove old body based on message length for set_body()
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: d57c14e594f9ae31eba05c5192aceefe4f44f1fe URL: https://github.com/kamailio/kamailio/commit/d57c14e594f9ae31eba05c5192aceef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T12:39:56+02:00 textops: remove old body based on message length for set_body() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/d57c14e594f9ae31eba05c5192aceef… Patch: https://github.com/kamailio/kamailio/commit/d57c14e594f9ae31eba05c5192aceef… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 4686d72fce9..bfd58d21114 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2506,7 +2506,6 @@ static int ki_set_body(sip_msg_t *msg, str *nb, str *nc) return -1; } - body.len = 0; body.s = get_body(msg); if(body.s == 0) { LM_ERR("malformed sip message\n"); @@ -2516,17 +2515,12 @@ static int ki_set_body(sip_msg_t *msg, str *nb, str *nc) del_nonshm_lump(&(msg->body_lumps)); msg->body_lumps = NULL; - if(msg->content_length) { - body.len = get_content_length(msg); - if(body.len > 0) { - if(body.s + body.len > msg->buf + msg->len) { - LM_ERR("invalid content length: %d\n", body.len); - return -1; - } - if(del_lump(msg, body.s - msg->buf, body.len, 0) == 0) { - LM_ERR("cannot delete existing body"); - return -1; - } + /* remove existing body */ + body.len = msg->buf + msg->len - body.s; + if(body.len > 0) { + if(del_lump(msg, body.s - msg->buf, body.len, 0) == 0) { + LM_ERR("cannot remove body\n"); + return -1; } }

1 0

git:master:c6a8b109: textops: exported set_body_hex(...) to kemi
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: c6a8b10995a00d8dfc4bbfc176ad8b98a619154e URL: https://github.com/kamailio/kamailio/commit/c6a8b10995a00d8dfc4bbfc176ad8b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T12:35:36+02:00 textops: exported set_body_hex(...) to kemi --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/c6a8b10995a00d8dfc4bbfc176ad8b9… Patch: https://github.com/kamailio/kamailio/commit/c6a8b10995a00d8dfc4bbfc176ad8b9… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 1b6ede470a0..4686d72fce9 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2638,7 +2638,7 @@ static int set_body_f(struct sip_msg *msg, char *p1, char *p2) return ki_set_body(msg, &nb, &nc); } -int ki_set_body_hex_f(sip_msg_t *msg, str *htxt, str *ct) +int ki_set_body_hex(sip_msg_t *msg, str *htxt, str *ct) { str sraw; int i; @@ -2730,7 +2730,7 @@ static int set_body_hex_f(struct sip_msg *msg, char *p1, char *p2) return -1; } - return ki_set_body_hex_f(msg, &nb, &nc); + return ki_set_body_hex(msg, &nb, &nc); } static int ki_set_rpl_body(sip_msg_t *msg, str *nb, str *nc) @@ -5579,6 +5579,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("set_body_hex"), + SR_KEMIP_INT, ki_set_body_hex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("set_reply_body"), SR_KEMIP_INT, ki_set_rpl_body, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:f6220959: textops: added set_body_hex(hbody, ctype)
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: f62209595797e2f2f4d5dbd9cfdfd704dee6fa9e URL: https://github.com/kamailio/kamailio/commit/f62209595797e2f2f4d5dbd9cfdfd70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T12:29:40+02:00 textops: added set_body_hex(hbody, ctype) - set a body with the parameter provided as hexa value - the value is decoded, allowing to set binary body - the value can have empty spaces or tabs that are ignored (e.g., to be easier to read) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/f62209595797e2f2f4d5dbd9cfdfd70… Patch: https://github.com/kamailio/kamailio/commit/f62209595797e2f2f4d5dbd9cfdfd70… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 4a541399f18..1b6ede470a0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -115,6 +115,7 @@ static int append_urihf(struct sip_msg *msg, char *str1, char *str2); static int append_time_f(struct sip_msg *msg, char *, char *); static int append_time_request_f(struct sip_msg *msg, char *, char *); static int set_body_f(struct sip_msg *msg, char *, char *); +static int set_body_hex_f(struct sip_msg *msg, char *, char *); static int set_rpl_body_f(struct sip_msg *msg, char *, char *); static int set_multibody_0(struct sip_msg *msg, char *, char *, char *); static int set_multibody_1(struct sip_msg *msg, char *, char *, char *); @@ -265,6 +266,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, {"set_body", (cmd_function)set_body_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, + {"set_body_hex", (cmd_function)set_body_hex_f, 2, fixup_spve_spve, 0, + ANY_ROUTE}, {"set_reply_body", (cmd_function)set_rpl_body_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, {"is_method", (cmd_function)is_method_f, 1, fixup_method, 0, ANY_ROUTE}, @@ -2635,6 +2638,101 @@ static int set_body_f(struct sip_msg *msg, char *p1, char *p2) return ki_set_body(msg, &nb, &nc); } +int ki_set_body_hex_f(sip_msg_t *msg, str *htxt, str *ct) +{ + str sraw; + int i; + int ret; + char v; + + if(htxt == NULL || htxt->s == NULL || htxt->len == 0) { + LM_ERR("invalid body parameter\n"); + return -1; + } + + sraw.len = htxt->len / 2 + 2; + sraw.s = pkg_malloc(sraw.len * sizeof(char)); + if(sraw.s == NULL) { + LM_ERR("no more pkg memory\n"); + return -1; + } + memset(sraw.s, 0, sraw.len * sizeof(char)); + + sraw.len = 0; + for(i = 0; i < htxt->len; i++) { + if(htxt->s[i] == ' ' || htxt->s[i] == '\t') { + continue; + } + if(i + 1 == htxt->len) { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", htxt->len, + htxt->s, htxt->len, i); + pkg_free(sraw.s); + return -1; + } + v = 0; + if(htxt->s[i] >= '0' && htxt->s[i] <= '9') { + v = (htxt->s[i] - '0') << 4; + } else if(htxt->s[i] >= 'A' && htxt->s[i] <= 'F') { + v = (htxt->s[i] - 'A' + 10) << 4; + } else if(htxt->s[i] >= 'a' && htxt->s[i] <= 'f') { + v = (htxt->s[i] - 'a' + 10) << 4; + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", htxt->len, + htxt->s, htxt->len, i); + pkg_free(sraw.s); + return -1; + } + i++; + if(htxt->s[i] >= '0' && htxt->s[i] <= '9') { + v += (htxt->s[i] - '0'); + } else if(htxt->s[i] >= 'A' && htxt->s[i] <= 'F') { + v += (htxt->s[i] - 'A' + 10); + } else if(htxt->s[i] >= 'a' && htxt->s[i] <= 'f') { + v += (htxt->s[i] - 'a' + 10); + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", htxt->len, + htxt->s, htxt->len, i); + pkg_free(sraw.s); + return -1; + } + sraw.s[sraw.len++] = v; + } + if(sraw.len == 0) { + /* only white spaces */ + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", htxt->len, htxt->s, + htxt->len, i); + pkg_free(sraw.s); + return -1; + } + ret = ki_set_body(msg, &sraw, ct); + pkg_free(sraw.s); + + return ret; +} + +static int set_body_hex_f(struct sip_msg *msg, char *p1, char *p2) +{ + str nb = {0, 0}; + str nc = {0, 0}; + + if(p1 == 0 || p2 == 0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)p1, &nb) != 0) { + LM_ERR("unable to get p1\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)p2, &nc) != 0) { + LM_ERR("unable to get p2\n"); + return -1; + } + + return ki_set_body_hex_f(msg, &nb, &nc); +} + static int ki_set_rpl_body(sip_msg_t *msg, str *nb, str *nc) { char *buf;

1 0

git:master:508e5909: cplc: update main process variable after the internal fork()
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 508e59090960322d1709b7e56a41300d0e948600 URL: https://github.com/kamailio/kamailio/commit/508e59090960322d1709b7e56a41300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T11:53:07+02:00 cplc: update main process variable after the internal fork() - probably module should be updated to use internal API fork_process() --- Modified: src/modules/cplc/cpl_nonsig.c --- Diff: https://github.com/kamailio/kamailio/commit/508e59090960322d1709b7e56a41300… Patch: https://github.com/kamailio/kamailio/commit/508e59090960322d1709b7e56a41300… --- diff --git a/src/modules/cplc/cpl_nonsig.c b/src/modules/cplc/cpl_nonsig.c index b0cb8d87bfe..515e8fb7df1 100644 --- a/src/modules/cplc/cpl_nonsig.c +++ b/src/modules/cplc/cpl_nonsig.c @@ -152,6 +152,7 @@ static inline void send_mail(struct cpl_cmd *cmd) LM_ERR("fork failed: %s\n", strerror(errno)); goto error; } else if(pid == 0) { + _ksr_is_main = 0; /* child -> close all descriptors excepting pfd[0] */ /* 32 is the maximum number of inherited open file descriptors */ for(i = 3; i < 32; i++)

1 0

← Newer
1
2
3
4
5
6
7
...
4525
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev