- sr-dev - kamailio.org

git:master:708dd175: pua_reginfo: add helper to disable publishing for current message
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 708dd1753483240c82c5796e11686db40544d145 URL: https://github.com/kamailio/kamailio/commit/708dd1753483240c82c5796e11686db… Author: Matteo Brancaleoni <matteo.brancaleoni(a)voismart.it> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T15:14:48+02:00 pua_reginfo: add helper to disable publishing for current message --- Modified: src/modules/pua_reginfo/doc/pua_reginfo_admin.xml Modified: src/modules/pua_reginfo/pua_reginfo.c Modified: src/modules/pua_reginfo/pua_reginfo.h Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/708dd1753483240c82c5796e11686db… Patch: https://github.com/kamailio/kamailio/commit/708dd1753483240c82c5796e11686db… --- diff --git a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml index 9e2da526c8e..8229377adb4 100644 --- a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml +++ b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml @@ -234,6 +234,33 @@ reply_route[1] { if (t_check_status("200")) reginfo_subscribe("$ru"); } +... + </programlisting> + </example> + </section> + <section id="pua_reginfo.f.reginfo_disable_publish"> + <title> + <function moreinfo="none">reginfo_disable_publish()</function> + </title> + <para> + This function disables sending the PUBLISH request in the registrar + callback invocation, for the current message only. + </para> + + <example> + <title><function>reginfo_disable_publish</function> usage</title> + <programlisting format="linespecific"> +... +if(is_method("REGISTER")) { + if (dmq_is_from_node()) + # coming from a DMQ node, just save without triggering PUBLISH + # which may be replicated differently, like with presence DMQ support + reginfo_disable_publish(); + save("location"); + } else { + # coming from end point - authenticate, save contact, etc... + } +} ... </programlisting> </example> diff --git a/src/modules/pua_reginfo/pua_reginfo.c b/src/modules/pua_reginfo/pua_reginfo.c index 6a0b91170ea..573b6efc15d 100644 --- a/src/modules/pua_reginfo/pua_reginfo.c +++ b/src/modules/pua_reginfo/pua_reginfo.c @@ -46,6 +46,8 @@ str server_address = {NULL, 0}; int publish_reginfo = 1; +int reginfo_disable_publish = 0; /* Disables publish for current message */ + sruid_t _reginfo_sruid; int reginfo_use_domain = 0; @@ -65,6 +67,8 @@ static cmd_export_t cmds[] = { fixup_subscribe, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, {"reginfo_handle_notify", (cmd_function)reginfo_handle_notify, 1, domain_fixup, 0, REQUEST_ROUTE}, + {"reginfo_disable_publish", (cmd_function)w_reginfo_disable_publish, 0, + 0, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/pua_reginfo/pua_reginfo.h b/src/modules/pua_reginfo/pua_reginfo.h index 6ffaa6ba516..70fd42a1cb5 100644 --- a/src/modules/pua_reginfo/pua_reginfo.h +++ b/src/modules/pua_reginfo/pua_reginfo.h @@ -37,5 +37,9 @@ extern usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions*/ extern pua_api_t pua; /*!< Structure containing pointers to PUA functions*/ extern int reginfo_use_domain; +extern int reginfo_disable_publish; + +int w_reginfo_disable_publish(sip_msg_t *, char *, char *); +int ki_reginfo_disable_publish(sip_msg_t *); #endif diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index 5cc1377b9de..8bc5a7884bd 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -53,6 +53,18 @@ Call-ID: 9ad9f89f-164d-bb86-1072-52e7e9eb5025. static int _pua_reginfo_self_op = 0; +#define BUF_LEN 256 +int ki_reginfo_disable_publish(sip_msg_t *msg) +{ + reginfo_disable_publish = 1; + return 1; +} + +int w_reginfo_disable_publish(struct sip_msg *msg, char *s1, char *s2) +{ + return ki_reginfo_disable_publish(msg); +} + void pua_reginfo_update_self_op(int v) { _pua_reginfo_self_op = v; @@ -266,6 +278,15 @@ void reginfo_usrloc_cb(ucontact_t *c, int type, void *param) return; } + if(reginfo_disable_publish == 1) { + LM_DBG("Not publishing due to reginfo_disable_publish for aor: %.*s " + "(%d)\n", + c->aor->len, c->aor->s, type); + + reginfo_disable_publish = 0; + return; + } + content_type.s = "application/reginfo+xml"; content_type.len = 23;

1 0

[kamailio/kamailio] tls: add WSS to RPC funtions (PR #4262)
by Benjamin 06 Jun '25

06 Jun '25

- tls_list() add PROTO_WSS to TLS_LIST RPC call to include WSS connections in tls.list - tls_kill() add PROTO_WSS to handle WSS connections Co-authored-by: Andreas Tarp <tarp(a)sipgate.de> #### 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 #4167 #### Description WSS connection is not shown in tls.list RPC command like all other TLS connections. Also tls_kill does not handle WSS connections. This is related to the issue 4167. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4262 -- Commit Summary -- * tls: add WSS to RPC funtions -- File Changes -- M src/modules/tls/tls_rpc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4262.patch https://github.com/kamailio/kamailio/pull/4262.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4262 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4262(a)github.com>

2 2

git:master:9581e5b3: tls: add WSS to RPC funtions
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 9581e5b332bff8e61ed65c6ddd340a472cb1d93c URL: https://github.com/kamailio/kamailio/commit/9581e5b332bff8e61ed65c6ddd340a4… Author: Benjamin Tietz <tietz(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T15:10:58+02:00 tls: add WSS to RPC funtions - tls_list() add PROTO_WSS to TLS_LIST RPC call to include WSS connections in tls.list - tls_kill() add PROTO_WSS to handle WSS connections Co-authored-by: Andreas Tarp <tarp(a)sipgate.de> --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9581e5b332bff8e61ed65c6ddd340a4… Patch: https://github.com/kamailio/kamailio/commit/9581e5b332bff8e61ed65c6ddd340a4… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index b707a3063f1..ef621407781 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -118,7 +118,7 @@ static void tls_list(rpc_t *rpc, void *c) TCPCONN_LOCK; for(i = 0; i < TCP_ID_HASH_SIZE; i++) { for(con = tcpconn_id_hash[i]; con; con = con->id_next) { - if(con->rcv.proto != PROTO_TLS) + if(con->rcv.proto != PROTO_TLS && con->rcv.proto != PROTO_WSS) continue; tls_d = con->extra_data; rpc->add(c, "{", &handle); @@ -276,7 +276,7 @@ static void tls_kill(rpc_t *rpc, void *c) TCPCONN_LOCK; for(i = 0; i < TCP_ID_HASH_SIZE; i++) { for(con = tcpconn_id_hash[i]; con; con = con->id_next) { - if(con->rcv.proto != PROTO_TLS) + if(con->rcv.proto != PROTO_TLS && con->rcv.proto != PROTO_WSS) continue; if(con->id == kill_id) { con->state = -2;

1 0

git:master:d7156079: dispatcher: docs for ds_ping_fr_timer modparam
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: d71560794239668a9488ef2aca8330307779a6c8 URL: https://github.com/kamailio/kamailio/commit/d71560794239668a9488ef2aca83303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T15:00:45+02:00 dispatcher: docs for ds_ping_fr_timer modparam --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d71560794239668a9488ef2aca83303… Patch: https://github.com/kamailio/kamailio/commit/d71560794239668a9488ef2aca83303… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 37194e4973e..3a6c26b41b7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -577,6 +577,28 @@ modparam("dispatcher", "ds_ping_interval", 30) </example> </section> + + <section id="dispatcher.p.ds_ping_fr_timer"> + <title><varname>ds_ping_fr_timer</varname> (int)</title> + <para> + If greater than 0, its value is used to set the "fr_timer" value for + the local transactions created to send out the OPTIONS pings. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (not set). + </emphasis> + </para> + <example> + <title>Set the <quote>ds_ping_fr_timer</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_ping_fr_timer", 10) +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.ds_probing_threshold"> <title><varname>ds_probing_threshold</varname> (int)</title> <para>

1 0

git:master:df0e36fb: dispatcher: new modparam ds_ping_fr_timeout
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: df0e36fbb0dc1139acd6c5d92dc3f986cca73af2 URL: https://github.com/kamailio/kamailio/commit/df0e36fbb0dc1139acd6c5d92dc3f98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T14:55:02+02:00 dispatcher: new modparam ds_ping_fr_timeout - ability to set the transaction fr_timeout value for the OPTIONS pings requests --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/df0e36fbb0dc1139acd6c5d92dc3f98… Patch: https://github.com/kamailio/kamailio/commit/df0e36fbb0dc1139acd6c5d92dc3f98… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index a90daa2abfa..cf0a75a09dd 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -118,6 +118,7 @@ static int *_ds_ping_active = NULL; extern int ds_force_dst; extern str ds_event_callback; extern int ds_ping_latency_stats; +extern int ds_ping_fr_timeout; extern int ds_retain_latency_stats; extern float ds_latency_estimator_alpha; extern int ds_attrs_none; @@ -4175,6 +4176,9 @@ void ds_ping_set(ds_set_t *node) && ds_default_socket.len > 0) { uac_r.ssock = &ds_default_socket; } + if(ds_ping_fr_timeout > 0) { + uac_r.fr_timeout = (unsigned int)ds_ping_fr_timeout; + } /* Overwrite default ping From URI with attribute */ if(node->dlist[j].attrs.ping_from.s != NULL diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1d6acaaede5..84c65a6019e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -103,6 +103,7 @@ str ds_ping_method = str_init("OPTIONS"); str ds_ping_from = str_init("sip:dispatcher@localhost"); static int ds_ping_interval = 0; int ds_ping_latency_stats = 0; +int ds_ping_fr_timeout = 0; int ds_retain_latency_stats = 0; int ds_latency_estimator_alpha_i = 900; float ds_latency_estimator_alpha = 0.9f; @@ -301,6 +302,7 @@ static param_export_t params[]={ {"ds_ping_method", PARAM_STR, &ds_ping_method}, {"ds_ping_from", PARAM_STR, &ds_ping_from}, {"ds_ping_interval", PARAM_INT, &ds_ping_interval}, + {"ds_ping_fr_timeout", PARAM_INT, &ds_ping_fr_timeout}, {"ds_ping_latency_stats", PARAM_INT, &ds_ping_latency_stats}, {"ds_retain_latency_stats", PARAM_INT, &ds_retain_latency_stats}, {"ds_latency_estimator_alpha", PARAM_INT, &ds_latency_estimator_alpha_i},

1 0

git:master:98bcd014: uac: fields for $uac_req() to set fr_timeout, fr_inv_timeout
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 98bcd01471744eaaa142c388782a5c91c99a78f7 URL: https://github.com/kamailio/kamailio/commit/98bcd01471744eaaa142c388782a5c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T14:28:12+02:00 uac: fields for $uac_req() to set fr_timeout, fr_inv_timeout --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/98bcd01471744eaaa142c388782a5c9… Patch: https://github.com/kamailio/kamailio/commit/98bcd01471744eaaa142c388782a5c9… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index f8a77b6a6b4..ea3595ca755 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -82,6 +82,8 @@ typedef struct _uac_send_info char b_evparam[MAX_UACD_SIZE]; str s_evparam; unsigned int cseqno; + unsigned int fr_timeout; + unsigned int fr_inv_timeout; unsigned int evroute; unsigned int evcode; unsigned int evtype; @@ -187,6 +189,10 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, _uac_req.flags); case 18: return pv_get_uintval(msg, param, res, _uac_req.cseqno); + case 19: + return pv_get_uintval(msg, param, res, _uac_req.fr_timeout); + case 20: + return pv_get_uintval(msg, param, res, _uac_req.fr_inv_timeout); default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -484,6 +490,28 @@ int pv_set_uac_req( } _uac_req.cseqno = tval->ri; break; + case 19: + if(tval == NULL) { + _uac_req.fr_timeout = 0; + return 0; + } + if(!(tval->flags & PV_VAL_INT)) { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.fr_timeout = tval->ri; + break; + case 20: + if(tval == NULL) { + _uac_req.fr_inv_timeout = 0; + return 0; + } + if(!(tval->flags & PV_VAL_INT)) { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.fr_inv_timeout = tval->ri; + break; } return 0; } @@ -550,6 +578,16 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) else goto error; break; + case 10: + if(strncmp(in->s, "fr_timeout", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 19; + else + goto error; + case 14: + if(strncmp(in->s, "fr_inv_timeout", 14) == 0) + sp->pvp.pvn.u.isname.name.n = 20; + else + goto error; default: goto error; } @@ -803,6 +841,8 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; uac_r.cb_flags = TMCB_LOCAL_COMPLETED | TMCB_DESTROY; + uac_r.fr_timeout = tp->fr_timeout; + uac_r.fr_inv_timeout = tp->fr_inv_timeout; if(tp->evroute != 0) { /* Callback function */ uac_r.cb = uac_resend_tm_callback; @@ -861,6 +901,9 @@ int uac_req_send(void) uac_r.ssock = &uac_default_socket; } + uac_r.fr_timeout = _uac_req.fr_timeout; + uac_r.fr_inv_timeout = _uac_req.fr_inv_timeout; + if((_uac_req.s_auser.len > 0 && _uac_req.s_apasswd.len > 0) || (_uac_req.evroute > 0)) { tp = uac_send_info_clone(&_uac_req);

1 0

git:master:d0bfcac2: uac: added fr_timeout and fr_inv_timeout to uac_req_t struct
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: d0bfcac231ae67d683ff1c7ace2cebfdca33e0b4 URL: https://github.com/kamailio/kamailio/commit/d0bfcac231ae67d683ff1c7ace2cebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T14:28:12+02:00 uac: added fr_timeout and fr_inv_timeout to uac_req_t struct - can be used to set the timeouts for the locally generated requests via the intermodule API functions --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/d0bfcac231ae67d683ff1c7ace2cebf… Patch: https://github.com/kamailio/kamailio/commit/d0bfcac231ae67d683ff1c7ace2cebf… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 26748f4570c..2dfb218724f 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -517,8 +517,12 @@ static inline int t_uac_prepare( * we can't call init_new_t() because we don't have a sip msg * => we'll ignore t_set_fr() or avp timer value and will use directly the * module params fr_inv_timer and fr_timer -- andrei */ - new_cell->fr_timeout = cfg_get(tm, tm_cfg, fr_timeout); - new_cell->fr_inv_timeout = cfg_get(tm, tm_cfg, fr_inv_timeout); + new_cell->fr_timeout = (uac_r->fr_timeout > 0) + ? uac_r->fr_timeout + : cfg_get(tm, tm_cfg, fr_timeout); + new_cell->fr_inv_timeout = (uac_r->fr_inv_timeout > 0) + ? uac_r->fr_inv_timeout + : cfg_get(tm, tm_cfg, fr_inv_timeout); new_cell->end_of_life = get_ticks_raw() + lifetime; /* same as above for retransmission intervals */ new_cell->rt_t1_timeout_ms = cfg_get(tm, tm_cfg, rt_t1_timeout_ms); diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 00dc32d2a5b..f35cf9f70ac 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -55,6 +55,8 @@ typedef struct uac_req void *cbp; str *callid; unsigned int cseqno; + unsigned int fr_timeout; + unsigned int fr_inv_timeout; } uac_req_t; /* macro for setting the values of uac_req_t struct */

1 0

git:master:7de2b9b7: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 7de2b9b7625d9cb856944627a3a5d7c167006dc6 URL: https://github.com/kamailio/kamailio/commit/7de2b9b7625d9cb856944627a3a5d7c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-06-06T12:46:10+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/7de2b9b7625d9cb856944627a3a5d7c… Patch: https://github.com/kamailio/kamailio/commit/7de2b9b7625d9cb856944627a3a5d7c…

1 0

[kamailio/kamailio] rtpengine hash table dmq replication (PR #4240)
by vlitvinov 06 Jun '25

06 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) - [ ] 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) - [x] 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  Adding KDMQ replication for rtpengine hash table (call -> rtpengine instance assignment) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4240 -- Commit Summary -- * rtpegnine hash table dmq replication -- File Changes -- M src/modules/rtpengine/rtpengine.c (49) M src/modules/rtpengine/rtpengine.h (4) M src/modules/rtpengine/rtpengine_db.c (2) A src/modules/rtpengine/rtpengine_dmq.c (310) A src/modules/rtpengine/rtpengine_dmq.h (54) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4240.patch https://github.com/kamailio/kamailio/pull/4240.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4240 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4240(a)github.com>

4 10

git:master:98cbb5cd: rtpengine: hash table dmq replication
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 98cbb5cdf169578c75f60f4f12c2e9e4dadeed3e URL: https://github.com/kamailio/kamailio/commit/98cbb5cdf169578c75f60f4f12c2e9e… Author: vlitvinov <litvvitya92(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T12:43:33+02:00 rtpengine: hash table dmq replication --- Added: src/modules/rtpengine/rtpengine_dmq.c Added: src/modules/rtpengine/rtpengine_dmq.h Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/98cbb5cdf169578c75f60f4f12c2e9e… Patch: https://github.com/kamailio/kamailio/commit/98cbb5cdf169578c75f60f4f12c2e9e…

1 0

git:master:2492b92e: dialog: use defined tockens for is_set field of local cseq structure for keepalives
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 2492b92e49cfcd5f6828007b6a289b3f881dba69 URL: https://github.com/kamailio/kamailio/commit/2492b92e49cfcd5f6828007b6a289b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T10:15:02+02:00 dialog: use defined tockens for is_set field of local cseq structure for keepalives --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/2492b92e49cfcd5f6828007b6a289b3… Patch: https://github.com/kamailio/kamailio/commit/2492b92e49cfcd5f6828007b6a289b3… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 52e492d2074..48494bef428 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -790,10 +790,11 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) * - dialog is ended on timeout (408) or C/L does not exist (481) */ if(di->loc_seq.value > 1) { di->loc_seq.value -= 2; + di->loc_seq.is_set = DLG_SEQ_VALSET; } else { di->loc_seq.value = 0; + di->loc_seq.is_set = DLG_SEQ_VALNEW; } - di->loc_seq.is_set = 1; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:73c8316b: tm: add defines for dlg cseq is_self field
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 73c8316bf89703156f241886554919339ac270d0 URL: https://github.com/kamailio/kamailio/commit/73c8316bf89703156f2418865549193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T10:08:12+02:00 tm: add defines for dlg cseq is_self field - DLG_SEQ_VALINIT (should be initialized), DLG_SEQ_VALSET (is set, but can be updated for requests within dialog), DLG_SEQ_VALNEW (is set, and ready to be used as new cseq number in generated request) --- Modified: src/modules/tm/dlg.c Modified: src/modules/tm/dlg.h Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/73c8316bf89703156f2418865549193… Patch: https://github.com/kamailio/kamailio/commit/73c8316bf89703156f2418865549193… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index b99065a94c2..6c97db622af 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -357,7 +357,7 @@ int new_dlg_uac(str *_cid, str *_ltag, unsigned int _lseq, str *_luri, /* Make a copy of local sequence (usually CSeq) */ res->loc_seq.value = _lseq; /* And mark it as set */ - res->loc_seq.is_set = 1; + res->loc_seq.is_set = DLG_SEQ_VALSET; *_d = res; @@ -979,7 +979,7 @@ static inline int request2dlg(struct sip_msg *_m, dlg_t *_d) if(get_cseq_value(_m, &_d->rem_seq.value) < 0) goto err3; - _d->rem_seq.is_set = 1; + _d->rem_seq.is_set = DLG_SEQ_VALSET; if(get_dlg_uri(_m->from, &_d->rem_uri) < 0) goto err3; @@ -1149,7 +1149,7 @@ int dlg_request_uas( /* Neither out of order nor retransmission -> update */ _d->rem_seq.value = cseq; - _d->rem_seq.is_set = 1; + _d->rem_seq.is_set = DLG_SEQ_VALSET; /* We will als update remote target URI if the message * is target refresher diff --git a/src/modules/tm/dlg.h b/src/modules/tm/dlg.h index 732ba970bc0..ff37bc4bd9a 100644 --- a/src/modules/tm/dlg.h +++ b/src/modules/tm/dlg.h @@ -52,6 +52,10 @@ #endif /* DIALOG_CALLBACKS */ +#define DLG_SEQ_VALINIT 0 +#define DLG_SEQ_VALSET 1 +#define DLG_SEQ_VALNEW 2 + /* * Dialog sequence */ diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 285f3c7e9eb..3cd99a4d9c6 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -757,7 +757,7 @@ static void rpc_t_uac(rpc_t *rpc, void *c, int reply_wait, int cbflags) dlg.loc_seq.value = cseq; else dlg.loc_seq.value = DEFAULT_CSEQ; - dlg.loc_seq.is_set = 1; + dlg.loc_seq.is_set = DLG_SEQ_VALSET; dlg.loc_uri = get_from(&faked_msg)->uri; dlg.rem_uri = get_to(&faked_msg)->uri; @@ -1077,7 +1077,7 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, dlg.loc_seq.value = cseq; else dlg.loc_seq.value = DEFAULT_CSEQ; - dlg.loc_seq.is_set = 1; + dlg.loc_seq.is_set = DLG_SEQ_VALSET; dlg.loc_uri = get_from(&faked_msg)->uri; dlg.rem_uri = get_to(&faked_msg)->uri; diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index a9a327745ec..26748f4570c 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -451,11 +451,11 @@ static inline int t_uac_prepare( /* if err's returned, the message is incorrect */ goto error3; - if(!uac_r->dialog->loc_seq.is_set) { + if(uac_r->dialog->loc_seq.is_set == DLG_SEQ_VALINIT) { /* this is the first request in the dialog, set cseq to default value now - Miklos */ uac_r->dialog->loc_seq.value = DEFAULT_CSEQ; - uac_r->dialog->loc_seq.is_set = 1; + uac_r->dialog->loc_seq.is_set = DLG_SEQ_VALSET; } /* build cell sets X/AVP lists to new transaction structure @@ -677,7 +677,9 @@ int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) goto send; if((uac_r->method->len == 6) && (!memcmp("CANCEL", uac_r->method->s, 6))) goto send; - uac_r->dialog->loc_seq.value++; /* Increment CSeq */ + if(uac_r->dialog->loc_seq.is_set != DLG_SEQ_VALNEW) { + uac_r->dialog->loc_seq.value++; /* Increment CSeq */ + } send: ret = t_uac_prepare(uac_r, dst_req, 0);

1 0

[kamailio/kamailio] Frequent hangs in Kamailio probably related due to lock contention in xhttp_prom module with high concurrency (Issue #4209)
by Henning Westerholt 06 Jun '25

06 Jun '25

henningw created an issue (kamailio/kamailio#4209) Frequent hangs in Kamailio probably related due to lock contention in xhttp_prom module. ### Environment: The systems are using 32 Kamailio worker processes for the relevant network interface, Its also using Prometheus counter increment operations more than 30 times in the cfg during INVITE processing. The Kamailio uses otherwise no database or other IO related services. Kamailio version 5.8.3, but no relevant changes in the xhttp_prom module could be found. ### Quick summary of the findings: Multiple systems showed frequent hangs in their Kamailio servers on a customer setup. It happens usually after a few hours that all Kamailio processes gets blocked, and no more traffic can be processed on the respective system. I have analysed three stack traces of the Kamailio on one of the system that showed the behaviour. Two without problems and one that was created from during a period where the server had problems. ### Details: Here some details of the stack traces from a problematic case. The relevant processes are from PID 494551 to 494582. The majority of all of these processes are blocked in paths related to the Prometheus module (PID 494551 to 494576): #### PID 494551: ``` #1 0x00007fc69ea5f053 in futex_get (lock=0x7fc4a147acd0) at ../../core/mem/../futexlock.h:108 v = 2 i = 1024 #2 0x00007fc69ea70f99 in prom_counter_inc (s_name=0x7fffe339ffa0, number=1, l1=0x7fffe339ff90, l2=0x0, l3=0x0) at prom_metric.c:1154 p = 0x6b __func__ = "prom_counter_inc" […] #14 0x00000000005ab179 in receive_msg (buf=0x9f47e0 <buf> "INVITE [sip:+1YYYYYYY737@10.XXX.XXX107](sip:+1YYYYYYYYYY737@10.XXX.XX.107) SIP/2.0\r\nRecord-Route: [sip:10.1XXX.XXX.104;lr=on;ftag=HK507HSy55p9F;dlgcor=62b91.985c3](sip:10.XXX.XXX.104;lr=on;ftag=HK507HSy55p9F;dlgcor=62b91.985c3)\r\nRecord-Route: [sip:10.XXX.XXX.117;r2=on;lr;ftag=HK507HSy55p9F](sip:10.XXX.XXX.117;r2=on;lr;ftag=HK507HSy55p9F)\r\nRecord-R"..., len=2819, rcv_info=0x7fffe33a28d0) at core/receive.c:518 ``` Most of the worker processes are in the same state as shown above. Some of the processes are also working in other Prometheus related operations: #### PID 494554: ``` #0 prom_metric_timeout_delete (p_m=0x7fc49ea102f0) at prom_metric.c:646 current = 0x7fc4a2810fd0 ts = 1744143945433 __func__ = "prom_metric_timeout_delete" l = 0x7fc4abffc808 #1 0x00007fc69ea676ce in prom_metric_list_timeout_delete () at prom_metric.c:668 p = 0x7fc49ea102f0 ``` ### Problem hypothesis: My hypothesis is that the hang is caused from lock contention around the Prometheus module. The relevant code uses only one lock, and this together with the extensive usage of the increment counters probably causes this issues under high load. The majority of the worker processed are occupied in the Prometheus path and are not working on SIP packets. This will cause of course an increase of the UDP queue and the described problems. In order to test this hypothesis we removed temporarily the Prometheus logic in the kamailio cfg and see if the issue still persists. The issue did not showed up again after two days of testing, when before it was observed after a few hours. ### Possible solutions: The Prometheus module probably needs some improvements to support better high-load and concurrency situations. On common approach is to split the locks, e.g. using a per process lock array and then combining the individual values in a second pass when read from outside. Alternatively the xhttp_prom module should be used only carefully in situations with a high concurrency setup. I have the full backtrace available, if helpful just let me know. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4209 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4209(a)github.com>

2 2

Kamailio Deployment in AWS
by gcampos＠momenta.network 05 Jun '25

05 Jun '25

Hi community, I'm not sure if anyone has ever tried that before, but I'm trying to run Kamailio in AWS with RTPengine. I successfully installed both Kamailio and RTPengine on my EC2 instance and I'm able to make my devices register to it. However, when I make a call from one of my devices, the call is muted. As I analyze my kamailio.cfg file, I see that the "route[NATMANAGE]" is likely the cause of the mute call. I think that none of the conditions below are met, therefore, the flags are not set. Because of that, the last condition is met, thus triggering the "return" and exiting from the route[NATMANAGE] prematurely without even reaching the section where I define the RTPengine modifications. Not only that, but if I remove/comment out the "return", then the RTPengine is triggered, but there call doesn't connect. I wonder why this is happening and if there's any known workaround. # RTP relaying management and signaling updates for NAT traversal route[NATMANAGE] { xlog("L_INFO", "NATMANAGE path was followed\n"); #!ifdef WITH_NAT xlog("L_INFO", "WITH_NAT Triggered\n"); if (is_request()) { xlog("L_INFO", "is_request path was followed\n"); if (has_totag()) { xlog("L_INFO", "has_totag path was followed\n"); if (check_route_param("nat=yes")) { xlog("L_INFO", "nat=yes param detected, setting FLB_NATB\n"); setbflag(FLB_NATB); } } if (nat_uac_test("3")) { xlog("L_INFO", "nat_uac_test(3) matched, setting FLT_NATS + FLB_NATB\n"); setflag(FLT_NATS); setbflag(FLB_NATB); } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) { xlog("L_INFO", "No NAT flags set, skipping NAT handling\n"); return; } #!ifdef WITH_RTPENGINE xlog("L_INFO", "WITH_RTPENGINE Path followed\n"); if (has_body("application/sdp")) { if (is_method("INVITE")) { xlog("L_INFO", "IS_METHOD_INVITE Path Followed\n"); rtpengine_manage("replace-origin replace-session-connection trust-address direction=internal"); } else if (is_reply()) { xlog("L_INFO", "IS_Reply Path Followed\n"); rtpengine_manage("replace-origin replace-session-connection trust-address direction=internal"); } } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; }

3 2

git:5.8:6c71d5e7: core: sdp - removed invalid condition
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: 5.8 Commit: 6c71d5e7364e169373a38d899793c78ae4f93835 URL: https://github.com/kamailio/kamailio/commit/6c71d5e7364e169373a38d899793c78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T14:46:57+02:00 core: sdp - removed invalid condition - introduced in commit 3198b66 - GH #4229 (cherry picked from commit 444fef809c21b250402cfdbd48de65926ac6286a) (cherry picked from commit 21c944e4a8c04d6f1a4c66897021e01a5ea6f22b) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/6c71d5e7364e169373a38d899793c78… Patch: https://github.com/kamailio/kamailio/commit/6c71d5e7364e169373a38d899793c78… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index a22e64cb1e6..02f72d77521 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -332,10 +332,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); - if(start + len > body->s + body->len) { - LM_ERR("no component in `a=candidate'\n"); - return -1; - } + space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

git:6.0:a37a57c2: dialog: bump cseq for generated byes also for caller side
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: 6.0 Commit: a37a57c2b4db73b4963d3af5e733ea8fe5c5833d URL: https://github.com/kamailio/kamailio/commit/a37a57c2b4db73b4963d3af5e733ea8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T13:10:49+02:00 dialog: bump cseq for generated byes also for caller side - do it always, they are the last requests within dialog (cherry picked from commit 43e64af9bade5fedf34e847f662b97ce94c041bc) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/a37a57c2b4db73b4963d3af5e733ea8… Patch: https://github.com/kamailio/kamailio/commit/a37a57c2b4db73b4963d3af5e733ea8… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 6349e88c1f8..773ae788e3b 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -425,10 +425,9 @@ static inline int send_bye( goto err; } - /* safety bump of cseq if prack was involved in call setup */ - if(cell->iflags & DLG_IFLAG_PRACK) { - dialog_info->loc_seq.value += 80; - } + /* safety bump of cseq for callee side if prack was involved in call setup + * or keepalives were sent to caller side */ + dialog_info->loc_seq.value += 100; LM_DBG("sending BYE to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:43e64af9: dialog: bump cseq for generated byes also for caller side
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: master Commit: 43e64af9bade5fedf34e847f662b97ce94c041bc URL: https://github.com/kamailio/kamailio/commit/43e64af9bade5fedf34e847f662b97c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T13:07:59+02:00 dialog: bump cseq for generated byes also for caller side - do it always, they are the last requests within dialog --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/43e64af9bade5fedf34e847f662b97c… Patch: https://github.com/kamailio/kamailio/commit/43e64af9bade5fedf34e847f662b97c… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 6467b32b349..52e492d2074 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -425,10 +425,9 @@ static inline int send_bye( goto err; } - /* safety bump of cseq if prack was involved in call setup */ - if(cell->iflags & DLG_IFLAG_PRACK) { - dialog_info->loc_seq.value += 80; - } + /* safety bump of cseq for callee side if prack was involved in call setup + * or keepalives were sent to caller side */ + dialog_info->loc_seq.value += 100; LM_DBG("sending BYE to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:6.0:b293f206: dialog: set cseq is_set for keepalive
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: 6.0 Commit: b293f20620c3396130f6409ddf30b69499bb482f URL: https://github.com/kamailio/kamailio/commit/b293f20620c3396130f6409ddf30b69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T11:33:15+02:00 dialog: set cseq is_set for keepalive (cherry picked from commit b5d4c20172bdcaf0e63b15b4e23d205125398a42) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/b293f20620c3396130f6409ddf30b69… Patch: https://github.com/kamailio/kamailio/commit/b293f20620c3396130f6409ddf30b69… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 7645ebeca37..6349e88c1f8 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -784,10 +784,12 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) /* tm increases cseq value, decrease it no to make it invalid * - dialog is ended on timeout (408) or C/L does not exist (481) */ - if(di->loc_seq.value > 1) + if(di->loc_seq.value > 1) { di->loc_seq.value -= 2; - else + } else { di->loc_seq.value = 0; + } + di->loc_seq.is_set = 1; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:6.0:21c944e4: core: sdp - removed invalid condition
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: 6.0 Commit: 21c944e4a8c04d6f1a4c66897021e01a5ea6f22b URL: https://github.com/kamailio/kamailio/commit/21c944e4a8c04d6f1a4c66897021e01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T11:33:03+02:00 core: sdp - removed invalid condition - introduced in commit 3198b66 - GH #4229 (cherry picked from commit 444fef809c21b250402cfdbd48de65926ac6286a) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/21c944e4a8c04d6f1a4c66897021e01… Patch: https://github.com/kamailio/kamailio/commit/21c944e4a8c04d6f1a4c66897021e01… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 5e9b3f121ab..2e7d996bc54 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -332,10 +332,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); - if(start + len > body->s + body->len) { - LM_ERR("no component in `a=candidate'\n"); - return -1; - } + space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

git:master:b5d4c201: dialog: set cseq is_set for keepalive
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: master Commit: b5d4c20172bdcaf0e63b15b4e23d205125398a42 URL: https://github.com/kamailio/kamailio/commit/b5d4c20172bdcaf0e63b15b4e23d205… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T11:32:36+02:00 dialog: set cseq is_set for keepalive --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/b5d4c20172bdcaf0e63b15b4e23d205… Patch: https://github.com/kamailio/kamailio/commit/b5d4c20172bdcaf0e63b15b4e23d205… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 9ffd65e9526..6467b32b349 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -789,10 +789,12 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) /* tm increases cseq value, decrease it no to make it invalid * - dialog is ended on timeout (408) or C/L does not exist (481) */ - if(di->loc_seq.value > 1) + if(di->loc_seq.value > 1) { di->loc_seq.value -= 2; - else + } else { di->loc_seq.value = 0; + } + di->loc_seq.is_set = 1; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:730d6872: core: print default path to runtime dir on internals output
by Daniel-Constantin Mierla 05 Jun '25

05 Jun '25

Module: kamailio Branch: master Commit: 730d6872054cb6218684d5e48af341c7c2749233 URL: https://github.com/kamailio/kamailio/commit/730d6872054cb6218684d5e48af341c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-05T11:32:36+02:00 core: print default path to runtime dir on internals output --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/730d6872054cb6218684d5e48af341c… Patch: https://github.com/kamailio/kamailio/commit/730d6872054cb6218684d5e48af341c… --- diff --git a/src/main.c b/src/main.c index 95588200ba9..b0ec7fcb0d9 100644 --- a/src/main.c +++ b/src/main.c @@ -288,6 +288,7 @@ void print_internals(void) printf(" Version: %s\n", full_version); printf(" Default config: %s\n", CFG_FILE); printf(" Default paths to modules: %s\n", MODS_DIR); + printf(" Default path to runtime dir: %s\n", RUN_DIR); printf(" Compile flags: %s\n", ver_flags); printf(" MAX_RECV_BUFFER_SIZE=%d\n", MAX_RECV_BUFFER_SIZE); printf(" MAX_SEND_BUFFER_SIZE=%d\n", MAX_SEND_BUFFER_SIZE);

1 0

[kamailio/kamailio] Replace ip address of source (Issue #4272)
by nochnoi82 04 Jun '25

04 Jun '25

nochnoi82 created an issue (kamailio/kamailio#4272) Hello to everyone. I deployed Kamailio on Debian system. Install was successfull. I have the task to use Kamailio as proxy between Avaya PBX and Videoconference System. Outgoing calls only from IPPhone ----- Avaya PBX ---sip----> Kamailio -----sip----> Video System-IVR IVR number is 3000. Avaya Prefix for routing to Kamailio is 1234. When we dial number 12343000 the call goes to Video system with Header "TO" 12343000@ip_of_PBXAvaya and call drops. How to replace ip-address of Avaya to ip-address of Video_System? What to add in kamailio.cfg? ip video_system - *.*.60.3 ip avaya *.*.20.10 My route config ####### Routing Logic ######## /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting } if ($rU==$null) { sl_send_reply("484", "Address Incomplete"); exit; } $du = "sip:*.*.60.3:5060"; route(RELAY); exit; } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200","Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } # Handle SIP registrations 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 } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTPProxy control and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); } else { rtpengine_manage("replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); return; } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } return; } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } return; } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif return; -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4272 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4272(a)github.com>

2 2

git:master:0ab44e99: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 04 Jun '25

04 Jun '25

Module: kamailio Branch: master Commit: 0ab44e999c81a25dc826f23e724cf699ce894beb URL: https://github.com/kamailio/kamailio/commit/0ab44e999c81a25dc826f23e724cf69… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-06-04T08:01:09+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/0ab44e999c81a25dc826f23e724cf69… Patch: https://github.com/kamailio/kamailio/commit/0ab44e999c81a25dc826f23e724cf69… --- diff --git a/src/modules/userblocklist/README b/src/modules/userblocklist/README index 9aabcb73d19..4cff231c495 100644 --- a/src/modules/userblocklist/README +++ b/src/modules/userblocklist/README @@ -154,9 +154,9 @@ Chapter 1. Admin Guide blocklisted or not. An additional functionality that this module provides is the ability to - handle global blocklists. This lists are loaded on startup into memory, - thus providing a better performance than the userblocklist case. These - global blocklists are useful to allow only calls to certain + handle global blocklists. These lists are loaded on startup into + memory, thus providing a better performance than the userblocklist + case. These global blocklists are useful to allow only calls to certain international destinations, i.e. block all not allowlisted numbers. They could also be used to prevent the blocklisting of important numbers, as allowlisting is supported too. This is useful for example

1 0

git:master:81357b54: userblocklist: docs - small typo
by Daniel-Constantin Mierla 04 Jun '25

04 Jun '25

Module: kamailio Branch: master Commit: 81357b548b6e0cdf464361c2b1742d797f0d7e95 URL: https://github.com/kamailio/kamailio/commit/81357b548b6e0cdf464361c2b1742d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-04T07:50:46+02:00 userblocklist: docs - small typo --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81357b548b6e0cdf464361c2b1742d7… Patch: https://github.com/kamailio/kamailio/commit/81357b548b6e0cdf464361c2b1742d7… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index db8efd86896..0a64d648ea1 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -20,7 +20,7 @@ </para> <para> An additional functionality that this module provides is the ability - to handle global blocklists. This lists are loaded on startup into + to handle global blocklists. These lists are loaded on startup into memory, thus providing a better performance than the userblocklist case. These global blocklists are useful to allow only calls to certain international destinations, i.e. block all not allowlisted numbers.

1 0

git:master:0195e860: siptrace: reset x/avp lists after event route
by Daniel-Constantin Mierla 04 Jun '25

04 Jun '25

Module: kamailio Branch: master Commit: 0195e86084ffbe5333310fc4206f4a6d01662a85 URL: https://github.com/kamailio/kamailio/commit/0195e86084ffbe5333310fc4206f4a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-04T07:50:46+02:00 siptrace: reset x/avp lists after event route --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0195e86084ffbe5333310fc4206f4a6… Patch: https://github.com/kamailio/kamailio/commit/0195e86084ffbe5333310fc4206f4a6… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index cdac1a32ccf..e199d1cefc9 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -40,6 +40,8 @@ #include "../../core/mod_fix.h" #include "../../core/fmsg.h" #include "../../core/events.h" +#include "../../core/srapi.h" +#include "../../core/receive.h" #include "../../core/kemi.h" #include "sipdump_write.h" @@ -286,14 +288,14 @@ static sipdump_data_t *sipdump_event_data = NULL; */ int sipdump_event_route(sipdump_data_t *sdi) { - int backup_rt; run_act_ctx_t ctx; run_act_ctx_t *bctx; sr_kemi_eng_t *keng = NULL; str evname = str_init("sipdump:msg"); sip_msg_t *fmsg = NULL; + ksr_msg_env_t menv = {0}; - backup_rt = get_route_type(); + ksr_msg_env_push(&menv); set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); fmsg = faked_msg_next(); @@ -312,7 +314,8 @@ int sipdump_event_route(sipdump_data_t *sdi) } } sipdump_event_data = NULL; - set_route_type(backup_rt); + ksr_msg_env_reset(); + ksr_msg_env_pop(&menv); if(ctx.run_flags & DROP_R_F) { return DROP_R_F; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev