sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

[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

[kamailio/kamailio] core: sdp - update start pointer only after len adjustment (PR #4230)
by space88man 18 Jul '25

18 Jul '25

- len is first adjusted by the amount of chars consumed so far - start pointer is then adjusted to begin new search #### 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 - [X] Tested changes locally - [X] Related to issue #4229 #### Description Small logic tweak — we adjust `len` by the amount of chars consumed first, then adjust the `start` pointer to begin the new search. Existing: ``` start = space + 1; len = len - (space - start + 1); // this is a no-op // as the pointer was adjusted first ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4230 -- Commit Summary -- * core: sdp - update start pointer only after len adjustment -- File Changes -- M src/core/parser/sdp/sdp_helpr_funcs.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4230.patch https://github.com/kamailio/kamailio/pull/4230.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4230 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4230(a)github.com>

4 4

git:5.8:57efcdd1: core: sdp - update start pointer only after len adjustment
by Henning Westerholt 18 Jul '25

18 Jul '25

Module: kamailio Branch: 5.8 Commit: 57efcdd1dd004fed7f6ee81353aeebf5eedb710c URL: https://github.com/kamailio/kamailio/commit/57efcdd1dd004fed7f6ee81353aeebf… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-18T07:57:49Z core: sdp - update start pointer only after len adjustment - len is adjusted first by the amount of chars consumed so far - start pointer is adjusted to start new search (cherry picked from commit c9fbf6f46898dbb2a8413a1c9d824a56241f2288) (cherry picked from commit 9828b565e8646ab5ecebc128efb08a05a370351d) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/57efcdd1dd004fed7f6ee81353aeebf… Patch: https://github.com/kamailio/kamailio/commit/57efcdd1dd004fed7f6ee81353aeebf… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 02f72d77521..b2d76907bf8 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -330,8 +330,8 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) fl = space - start; - start = space + 1; len = len - (space - start + 1); + start = space + 1; space = memchr(start, 32, len); if(space == NULL) {

1 0

git:5.8:ca22a14c: ims_registrar_scscf: fix reg_fetch_contacts call
by Henning Westerholt 18 Jul '25

18 Jul '25

Module: kamailio Branch: 5.8 Commit: ca22a14c311149b63b8a53368b82cc1fba326a5b URL: https://github.com/kamailio/kamailio/commit/ca22a14c311149b63b8a53368b82cc1… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-15T11:16:07Z ims_registrar_scscf: fix reg_fetch_contacts call The implementation of reg_fetch_contacts was hard-coded to empty result. The fix: - adds iteration over contacts and - adds impi to the ulc variable - improve documentation in the documentation $ulc variable is referred with misleading name cleanup the $imssulc mentions to avoid confusion (cherry picked from commit 9caf655c51d5a846fa944bb866e3abadeb8b799c) --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/ca22a14c311149b63b8a53368b82cc1… Patch: https://github.com/kamailio/kamailio/commit/ca22a14c311149b63b8a53368b82cc1… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml index afea49ee318..5df8c2f554e 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml @@ -744,7 +744,7 @@ switch ($retcode) { profile)</function></title> <para>The function fetches the contacts for 'uri' from table 'domain' to - pseudo-variable $imssulc(profile) [imssulc = ims scscf ulc].</para> + pseudo-variable $ulc(profile) [ulc = ims scscf ulc].</para> <para>Meaning of the parameters is as follows:</para> @@ -761,7 +761,7 @@ switch ($retcode) { </listitem> <listitem> - <para><emphasis>profile</emphasis> - Name of $imssulc + <para><emphasis>profile</emphasis> - Name of $ulc pseudo-variable profile that will store the fetched contacts. It is a static string.</para> </listitem> @@ -793,7 +793,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); <itemizedlist> <listitem> - <para><emphasis>profile</emphasis> - Name of $imssulc + <para><emphasis>profile</emphasis> - Name of $ulc pseudo-variable profile that stores the contacts. It is a static string.</para> </listitem> diff --git a/src/modules/ims_registrar_scscf/regpv.c b/src/modules/ims_registrar_scscf/regpv.c index 19cc9ca6bd9..3364bb26e33 100644 --- a/src/modules/ims_registrar_scscf/regpv.c +++ b/src/modules/ims_registrar_scscf/regpv.c @@ -43,6 +43,7 @@ typedef struct _regpv_profile str pname; str domain; str aor; + str impi; int flags; unsigned int aorhash; int nrc; @@ -119,6 +120,11 @@ static void regpv_free_profile(regpv_profile_t *rpp) rpp->aor.s = 0; rpp->aor.len = 0; } + if(rpp->impi.s != NULL) { + pkg_free(rpp->impi.s); + rpp->impi.s = 0; + rpp->impi.len = 0; + } rpp->flags = 0; rpp->aorhash = 0; @@ -243,6 +249,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) case 17: /* count */ return pv_get_sintval(msg, param, res, rpp->nrc); break; + case 18: /* impi */ + return pv_get_strval(msg, param, res, &rpp->impi); + break; } return pv_get_null(msg, param, res); @@ -321,6 +330,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 4; else if(strncmp(pa.s, "cseq", 4) == 0) rp->attr = 9; + else if(strncmp(pa.s, "impi", 4) == 0) + rp->attr = 18; else goto error; break; @@ -435,10 +446,18 @@ int pv_fetch_contacts( if(res != 0) { LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); ul.unlock_udomain((udomain_t *)table, &aor); - return -1; + goto error; + } + + rpp->impi.s = (char *)pkg_malloc(r->private_identity.len * sizeof(char)); + if(rpp->impi.s == NULL) { + LM_ERR("no mem for impi\n"); + goto error; } + memcpy(rpp->impi.s, r->private_identity.s, r->private_identity.len); + rpp->impi.len = r->private_identity.len; - ptr = 0; //r->contacts;TODO + ptr = r->linked_contacts.head ? r->linked_contacts.head->contact : NULL; ptr0 = NULL; n = 0; while(ptr) { @@ -453,8 +472,8 @@ int pv_fetch_contacts( goto error; } memcpy(c0, ptr, ilen); - //c0->domain = {0,0};//NULL;TODO - //c0->aor = {0,0};//NULL; + c0->domain = (str){NULL, 0}; + c0->aor = (str){NULL, 0}; c0->next = NULL; c0->prev = NULL;

1 0

git:master:5e48bd40: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 18 Jul '25

18 Jul '25

Module: kamailio Branch: master Commit: 5e48bd4018fae2609e8debc2d50d1cd148291353 URL: https://github.com/kamailio/kamailio/commit/5e48bd4018fae2609e8debc2d50d1cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-18T09:46:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/5e48bd4018fae2609e8debc2d50d1cd… Patch: https://github.com/kamailio/kamailio/commit/5e48bd4018fae2609e8debc2d50d1cd…

1 0

git:master:28327012: tm: docs for t_relay_to_proxy(...)
by Daniel-Constantin Mierla 18 Jul '25

18 Jul '25

Module: kamailio Branch: master Commit: 283270128427ba8c5cfe34dc0af338d976a3a8b7 URL: https://github.com/kamailio/kamailio/commit/283270128427ba8c5cfe34dc0af338d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-18T09:42:13+02:00 tm: docs for t_relay_to_proxy(...) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/283270128427ba8c5cfe34dc0af338d… Patch: https://github.com/kamailio/kamailio/commit/283270128427ba8c5cfe34dc0af338d… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 4cd7f36ba2d..715e564e9ed 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -1739,6 +1739,30 @@ t_relay_to("0x01"); </example> </section> + <section id="tm.f.t_relay_to_proxy"> + <title> + <function>t_relay_to_proxy(proxy)</function> + </title> + <para> + Alternative function to relay the SIP request to a specific address, + with the parameter supporting variables inside it. + </para> + <para> + The format of the parameter is: "proto:host:port" - any of proto or port + can be omitted, along with the semicolon after or before. + </para> + <para> + The function can be used in REQUEST_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>t_relay_to_proxy</function> usage</title> + <programlisting> +... +t_relay_to_proxy("udp:$var(addr):5060"); +... + </programlisting> + </example> + </section> <section id="tm.f.t_set_no_e2e_cancel_reason"> <title>

1 0

git:master:0829a30a: tm: add t_relay_to_proxy("proto:addr:port")
by Daniel-Constantin Mierla 18 Jul '25

18 Jul '25

Module: kamailio Branch: master Commit: 0829a30a6ba81d23007fa6f3ea4b4467620fef6d URL: https://github.com/kamailio/kamailio/commit/0829a30a6ba81d23007fa6f3ea4b446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-18T09:35:59+02:00 tm: add t_relay_to_proxy("proto:addr:port") - alternative function with support for variables in the parameter --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/0829a30a6ba81d23007fa6f3ea4b446… Patch: https://github.com/kamailio/kamailio/commit/0829a30a6ba81d23007fa6f3ea4b446… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 8997abe983b..e62c85d74af 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -137,6 +137,7 @@ static int w_t_relay_to_sctp_uri(struct sip_msg *, char *, char *); #endif static int w_t_relay_to_avp(struct sip_msg *msg, char *str, char *); static int w_t_relay_to(struct sip_msg *msg, char *str, char *); +static int w_t_relay_to_proxy(struct sip_msg *msg, char *str, char *); static int w_t_replicate_uri(struct sip_msg *p_msg, char *uri, /* sip uri as string or variable */ char *_foo /* nothing expected */); @@ -325,6 +326,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | FAILURE_ROUTE}, {"t_relay_to", w_t_relay_to, 2, fixup_t_relay_to, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"t_relay_to_proxy", w_t_relay_to_proxy, 1, fixup_spve_null, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"t_forward_nonack", w_t_forward_nonack, 2, fixup_hostport2proxy, 0, REQUEST_ROUTE}, {"t_forward_nonack_uri", w_t_forward_nonack_uri, 0, 0, 0, @@ -3265,6 +3268,21 @@ static int ki_t_relay_to_proxy(sip_msg_t *msg, str *sproxy) return ki_t_relay_to_proxy_flags(msg, sproxy, 0); } +/** + * + */ +static int w_t_relay_to_proxy(sip_msg_t *msg, char *paddr, char *bar) +{ + str addr = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)paddr, &addr) != 0) { + LM_ERR("invalid proxy address parameter\n"); + return -1; + } + + return ki_t_relay_to_proxy_flags(msg, &addr, 0); +} + /** * */

1 0

git:master:d0fc9354: core: dns cache - destroy new entry only when lot linked to the list
by Daniel-Constantin Mierla 18 Jul '25

18 Jul '25

Module: kamailio Branch: master Commit: d0fc93546dcfb160716369bf04f058cac32dec5c URL: https://github.com/kamailio/kamailio/commit/d0fc93546dcfb160716369bf04f058c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-18T09:34:33+02:00 core: dns cache - destroy new entry only when lot linked to the list --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/d0fc93546dcfb160716369bf04f058c… Patch: https://github.com/kamailio/kamailio/commit/d0fc93546dcfb160716369bf04f058c… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index cb343a81184..9ea774705ee 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -1928,11 +1928,13 @@ inline static struct dns_hash_entry *dns_cache_do_request(str *name, int type) } } if(add_record) { - dns_cache_add_unsafe(r); /* refcnt++ inside */ - if(atomic_get(&r->refcnt) == 0) { - /* if cache adding failed and nobody else is interested - * destroy this entry */ - dns_destroy_entry(r); + if(dns_cache_add_unsafe(r) < 0) { + /* refcnt++ inside */ + if(atomic_get(&r->refcnt) <= 0) { + /* if cache adding failed and nobody else is interested + * destroy this entry */ + dns_destroy_entry(r); + } } if(old) { _dns_hash_remove(old); @@ -2034,11 +2036,13 @@ inline static struct dns_hash_entry *dns_cache_do_request(str *name, int type) } } if(add_record) { - dns_cache_add_unsafe(r); /* refcnt++ inside */ - if(atomic_get(&r->refcnt) == 0) { - /* if cache adding failed and nobody else is interested - * destroy this entry */ - dns_destroy_entry(r); + if(dns_cache_add_unsafe(r) < 0) { + /* refcnt++ inside */ + if(atomic_get(&r->refcnt) <= 0) { + /* if cache adding failed and nobody else is interested + * destroy this entry */ + dns_destroy_entry(r); + } } if(old) { _dns_hash_remove(old);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
4541
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev