sr-dev July 2025

sr-dev@lists.kamailio.org

17 participants
291 discussions

git:5.8:a0090ae1: ims_isc: remove function names from log messages
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: 5.8 Commit: a0090ae1261eb228aca18386e237a4a3fd41414a URL: https://github.com/kamailio/kamailio/commit/a0090ae1261eb228aca18386e237a4a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T11:19:55+02:00 ims_isc: remove function names from log messages * use generic PKG_MEM_ERROR messages on pkg_malloc errors (cherry picked from commit 48d3fdb3cfa3e5eec777853e1a4d32d844e94e8f) (cherry picked from commit 9bdcb7f3bb304c2f0824006542bd613c20d39f0d) --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a0090ae1261eb228aca18386e237a4a… Patch: https://github.com/kamailio/kamailio/commit/a0090ae1261eb228aca18386e237a4a… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 3b151722b4f..072f2541434 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -166,7 +166,7 @@ int build_p_associated_uri(ims_subscription *s) if(!p_associated_uri.buf) { p_associated_uri.data_len = 0; p_associated_uri.buf_len = 0; - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return -1; } else { p_associated_uri.buf_len = p_associated_uri.data_len; @@ -382,8 +382,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) str b = {0, 0}; uac_req_t req; - LM_DBG("r_send_third_party_reg: REGISTER to <%.*s>\n", r->req_uri.len, - r->req_uri.s); + LM_DBG("REGISTER to <%.*s>\n", r->req_uri.len, r->req_uri.s); h.len = event_hdr.len + max_fwds_hdr.len; h.len += expires_s.len + 12 + expires_e.len; @@ -430,7 +429,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) h.s = pkg_malloc(h.len); if(!h.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", h.len); + PKG_MEM_ERROR; h.len = 0; return 0; } @@ -488,8 +487,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -506,8 +504,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -522,8 +519,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -539,7 +535,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) TMCB_RESPONSE_IN | TMCB_ON_FAILURE | TMCB_LOCAL_COMPLETED, r_third_party_reg_response, &(r->req_uri)); if(isc_tmb.t_request(&req, &(r->req_uri), &(r->to), &(r->from), 0) < 0) { - LM_ERR("r_send_third_party_reg: Error sending in transaction\n"); + LM_ERR("Error sending in transaction\n"); goto error; } if(h.s) @@ -566,9 +562,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) void r_third_party_reg_response( struct cell *t, int type, struct tmcb_params *ps) { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); if(!ps->rpl) { - LM_ERR("r_third_party_reg_response: No reply\n"); + LM_ERR("No reply\n"); return; } @@ -579,6 +575,6 @@ void r_third_party_reg_response( return; } else if(ps->code == 404) { } else { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); } }

1 0

git:5.8:b46ddf5f: ims_isc: fix wrong log level messages
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: 5.8 Commit: b46ddf5f4bc8d2bbec6c3932d55c7a7b774d7dc6 URL: https://github.com/kamailio/kamailio/commit/b46ddf5f4bc8d2bbec6c3932d55c7a7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T11:19:49+02:00 ims_isc: fix wrong log level messages this are clearly debug log messages, not errors (cherry picked from commit db7c46d97cf2d3f47024dbf9583aad575dd14b35) (cherry picked from commit 681c76b21103045aa09db8bf79a6abc818581094) --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/b46ddf5f4bc8d2bbec6c3932d55c7a7… Patch: https://github.com/kamailio/kamailio/commit/b46ddf5f4bc8d2bbec6c3932d55c7a7… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index f21c366797e..3b151722b4f 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -483,7 +483,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) LM_DBG("BODY TYPE(3rd PARTY REGISTER):<%d>\n", r->body.content_type); if(r->body.content_type != CT_NONE) { if(r->body.content_type == CT_SERVICE_INFO) { - LM_ERR("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); @@ -501,7 +501,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_service_info); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_REQ) { - LM_ERR("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len); @@ -517,7 +517,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_register_req); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_RESP) { - LM_ERR("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len);

1 0

git:6.0:bad15277: ims_isc: build_p_associated_uri() fix tel uri build
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: 6.0 Commit: bad15277b3bf35e727397ad727fb6cb4e14992ae URL: https://github.com/kamailio/kamailio/commit/bad15277b3bf35e727397ad727fb6cb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T11:06:10+02:00 ims_isc: build_p_associated_uri() fix tel uri build (cherry picked from commit a93b6f5831a9e0a86d468f91bbdba9590868dec9) --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/bad15277b3bf35e727397ad727fb6cb… Patch: https://github.com/kamailio/kamailio/commit/bad15277b3bf35e727397ad727fb6cb… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 71f26314c65..9cbb0d5111f 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -200,8 +200,8 @@ int build_p_associated_uri(ims_subscription *s) && strncmp(id->public_identity.s, "tel", 3) == 0) { if(cnttel != 0 || cnt != 0) { - memcpy(p, ", ", 2); - p += 2; + memcpy(p, ">, <", 4); + p += 4; } memcpy(p, id->public_identity.s, id->public_identity.len); p += id->public_identity.len;

1 0

git:6.0:9bdcb7f3: ims_isc: remove function names from log messages
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: 6.0 Commit: 9bdcb7f3bb304c2f0824006542bd613c20d39f0d URL: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T11:06:10+02:00 ims_isc: remove function names from log messages * use generic PKG_MEM_ERROR messages on pkg_malloc errors (cherry picked from commit 48d3fdb3cfa3e5eec777853e1a4d32d844e94e8f) --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613… Patch: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index b1b6de69076..71f26314c65 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -168,7 +168,7 @@ int build_p_associated_uri(ims_subscription *s) if(!p_associated_uri.buf) { p_associated_uri.data_len = 0; p_associated_uri.buf_len = 0; - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return -1; } else { p_associated_uri.buf_len = p_associated_uri.data_len; @@ -384,8 +384,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) str b = {0, 0}; uac_req_t req; - LM_DBG("r_send_third_party_reg: REGISTER to <%.*s>\n", r->req_uri.len, - r->req_uri.s); + LM_DBG("REGISTER to <%.*s>\n", r->req_uri.len, r->req_uri.s); h.len = event_hdr.len + max_fwds_hdr.len; h.len += expires_s.len + 12 + expires_e.len; @@ -432,7 +431,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) h.s = pkg_malloc(h.len); if(!h.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", h.len); + PKG_MEM_ERROR; h.len = 0; return 0; } @@ -490,8 +489,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -508,8 +506,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -524,8 +521,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -541,7 +537,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) TMCB_RESPONSE_IN | TMCB_ON_FAILURE | TMCB_LOCAL_COMPLETED, r_third_party_reg_response, &(r->req_uri)); if(isc_tmb.t_request(&req, &(r->req_uri), &(r->to), &(r->from), 0) < 0) { - LM_ERR("r_send_third_party_reg: Error sending in transaction\n"); + LM_ERR("Error sending in transaction\n"); goto error; } if(h.s) @@ -568,9 +564,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) void r_third_party_reg_response( struct cell *t, int type, struct tmcb_params *ps) { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); if(!ps->rpl) { - LM_ERR("r_third_party_reg_response: No reply\n"); + LM_ERR("No reply\n"); return; } @@ -581,6 +577,6 @@ void r_third_party_reg_response( return; } else if(ps->code == 404) { } else { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); } }

1 0

git:6.0:681c76b2: ims_isc: fix wrong log level messages
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: 6.0 Commit: 681c76b21103045aa09db8bf79a6abc818581094 URL: https://github.com/kamailio/kamailio/commit/681c76b21103045aa09db8bf79a6abc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T11:06:10+02:00 ims_isc: fix wrong log level messages this are clearly debug log messages, not errors (cherry picked from commit db7c46d97cf2d3f47024dbf9583aad575dd14b35) --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/681c76b21103045aa09db8bf79a6abc… Patch: https://github.com/kamailio/kamailio/commit/681c76b21103045aa09db8bf79a6abc… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 3cae9211e06..b1b6de69076 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -485,7 +485,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) LM_DBG("BODY TYPE(3rd PARTY REGISTER):<%d>\n", r->body.content_type); if(r->body.content_type != CT_NONE) { if(r->body.content_type == CT_SERVICE_INFO) { - LM_ERR("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); @@ -503,7 +503,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_service_info); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_REQ) { - LM_ERR("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len); @@ -519,7 +519,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_register_req); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_RESP) { - LM_ERR("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len);

1 0

git:master:a93b6f58: ims_isc: build_p_associated_uri() fix tel uri build
by Victor Seva 21 Jul '25

21 Jul '25

Module: kamailio Branch: master Commit: a93b6f5831a9e0a86d468f91bbdba9590868dec9 URL: https://github.com/kamailio/kamailio/commit/a93b6f5831a9e0a86d468f91bbdba95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-21T10:59:54+02:00 ims_isc: build_p_associated_uri() fix tel uri build --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a93b6f5831a9e0a86d468f91bbdba95… Patch: https://github.com/kamailio/kamailio/commit/a93b6f5831a9e0a86d468f91bbdba95… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 71f26314c65..9cbb0d5111f 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -200,8 +200,8 @@ int build_p_associated_uri(ims_subscription *s) && strncmp(id->public_identity.s, "tel", 3) == 0) { if(cnttel != 0 || cnt != 0) { - memcpy(p, ", ", 2); - p += 2; + memcpy(p, ">, <", 4); + p += 4; } memcpy(p, id->public_identity.s, id->public_identity.len); p += id->public_identity.len;

1 0

[kamailio/kamailio] dispatcher: EWMA formula (Issue #4331)
by Michael Furmur 21 Jul '25

21 Jul '25

furmur created an issue (kamailio/kamailio#4331) have a question about EWMA formula in the `dispatcher` module. [documentation](https://www.kamailio.org/docs/modules/devel/modules/dispatch… for `ds_latency_estimator_alpha` points to this [explanation](https://www.itl.nist.gov/div898/handbook/pmc/section3/pmc324.h… which specifies EWMA formula as: $EWMA_t = \lambda*Y_t + (1 - \lambda) * EWMA_{t-1}$ related code at [`src/modules/dispatcher/dispatch.c`](https://github.com/kamailio/kamailio/blob/master/src/modules/dispatcher/dispatch.c#L3191): ``` static inline void latency_stats_update( ds_latency_stats_t *latency_stats, int latency) { ... /* exponentially weighted moving average */ if(latency_stats->count < 10) { latency_stats->estimate = latency_stats->average; } else { latency_stats->estimate = latency_stats->estimate * ds_latency_estimator_alpha + latency * (1 - ds_latency_estimator_alpha); } ``` so: * `latency_stats->estimate` is $EWMA$, * `ds_latency_estimator_alpha` is $\lambda\$. * `latency` is $Y_t$ looks like `latency_stats->estimate` and `latency` are swapped regarding to the formula and as a result higher `ds_latency_estimator_alpha` will rate old average over the actual latency value and that contradicts both `dispatcher` module documentation and meaning in the referenced formula. i believe that code should be: ``` latency_stats->estimate = latency * ds_latency_estimator_alpha + latency_stats->estimate * (1 - ds_latency_estimator_alpha); ``` could someone verify those observations? will make PR if i am not mistaken. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4331 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4331(a)github.com>

2 1

[kamailio/kamailio] db_cluster module marking mysql connection down on "Illegal mix of collations" failure (Issue #4332)
by Ben Kaufman 18 Jul '25

18 Jul '25

whosgonna created an issue (kamailio/kamailio#4332)  ### Description We received a INVITE with non-ascii characters in the authentication username. The character set and collation of the subscriber table is `latin1` and `latin1_swedish_ci`. This generated the following failure (DB connection names are `primary` and `secondary`): ``` 3(9) ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation '=' (1267) 3(9) ERROR: <core> [lib/srdb1/db_query.c:158]: db_do_query_internal(): error while submitting query 3(9) WARNING: db_cluster [dbcl_api.c:513]: db_cluster_query(): serial operation - failure on cluster [db] (9/0) [primary] 3(9) ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation '=' (1267) 3(9) ERROR: <core> [lib/srdb1/db_query.c:158]: db_do_query_internal(): error while submitting query 3(9) WARNING: db_cluster [dbcl_api.c:513]: db_cluster_query(): serial operation - failure on cluster [db] (8/0) [secondary] 3(9) ERROR: db_cluster [dbcl_api.c:513]: db_cluster_query(): no successful read on cluster [db] 3(9) ERROR: auth_db [authorize.c:180]: get_ha1(): failed to query database 3(9) ERROR: [DIGEST_AUTH 60e4abd540674d4aa8961d380411585e(a)0.0.0.0 INVITE-124524] Generic failure in authentication. Send '503 Server Error' and exit. ``` While using the limited character set in the database (and it's associated collation) is questionable, and I don't expect the query to succeed, the issue is that this single query failure is causing the connections to be disabled in the db_cluster. ### Troubleshooting #### Reproduction I haven't tried to reproduce this, but I would assume it's easy to do. I can probably mock it up in docker fairly quickly. As a safety measure, I'll be validating the field with `is_alphanum()` #### Log Messages (as in description) #### SIP Traffic The `Username` in the `Proxy-Authorization` header as "\uFEFF1011". As hex it's: ``` 22 ef bb bf 31 30 31 31 22 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 6.0.1 (aarch64/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-NOSMP, 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: unknown compiled on 18:45:18 Mar 14 2025 with gcc 14.2.0 ``` * **Operating System**:  Container: ``` NAME="Alpine Linux" ID=alpine VERSION_ID=3.21.2 PRETTY_NAME="Alpine Linux v3.21" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" ``` Host: ``` NAME="Amazon Linux" VERSION="2023" ID="amzn" ID_LIKE="fedora" VERSION_ID="2023" PLATFORM_ID="platform:al2023" PRETTY_NAME="Amazon Linux 2023" ANSI_COLOR="0;33" CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023" HOME_URL="https://aws.amazon.com/linux/" BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023" ``` Kernel (`uname -a)`: ``` Linux use2apocor01.n.fl.gg 6.1.56-82.125.amzn2023.aarch64 #1 SMP Tue Oct 10 17:03:29 UTC 2023 aarch64 aarch64 aarch64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4332 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4332(a)github.com>

2 1

git:master:f257fb1c: core: dns cache - added rm delay of entries with high refcnt
by Daniel-Constantin Mierla 18 Jul '25

18 Jul '25

Module: kamailio Branch: master Commit: f257fb1cc678085b904d84cabfbbfc87985cbb7e URL: https://github.com/kamailio/kamailio/commit/f257fb1cc678085b904d84cabfbbfc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-18T13:00:31+02:00 core: dns cache - added rm delay of entries with high refcnt --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f257fb1cc678085b904d84cabfbbfc8… Patch: https://github.com/kamailio/kamailio/commit/f257fb1cc678085b904d84cabfbbfc8… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 9ea774705ee..b84c628cb3c 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -72,6 +72,7 @@ #define DNS_SRV_ZERO_W_CHANCE \ 1000 /* one in a 1000*weight_sum chance for selecting a 0-weight record */ +#define DNS_CACHE_RMDELAY 300 int dns_cache_init = 1; /* if 0, the DNS cache is not initialized at startup */ static gen_lock_t *dns_hash_lock = 0; @@ -561,7 +562,20 @@ inline static struct dns_hash_entry *_dns_hash_find( /* automatically remove expired elements */ ((e->ent_flags & DNS_FLAG_PERMANENT) == 0) && ((s_ticks_t)(now - e->expire) >= 0)) { - _dns_hash_remove(e); + if(atomic_get(&e->refcnt) > 1) { + if((s_ticks_t)(now - e->expire - S_TO_TICKS(DNS_CACHE_RMDELAY)) + >= 0) { + LM_DBG("delayed removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + _dns_hash_remove(e); + } else { + LM_DBG("delaying removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + } + } else { + LM_DBG("immediate removal: %p\n", e); + _dns_hash_remove(e); + } } else if((e->type == type) && (e->name_len == name->len) && (strncasecmp(e->name, name->s, e->name_len) == 0)) { e->last_used = now; @@ -632,8 +646,22 @@ inline static int dns_cache_clean(unsigned int no, int expired_only) ->last_used_lst); if(((e->ent_flags & DNS_FLAG_PERMANENT) == 0) && (!expired_only || ((s_ticks_t)(now - e->expire) >= 0))) { - _dns_hash_remove(e); - deleted++; + if(atomic_get(&e->refcnt) > 1) { + if((s_ticks_t)(now - e->expire - S_TO_TICKS(DNS_CACHE_RMDELAY)) + >= 0) { + LM_DBG("delayed removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + _dns_hash_remove(e); + deleted++; + } else { + LM_DBG("delaying removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + } + } else { + LM_DBG("immediate removal: %p\n", e); + _dns_hash_remove(e); + deleted++; + } } n++; if(n >= no) @@ -669,8 +697,22 @@ inline static int dns_cache_free_mem(unsigned int target, int expired_only) ->last_used_lst); if(((e->ent_flags & DNS_FLAG_PERMANENT) == 0) && (!expired_only || ((s_ticks_t)(now - e->expire) >= 0))) { - _dns_hash_remove(e); - deleted++; + if(atomic_get(&e->refcnt) > 1) { + if((s_ticks_t)(now - e->expire - S_TO_TICKS(DNS_CACHE_RMDELAY)) + >= 0) { + LM_DBG("delayed removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + _dns_hash_remove(e); + deleted++; + } else { + LM_DBG("delaying removal: %p (%d)\n", e, + (int)atomic_get(&e->refcnt)); + } + } else { + LM_DBG("immediate removal: %p\n", e); + _dns_hash_remove(e); + deleted++; + } } } UNLOCK_DNS_HASH();

1 0

git:5.8:2e2045af: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 18 Jul '25

18 Jul '25

Module: kamailio Branch: 5.8 Commit: 2e2045af9947802d03d7381a10ef3e1c4db8946e URL: https://github.com/kamailio/kamailio/commit/2e2045af9947802d03d7381a10ef3e1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-18T10:01:26+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/2e2045af9947802d03d7381a10ef3e1… Patch: https://github.com/kamailio/kamailio/commit/2e2045af9947802d03d7381a10ef3e1… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 100ea1e657c..5ef62cbb0e1 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -682,7 +682,7 @@ switch ($retcode) { 4.8. reg_fetch_contacts(domain, uri, profile) The function fetches the contacts for 'uri' from table 'domain' to - pseudo-variable $imssulc(profile) [imssulc = ims scscf ulc]. + pseudo-variable $ulc(profile) [ulc = ims scscf ulc]. Meaning of the parameters is as follows: * domain - Name of table that should be used for the lookup of @@ -690,8 +690,8 @@ switch ($retcode) { * uri - The SIP URI address of the user which to fetch the contact addresses for. It can contain pseudo-variables that are evaluated at runtime. - * profile - Name of $imssulc pseudo-variable profile that will store - the fetched contacts. It is a static string. + * profile - Name of $ulc pseudo-variable profile that will store the + fetched contacts. It is a static string. This function can be used in REQUEST_ROUTE, FAILURE_ROUTE @@ -709,7 +709,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); data in that profile. Meaning of the parameters is as follows: - * profile - Name of $imssulc pseudo-variable profile that stores the + * profile - Name of $ulc pseudo-variable profile that stores the contacts. It is a static string. This function can be used in REQUEST_ROUTE, FAILURE_ROUTE

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2025