sr-dev June 2025

sr-dev@lists.kamailio.org

20 participants
215 discussions

git:master:d79bc9b9: core: dns - macro wrappers to print more details on dns hash put
by Daniel-Constantin Mierla 24 Jun '25

24 Jun '25

Module: kamailio Branch: master Commit: d79bc9b9b85f247d8b4bca37d2f84d4dcb412730 URL: https://github.com/kamailio/kamailio/commit/d79bc9b9b85f247d8b4bca37d2f84d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-24T20:40:34+02:00 core: dns - macro wrappers to print more details on dns hash put --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/d79bc9b9b85f247d8b4bca37d2f84d4… Patch: https://github.com/kamailio/kamailio/commit/d79bc9b9b85f247d8b4bca37d2f84d4… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 0a2553f58f2..c6dc68a7930 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -162,14 +162,15 @@ inline static void dns_destroy_entry_shm_unsafe(struct dns_hash_entry *e) /* dec. the internal refcnt and if 0 deletes the entry */ -void dns_hash_put(struct dns_hash_entry *e) +void dns_hash_put_entry( + struct dns_hash_entry *e, const char *fpath, unsigned int line) { if(e != NULL) { if(atomic_dec_and_test(&e->refcnt)) { /* atomic_sub_long(dns_cache_total_used, e->total_size); */ dns_destroy_entry(e); } else if(e->next == NULL && e->prev == NULL) { - LM_WARN("unlinked item %p\n", e); + LM_WARN("unlinked item %p (%s:%u)\n", e, fpath, line); } } } @@ -177,14 +178,15 @@ void dns_hash_put(struct dns_hash_entry *e) /* same as above but uses dns_destroy_unsafe (assumes shm_lock held -- tm * optimization) */ -void dns_hash_put_shm_unsafe(struct dns_hash_entry *e) +void dns_hash_put_entry_shm_unsafe( + struct dns_hash_entry *e, const char *fpath, unsigned int line) { if(e != NULL) { if(atomic_dec_and_test(&e->refcnt)) { /* atomic_sub_long(dns_cache_total_used, e->total_size); */ dns_destroy_entry_shm_unsafe(e); } else if(e->next == NULL && e->prev == NULL) { - LM_WARN("unlinked item %p\n", e); + LM_WARN("unlinked item %p (%s:%u)\n", e, fpath, line); } } } diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index d92fd3dc27f..18bb3733730 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -193,24 +193,31 @@ int init_dns_cache_stats(int iproc_num); #endif void destroy_dns_cache(void); +void dns_hash_put_entry( + struct dns_hash_entry *e, const char *fpath, unsigned int line); +void dns_hash_put_entry_shm_unsafe( + struct dns_hash_entry *e, const char *fpath, unsigned int line); -void dns_hash_put(struct dns_hash_entry *e); -void dns_hash_put_shm_unsafe(struct dns_hash_entry *e); +#define dns_hash_put(e) dns_hash_put_entry(e, __FILE__, __LINE__) +#define dns_hash_put_shm_unsafe(e) \ + dns_hash_put_entry_shm_unsafe(e, __FILE__, __LINE__) -inline static void dns_srv_handle_put(struct dns_srv_handle *h) +inline static void dns_srv_handle_put_helper( + struct dns_srv_handle *h, const char *fpath, unsigned int line) { if(h) { if(h->srv) { - dns_hash_put(h->srv); + dns_hash_put_entry(h->srv, fpath, line); h->srv = 0; } if(h->a) { - dns_hash_put(h->a); + dns_hash_put_entry(h->a, fpath, line); h->a = 0; } } } +#define dns_srv_handle_put(h) dns_srv_handle_put_helper(h, __FILE__, __LINE__) /** @brief use it when copying, it manually increases the ref cound */ inline static void dns_srv_handle_ref(struct dns_srv_handle *h)

1 0

git:master:deb8405b: dispatcher: renamed field to reflect better the purpose and print in rpc result
by Daniel-Constantin Mierla 24 Jun '25

24 Jun '25

Module: kamailio Branch: master Commit: deb8405b403a5a8da4f2aac3aa167e2a84d15d91 URL: https://github.com/kamailio/kamailio/commit/deb8405b403a5a8da4f2aac3aa167e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-24T19:18:52+02:00 dispatcher: renamed field to reflect better the purpose and print in rpc result --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/deb8405b403a5a8da4f2aac3aa167e2… Patch: https://github.com/kamailio/kamailio/commit/deb8405b403a5a8da4f2aac3aa167e2…

1 0

git:6.0:3c19d508: secsipid: set global url pointer to null after free
by Daniel-Constantin Mierla 24 Jun '25

24 Jun '25

Module: kamailio Branch: 6.0 Commit: 3c19d508ea84d8541b9eca0fc06c0c62309b34cc URL: https://github.com/kamailio/kamailio/commit/3c19d508ea84d8541b9eca0fc06c0c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-24T18:54:26+02:00 secsipid: set global url pointer to null after free - GH #4284 (cherry picked from commit 15a976808f5e785a6d234734b0a7de0d735d4a5a) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3c19d508ea84d8541b9eca0fc06c0c6… Patch: https://github.com/kamailio/kamailio/commit/3c19d508ea84d8541b9eca0fc06c0c6… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index ebe2e2e50ef..eecf18c77bd 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -916,6 +916,7 @@ static sr_kemi_xval_t *ki_secsipid_get_url(sip_msg_t *msg, str *surl) if(_secsipid_get_url_val.s != NULL) { free(_secsipid_get_url_val.s); + _secsipid_get_url_val.s = NULL; _secsipid_get_url_val.len = 0; } @@ -959,6 +960,7 @@ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) } if(_secsipid_get_url_val.s != NULL) { free(_secsipid_get_url_val.s); + _secsipid_get_url_val.s = NULL; _secsipid_get_url_val.len = 0; }

1 0

git:6.0:6de03f80: websocket: set the field for event route execution on timer removing
by Daniel-Constantin Mierla 24 Jun '25

24 Jun '25

Module: kamailio Branch: 6.0 Commit: 6de03f80bd266ab8b2ddf018b68f3501bd0094b0 URL: https://github.com/kamailio/kamailio/commit/6de03f80bd266ab8b2ddf018b68f350… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-24T18:54:06+02:00 websocket: set the field for event route execution on timer removing - GH #3950 (cherry picked from commit e77ba1cdf80b384bc55cc457d280b5fc0aef80db) --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/6de03f80bd266ab8b2ddf018b68f350… Patch: https://github.com/kamailio/kamailio/commit/6de03f80bd266ab8b2ddf018b68f350… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 18e0e4667bd..577abbe582a 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -708,6 +708,7 @@ void ws_timer(unsigned int ticks, void *param) LM_DBG("ws structure without active tcp connection\n"); wsc->state = WS_S_REMOVING; wsc->rmticks = get_ticks(); + wsc->run_event = 1; } else { tcpconn_put(con); }

1 0

git:6.0:cf14f324: websocket: updated a couple of debug messages with id and hash id
by Daniel-Constantin Mierla 24 Jun '25

24 Jun '25

Module: kamailio Branch: 6.0 Commit: cf14f3244567658bee3f226834baea424dceff32 URL: https://github.com/kamailio/kamailio/commit/cf14f3244567658bee3f226834baea4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-24T18:53:55+02:00 websocket: updated a couple of debug messages with id and hash id (cherry picked from commit 868240b75b9bc6a2263a31a46038d11064269000) --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/cf14f3244567658bee3f226834baea4… Patch: https://github.com/kamailio/kamailio/commit/cf14f3244567658bee3f226834baea4… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index b41cb2e91d9..18e0e4667bd 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -328,7 +328,8 @@ static void wsconn_dtor(ws_connection_t *wsc) if(!wsc) return; - LM_DBG("wsconn_dtor for [%p] refcnt [%d]\n", wsc, atomic_get(&wsc->refcnt)); + LM_DBG("wsconn id: %d / %u [%p] refcnt [%d]\n", wsc->id, wsc->id_hash, wsc, + atomic_get(&wsc->refcnt)); if(wsc->run_event) wsconn_run_route(wsc); @@ -337,12 +338,13 @@ static void wsconn_dtor(ws_connection_t *wsc) shm_free(wsc); - LM_DBG("wsconn_dtor for [%p] destroyed\n", wsc); + LM_DBG("wsconn id: %d / %u [%p] destroyed\n", wsc->id, wsc->id_hash, wsc); } int wsconn_rm(ws_connection_t *wsc, ws_conn_eventroute_t run_event_route) { - LM_DBG("wsconn_rm for [%p] refcnt [%d]\n", wsc, atomic_get(&wsc->refcnt)); + LM_DBG("remove wscon id: %d / %u [%p] refcnt [%d]\n", wsc->id, wsc->id_hash, + wsc, atomic_get(&wsc->refcnt)); if(run_event_route == WSCONN_EVENTROUTE_YES) wsc->run_event = 1;

1 0

[kamailio/kamailio] If fix_nated_contact is used, then remove_hf("Contact"), the contact header will not be deleted cleanly. (Issue #4190)
by QuincyGao 24 Jun '25

24 Jun '25

QuincyGao created an issue (kamailio/kamailio#4190)  ### Description  I want to use opensips as SBC, When the agent registers to kamailio, the contact content is modified to the ip and port of kamailio, and then Register is forwarded to the agent. remove_hf("Contact") can't remove the whole Contact( field, vlue). here is my config: ``` route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } fix_nated_contact(); if (!save("location","0x02")) { #if (!save("location")) { sl_reply_error(); } $fs="udp:172.16.4.111:5461"; $du="sip:172.16.4.114:5060"; remove_hf("Contact"); $var(contact) = "Contact: <sip:" +$fU+"@"+"172.16.4.111:5461>;expires=120\r\n" ; append_hf("$var(contact)"); route(RELAY); exit; } ``` here is the sip message: ``` 2025/03/26 16:36:07.706093 172.16.4.111:5461 -> 172.16.4.114:5060 REGISTER sip:172.16.4.111:5460 SIP/2.0 Via: SIP/2.0/UDP 172.16.4.111:5461;branch=z9hG4bKfc7e.d2df36f3b5681afeb71e442e645de38d.0 Via: SIP/2.0/UDP 172.16.80.3:49309;received=172.16.80.3;rport=49309;branch=z9hG4bKPj8ab8bd1d3c3a4c1bb0cd639540fa3183 Max-Forwards: 69 From: <sip:1008@172.16.4.111>;tag=95f7f5601f8b40458a1efe6923ab0a29 To: <sip:1008@172.16.4.111> Call-ID: f84b643f5d284d18a0d8175e1ef4d747 CSeq: 33264 REGISTER User-Agent: MicroSIP/3.21.6 sip:1008@172.16.80.3:49309;obExpires: 120 Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Content-Length: 0 Contact: <sip:1008@172.16.4.111:5461>;expires=120 ``` you can see the problem is that: `sip:1008@172.16.80.3:49309;obExpires: 120` , `sip:1008@172.16.80.3:49309` is the value of the Contact field after fix_nated_contact(). ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.5 (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, MEM_JOIN_FREE, 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_SEND_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: compiled on 11:27:01 Mar 21 2025 with gcc 4.8.5 ``` * **Operating System**:  ``` Centos7.9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4190 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4190(a)github.com>

2 4

[kamailio/kamailio] Dispatcher sets IP flag on servers even though SIP OPTIONS receive 200 OK (Issue #4298)
by al286320 24 Jun '25

24 Jun '25

al286320 created an issue (kamailio/kamailio#4298) Hi all, I'm new to Kamailio, and maybe this is a silly question. I’ve set up Kamailio as a SIP proxy with two Asterisk servers acting as media services. This is my configuration for the dispatcher module: ``` loadmodule "dispatcher.so" modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "ds_ping_interval", 20) modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_probing_threshold", 5) modparam("dispatcher", "ds_inactive_threshold", 5) modparam("dispatcher", "ds_ping_latency_stats", 1) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_ping_reply_codes", "class=2;code=403;code=488;class=3") modparam("dispatcher", "ds_ping_from", SIPCALL) ``` I can see the SIP OPTIONS requests going from Kamailio to Asterisk and receiving 200 OK responses. ![Image](https://github.com/user-attachments/assets/d7350e89-c2f8-42cb-b8a8-e456d396ab3a) However, the dispatcher is still setting the IP (Inactive Probing) flag on the servers: ``` kamcmd dispatcher.list { NRSETS: 1 RECORDS: { SET: { ID: 1 TARGETS: { DEST: { URI: sip:172.16.254.21:5060 FLAGS: IP PRIORITY: 0 LATENCY: { AVG: 0 STD: 0 EST: 0 MAX: 0 TIMEOUT: 183 } } DEST: { URI: sip:172.16.254.20:5060 FLAGS: IP PRIORITY: 0 LATENCY: { AVG: 0 STD: 0 EST: 0 MAX: 0 TIMEOUT: 183 } } } } } } ``` So when I try to use `ds_select_dst("1", "4")`, it always fails. Did I miss something in my configuration? Thanks! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4298 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4298(a)github.com>

2 2

[kamailio/kamailio] permissions: Perform LPM to find the longest matching subnet (PR #4297)
by Xenofon Karamanos 24 Jun '25

24 Jun '25

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR allows the functions `allow_address_group` and `allow_source_address_group` to search for Longest Prefix Match (LPM) when searching for an IP is in a subnet instead of the first found. Since this is a stricter check, i don't think we require an extra param for it, but feel free to suggest otherwise if there are any use-cases that required the first matched. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4297 -- Commit Summary -- * permissions: Perform LPM to find the longest matching subnet -- File Changes -- M src/modules/permissions/hash.c (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4297.patch https://github.com/kamailio/kamailio/pull/4297.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4297 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4297(a)github.com>

2 3

[kamailio/kamailio] add remove all header function to pv_headers module (PR #4276)
by Fateme Pardakhti 24 Jun '25

24 Jun '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4276 -- Commit Summary -- * add remove all header function -- File Changes -- M src/modules/pv_headers/pv_headers.c (9) M src/modules/pv_headers/pvh_func.c (19) M src/modules/pv_headers/pvh_func.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4276.patch https://github.com/kamailio/kamailio/pull/4276.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4276 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4276(a)github.com>

2 2

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

24 Jun '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

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