- sr-dev - kamailio.org

git:6.0:a68d952d: ims_registrar_scscf: fix reg_fetch_contacts call
by Henning Westerholt 11 Apr '25

11 Apr '25

Module: kamailio Branch: 6.0 Commit: a68d952de5d6a5d91202176877730d53f9c2c580 URL: https://github.com/kamailio/kamailio/commit/a68d952de5d6a5d91202176877730d5… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-11T12:49:08Z 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/a68d952de5d6a5d91202176877730d5… Patch: https://github.com/kamailio/kamailio/commit/a68d952de5d6a5d91202176877730d5… --- 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 9ef1da8f2be..236406951c0 100644 --- a/src/modules/ims_registrar_scscf/regpv.c +++ b/src/modules/ims_registrar_scscf/regpv.c @@ -45,6 +45,7 @@ typedef struct _regpv_profile str pname; str domain; str aor; + str impi; int flags; unsigned int aorhash; int nrc; @@ -121,6 +122,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; @@ -245,6 +251,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); @@ -323,6 +332,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; @@ -437,10 +448,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) { @@ -455,8 +474,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:e66a876c: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: e66a876c2cf694f7389cceab6f9739acf763d104 URL: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T13:46:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a… Patch: https://github.com/kamailio/kamailio/commit/e66a876c2cf694f7389cceab6f9739a…

1 0

[kamailio/kamailio] DMQ improvements related to node status (PR #4182)
by Stefan Mititelu 11 Apr '25

11 Apr '25

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Some improvements related to DMQ node status: 1. Allow other modules that use DMQ to detect NOT_ACTIVE nodes via default response callback. Note that only internal dmq ping mechanism can set them back to DMQ_NODE_ACTIVE status. 2. Simplify node status and merge DMQ_NODE_PENDING + DMQ_NODE_TIMEOUT into DMQ_NODE_NOT_ACTIVE since those specific states were never used to be compared against. 3. Add new mod parameters which will control after how many fails the node should be moved to DMQ_NODE_NOT_ACTIVE state. Under testing currently. Will update if any bugs found. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4182 -- Commit Summary -- * dmq: add default response callback * dmq: simplify node status * dmq: add two new modparams -- File Changes -- M src/modules/dialog/dlg_dmq.c (16) M src/modules/dialog/dlg_dmq.h (3) M src/modules/dmq/dmq.c (4) M src/modules/dmq/dmq.h (2) M src/modules/dmq/dmq_funcs.c (6) M src/modules/dmq/dmqnode.c (70) M src/modules/dmq/dmqnode.h (9) M src/modules/dmq/doc/dmq_admin.xml (64) M src/modules/dmq/notification_peer.c (80) M src/modules/dmq/notification_peer.h (3) M src/modules/dmq_usrloc/usrloc_sync.c (12) M src/modules/dmq_usrloc/usrloc_sync.h (2) M src/modules/htable/ht_dmq.c (15) M src/modules/htable/ht_dmq.h (3) M src/modules/presence/presence_dmq.c (16) M src/modules/presence/presence_dmq.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4182.patch https://github.com/kamailio/kamailio/pull/4182.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4182 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4182(a)github.com>

4 8

git:master:c3eabac0: presence: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: c3eabac00a5bc6a3d8d9008229e4a858e92c22d7 URL: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 presence: use NULL for dmq response callback --- Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… Patch: https://github.com/kamailio/kamailio/commit/c3eabac00a5bc6a3d8d9008229e4a85… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 2e26187383f..139613aed60 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -33,7 +33,6 @@ static int *pres_dmq_recv = 0; dmq_api_t pres_dmqb; dmq_peer_t *pres_dmq_peer = NULL; -dmq_resp_cback_t pres_dmq_resp_callback = {&pres_dmq_resp_callback_f, 0}; int pres_dmq_send_all_presentities(dmq_node_t *dmq_node); int pres_dmq_request_sync(); @@ -143,12 +142,12 @@ int pres_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - pres_dmqb.send_message(pres_dmq_peer, body, node, - &pres_dmq_resp_callback, 1, &pres_dmq_content_type); + pres_dmqb.send_message( + pres_dmq_peer, body, node, NULL, 1, &pres_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - pres_dmqb.bcast_message(pres_dmq_peer, body, 0, &pres_dmq_resp_callback, - 1, &pres_dmq_content_type); + pres_dmqb.bcast_message( + pres_dmq_peer, body, 0, NULL, 1, &pres_dmq_content_type); } return 0; } @@ -490,14 +489,3 @@ int pres_dmq_send_all_presentities(dmq_node_t *dmq_node) return 0; } - - -/** -* @brief dmq response callback -*/ -int pres_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/presence/presence_dmq.h b/src/modules/presence/presence_dmq.h index cc6eb764f68..3bf82c084ca 100644 --- a/src/modules/presence/presence_dmq.h +++ b/src/modules/presence/presence_dmq.h @@ -33,7 +33,6 @@ extern dmq_api_t pres_dmqb; extern dmq_peer_t *pres_dmq_peer; -extern dmq_resp_cback_t pres_dmq_resp_callback; typedef enum { @@ -47,6 +46,4 @@ int pres_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node); int pres_dmq_replicate_presentity(presentity_t *presentity, str *body, int new_t, str *cur_etag, char *sphere, str *ruid, dmq_node_t *node); -int pres_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:14a61f13: dmq_usrloc: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 14a61f1377e7711a1feee4e30a648fb0cd6ff25f URL: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dmq_usrloc: use NULL for dmq response callback --- Modified: src/modules/dmq_usrloc/usrloc_sync.c Modified: src/modules/dmq_usrloc/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… Patch: https://github.com/kamailio/kamailio/commit/14a61f1377e7711a1feee4e30a648fb… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 87e151b4fa3..79a54eb2b19 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -42,7 +42,6 @@ static struct socket_info *dmq_server_socket_local = 0; dmq_api_t usrloc_dmqb; dmq_peer_t *usrloc_dmq_peer = NULL; -dmq_resp_cback_t usrloc_dmq_resp_callback = {&usrloc_dmq_resp_callback_f, 0}; int usrloc_dmq_send_all(); int usrloc_dmq_request_sync(); @@ -335,12 +334,12 @@ int usrloc_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - usrloc_dmqb.send_message(usrloc_dmq_peer, body, node, - &usrloc_dmq_resp_callback, 1, &usrloc_dmq_content_type); + usrloc_dmqb.send_message( + usrloc_dmq_peer, body, node, NULL, 1, &usrloc_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - usrloc_dmqb.bcast_message(usrloc_dmq_peer, body, 0, - &usrloc_dmq_resp_callback, 1, &usrloc_dmq_content_type); + usrloc_dmqb.bcast_message( + usrloc_dmq_peer, body, 0, NULL, 1, &usrloc_dmq_content_type); } return 0; } @@ -1016,13 +1015,6 @@ void srjson_to_xavp(srjson_t *json, sr_xavp_t **xavp) } } -int usrloc_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} - void dmq_ul_cb_contact(ucontact_t *ptr, int type, void *param) { str aor; diff --git a/src/modules/dmq_usrloc/usrloc_sync.h b/src/modules/dmq_usrloc/usrloc_sync.h index 85cfc27e414..ba08cde9372 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.h +++ b/src/modules/dmq_usrloc/usrloc_sync.h @@ -43,8 +43,6 @@ typedef enum DMQ_SYNC, } usrloc_dmq_action_t; -int usrloc_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); int usrloc_dmq_initialize(); int usrloc_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node);

1 0

git:master:08f542ef: htable: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 08f542efffa4845247cc4a4795f1d90bd3957130 URL: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 htable: use NULL for dmq response callback --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… Patch: https://github.com/kamailio/kamailio/commit/08f542efffa4845247cc4a4795f1d90… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index ead9171e17d..a5fd41f3e44 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -56,7 +56,6 @@ extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t *ht_dmq_peer = NULL; -dmq_resp_cback_t ht_dmq_resp_callback = {&ht_dmq_resp_callback_f, 0}; int ht_dmq_send(str *body, dmq_node_t *node); int ht_dmq_send_sync(dmq_node_t *node, str *htname); @@ -245,12 +244,12 @@ int ht_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - ht_dmqb.send_message(ht_dmq_peer, body, node, &ht_dmq_resp_callback, 1, - &ht_dmq_content_type); + ht_dmqb.send_message( + ht_dmq_peer, body, node, NULL, 1, &ht_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - ht_dmqb.bcast_message(ht_dmq_peer, body, 0, &ht_dmq_resp_callback, 1, - &ht_dmq_content_type); + ht_dmqb.bcast_message( + ht_dmq_peer, body, 0, NULL, 1, &ht_dmq_content_type); } return 0; } @@ -644,13 +643,3 @@ int ht_dmq_handle_sync(srjson_doc_t *jdoc) } return 0; } - -/** - * @brief dmq response callback - */ -int ht_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index aaa1eb5efc0..e0f3d2279c4 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,7 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t *ht_dmq_peer; -extern dmq_resp_cback_t ht_dmq_resp_callback; typedef enum { @@ -55,7 +54,5 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str *htname, str *cname, int type, int_str *val, int mode); int ht_dmq_request_sync(str *htname); int ht_dmq_request_sync_all(); -int ht_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:3b915121: dialog: use NULL for dmq response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 3b915121d7e912a3edc609800bf5c336f35cbbde URL: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dialog: use NULL for dmq response callback --- Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… Patch: https://github.com/kamailio/kamailio/commit/3b915121d7e912a3edc609800bf5c33… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 6cd8d898762..669f9c97eef 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -33,7 +33,6 @@ static str dmq_500_rpl = str_init("Server Internal Error"); dmq_api_t dlg_dmqb; dmq_peer_t *dlg_dmq_peer = NULL; -dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; int dmq_send_all_dlgs(dmq_node_t *dmq_node); int dlg_dmq_request_sync(); @@ -82,12 +81,12 @@ int dlg_dmq_send(str *body, dmq_node_t *node) } if(node) { LM_DBG("sending dmq message ...\n"); - dlg_dmqb.send_message(dlg_dmq_peer, body, node, &dlg_dmq_resp_callback, - 1, &dlg_dmq_content_type); + dlg_dmqb.send_message( + dlg_dmq_peer, body, node, NULL, 1, &dlg_dmq_content_type); } else { LM_DBG("sending dmq broadcast...\n"); - dlg_dmqb.bcast_message(dlg_dmq_peer, body, 0, &dlg_dmq_resp_callback, 1, - &dlg_dmq_content_type); + dlg_dmqb.bcast_message( + dlg_dmq_peer, body, 0, NULL, 1, &dlg_dmq_content_type); } return 0; } @@ -684,14 +683,3 @@ int dmq_send_all_dlgs(dmq_node_t *dmq_node) return 0; } - - -/** -* @brief dmq response callback -*/ -int dlg_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param) -{ - LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); - return 0; -} diff --git a/src/modules/dialog/dlg_dmq.h b/src/modules/dialog/dlg_dmq.h index f545917b900..10caf81ba8a 100644 --- a/src/modules/dialog/dlg_dmq.h +++ b/src/modules/dialog/dlg_dmq.h @@ -33,7 +33,6 @@ extern dmq_api_t dlg_dmqb; extern dmq_peer_t *dlg_dmq_peer; -extern dmq_resp_cback_t dlg_dmq_resp_callback; typedef enum { @@ -49,6 +48,4 @@ int dlg_dmq_handle_msg( struct sip_msg *msg, peer_reponse_t *resp, dmq_node_t *node); int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, int needlock, dmq_node_t *node); -int dlg_dmq_resp_callback_f( - struct sip_msg *msg, int code, dmq_node_t *node, void *param); #endif

1 0

git:master:e9af7b56: dmq: rework node status and add default response callback
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: e9af7b56539a2636d35691ffebecb166d1ae1c41 URL: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:37:55+02:00 dmq: rework node status and add default response callback - rework node statuses to: DMN_NODE_ACTIVE, DMQ_NODE_NOT_ACTIVE, DMQ_NODE_DISABLED - add default callback to be used when NULL - add 3 modparams related to fail_count; increment fail_count only on 408; print fail count on rpc list_nodes command --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h --- Diff: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16… Patch: https://github.com/kamailio/kamailio/commit/e9af7b56539a2636d35691ffebecb16…

1 0

[kamailio/kamailio] dispatcher: added ping socket configuration (PR #4186)
by Michael Furmur 11 Apr '25

11 Apr '25

- add dispatcher modparam `ds_ping_socket` - add gateway param `ping_socket`   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description could be useful for HA use cases where multiple kamailio nodes share a common Virtual IP (e.g.: managed by the VRRP). we need to route requests using Virtual IP socket configured with `ds_default_sockname`/`socket` and to perform destinations probing using self-IP socket configured with `ds_ping_socket`/`ping_socket`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4186 -- Commit Summary -- * dispatcher: added ping socket configuration -- File Changes -- M src/modules/dispatcher/dispatch.c (32) M src/modules/dispatcher/dispatch.h (2) M src/modules/dispatcher/dispatcher.c (25) M src/modules/dispatcher/doc/dispatcher_admin.xml (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4186.patch https://github.com/kamailio/kamailio/pull/4186.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4186 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4186(a)github.com>

3 5

git:master:1414fe8d: dispatcher: added ping socket configuration
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 1414fe8d97e138dd070fde1f85e1000770b12e1c URL: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:35:54+02:00 dispatcher: added ping socket configuration - new dispatcher modparam 'ds_ping_socket' - new gateway param 'ping_socket' --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000… Patch: https://github.com/kamailio/kamailio/commit/1414fe8d97e138dd070fde1f85e1000…

1 0

[kamailio/kamailio] uac: fix memory corruption from shared tp being freed by another tran… (PR #4210)
by nickgashcc 11 Apr '25

11 Apr '25

…saction   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When the UAC is used to send an outbound REGISTER message to an endpoint and has an incorrect password resulting in all messages with or without an authorization header being responded to with a 401/407 it is possible and likely that shared memory will be corrupted resulting in core dumps. The response to the initial register calls into the uac modules uac_send_tm_callback where it generates the authorization constructs a a new request info that has a reference to the existing tp. As a result the 2 transactions and associated timers will have race conditions and ultimately can both attempt to deallocate the shared tp object in either uac_send_tm_callback or uac_resend_tm_callback. As a solution I use the existing clone function uac_r.cbp = (void *)uac_send_info_clone(tp); which allows each transaction to use and deallocate only their own copy. In addition to this a sanity check was also added around the to object where it was being used after a possible deallocation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4210 -- Commit Summary -- * uac: fix memory corruption from shared tp being freed by another transaction -- File Changes -- M src/modules/uac/uac_send.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4210.patch https://github.com/kamailio/kamailio/pull/4210.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4210 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4210(a)github.com>

2 1

git:master:d529b511: uac: fix memory corruption from shared tp being freed by another transaction
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: d529b511b1ce722ceccf29dc006e92d45f1f340e URL: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… Author: ngash <ngash(a)west.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:33:23+02:00 uac: fix memory corruption from shared tp being freed by another transaction - Shared memory corruption resulting in multiple process core dumps. Triggered by an outbound REGISTER receiving 401 for all requests which resulted in the shared tp being released in uac_resend_tm_callback whilst the current transaction was put on timer and also used after release and then re-released. In order to avoid sharing the tp I changed the code in uac_send_tm_callback to clone the existing tp. Also added a sanity check for null as tp could be released prior to a dereference of tp->event --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… Patch: https://github.com/kamailio/kamailio/commit/d529b511b1ce722ceccf29dc006e92d… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index dd5de24b16c..f8a77b6a6b4 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -807,7 +807,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* Callback function */ uac_r.cb = uac_resend_tm_callback; /* Callback parameter */ - uac_r.cbp = (void *)tp; + uac_r.cbp = (void *)uac_send_info_clone(tp); } ret = _uac_send_tmb.t_request_within(&uac_r); @@ -816,13 +816,18 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + if(uac_r.cbp != NULL) + shm_free(uac_r.cbp); + shm_free(tp); *ps->param = NULL; tp = NULL; } - if(tp->evroute != 0) { - return; + if(tp != NULL) { + if(tp->evroute != 0) { + return; + } } done:

1 0

git:master:75a2c6ff: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 75a2c6ff992632d7149f2f0ebafa0ea704be28fd URL: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T13:31:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… Patch: https://github.com/kamailio/kamailio/commit/75a2c6ff992632d7149f2f0ebafa0ea… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 4821b265a91..9ddf3c6a626 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -773,8 +773,12 @@ failure_route["serial"] 3.1. fr_timer (integer) - Timer which hits if no final reply for a request or ACK for a negative - INVITE reply arrives (in milliseconds). + This timer is used for all SIP requests. It hits if no reply for an + request INVITE request or other request has been received within (F in + milliseconds). If a provisional reply is received for an INVITE (any + 1xx), then the fr_inv_timer will be used instead. And if no replies (at + all) for an INVITE are received before fr_timer hits, the transaction + is terminated with a 408 in failure route. Default value is 30000 ms (30 seconds).

1 0

[kamailio/kamailio] tm: Update docs of fr_timer to match the implementation (PR #4207)
by Xenofon Karamanos 11 Apr '25

11 Apr '25

- Use description found in https://sip-router.org/wiki/ref_manual/timers   #### 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 - [ ] Tested changes locally - [x] Related to issue #3939 #### Description  Fix documentation according to the description found in https://sip-router.org/wiki/ref_manual/timers. They better reflect the actual procedure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4207 -- Commit Summary -- * tm: Update docs of fr_timer to match the implementation -- File Changes -- M src/modules/tm/doc/params.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4207.patch https://github.com/kamailio/kamailio/pull/4207.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4207 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4207(a)github.com>

2 1

git:master:11952522: tm: Update docs of fr_timer to match the implementation
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 1195252256858dc4419c179e5b72541018f5feab URL: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:29:33+02:00 tm: Update docs of fr_timer to match the implementation - Use description found in https://sip-router.org/wiki/ref_manual/timers --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… Patch: https://github.com/kamailio/kamailio/commit/1195252256858dc4419c179e5b72541… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 1dd77f1df3f..31c7c55b9ef 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -18,8 +18,12 @@ <section id="tm.p.fr_timer"> <title><varname>fr_timer</varname> (integer)</title> <para> - Timer which hits if no final reply for a request or ACK for a - negative INVITE reply arrives (in milliseconds). + This timer is used for all SIP requests. It hits if no reply for an + request INVITE request or other request has been received + within (F in milliseconds). If a provisional reply is received for an + INVITE (any 1xx), then the fr_inv_timer will be used instead. And if + no replies (at all) for an INVITE are received before fr_timer hits, + the transaction is terminated with a 408 in failure route. </para> <para> Default value is 30000 ms (30 seconds).

1 0

git:master:3988ad29: core: added kemi function KSR.is_TCPX()
by Daniel-Constantin Mierla 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 3988ad296772b09353324557a867425d677fe706 URL: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-11T13:19:28+02:00 core: added kemi function KSR.is_TCPX() - return true if incoming base connection is tcp (tcp, tls, ws, wss) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… Patch: https://github.com/kamailio/kamailio/commit/3988ad296772b09353324557a867425… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 1f936453225..fe2f20078a4 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1139,6 +1139,17 @@ static int sr_kemi_core_is_proto_tcp(sip_msg_t *msg) return (msg->rcv.proto == PROTO_TCP) ? SR_KEMI_TRUE : SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto_tcpx(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TCP || msg->rcv.proto == PROTO_TLS + || msg->rcv.proto == PROTO_WSS || msg->rcv.proto == PROTO_WS) + ? SR_KEMI_TRUE + : SR_KEMI_FALSE; +} + /** * */ @@ -2102,6 +2113,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_TCPX"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tcpx, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_TLS"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_tls, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") doesn't take effect (Issue #4211)
by Hampas-J 11 Apr '25

11 Apr '25

Hampas-J created an issue (kamailio/kamailio#4211) Hi, I'm using "version: kamailio 6.0.0-dev2 (x86_64/linux) 0da3eb" to setup IMS and configured modparam("ims_ipsec_pcscf", "ipsec_preferred_ealg", "aes-cbc") to encrypt ESP payload, I can make a call, but I see the ealg is still null in SIP 401 Unauthorized message and ESP payload is not encrypted: <img width="211" alt="Image" src="https://github.com/user-attachments/assets/f0d75ff0-1e40-429a-9511-da30cf63…" /> Is there any configuration missing? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4211 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4211(a)github.com>

1 2

Re: [open5gs/open5gs] open5gs-smfd crashes when starting (Issue #3074)
by Victor Seva 11 Apr '25

11 Apr '25

linuxmaniac left a comment (open5gs/open5gs#3074) After some debugging: ``` (gdb) p *((struct dict_application_data *)data) $33 = {application_id = 4, application_name = 0x7fffdc224000 "Diameter Credit Control Application"} (gdb) bt #0 fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffde60, parent=parent@entry=0x0, ref=ref@entry=0x7fffffffdd40) at ./libfdproto/dictionary.c:1519 #1 0x00007fffdc21d23b in dict_dcca_entry (conffile=<optimized out>) at ./extensions/dict_dcca/dict_dcca.c:75 #2 0x00007ffff7282cae in fd_ext_load () from /lib/x86_64-linux-gnu/libfdcore.so.6 #3 0x00007ffff727b27d in fd_core_parseconf () from /lib/x86_64-linux-gnu/libfdcore.so.6 #4 0x00007ffff7e5a8ad in ogs_diam_init (mode=mode@entry=3, conffile=0x55555563b410 "/etc/freeDiameter/smf.conf", fd_config=fd_config@entry=0x5555555df760 <g_diam_conf>) at ../lib/diameter/common/init.c:51 #5 0x00005555555869dc in smf_fd_init () at ../src/smf/fd-path.c:34 #6 0x00005555555624c6 in smf_initialize () at ../src/smf/init.c:78 #7 0x0000555555561fc6 in app_initialize (argv=argv@entry=0x7fffffffe290) at ../src/smf/app.c:26 #8 0x0000555555561e46 in main (argc=<optimized out>, argv=0x7fffffffe498) at ../src/main.c:219 (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 3, fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffdc80, parent=0x5555557edc60, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 1519 { (gdb) bt #0 fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffdc80, parent=0x5555557edc60, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 #1 0x00007ffff7e6323a in ogs_dict_gx_entry (conffile=conffile@entry=0x0) at ../lib/diameter/gx/dict.c:154 #2 0x00007ffff7e64955 in ogs_diam_gx_init () at ../lib/diameter/gx/message.c:97 #3 0x000055555558eb69 in smf_gx_init () at ../src/smf/gx-path.c:1396 #4 0x00005555555869e9 in smf_fd_init () at ../src/smf/fd-path.c:38 #5 0x00005555555624c6 in smf_initialize () at ../src/smf/init.c:78 #6 0x0000555555561fc6 in app_initialize (argv=argv@entry=0x7fffffffe290) at ../src/smf/app.c:26 #7 0x0000555555561e46 in main (argc=<optimized out>, argv=0x7fffffffe498) at ../src/main.c:219 (gdb) p *((struct dict_application_data *)data) $34 = {application_id = 16777238, application_name = 0x7ffff7e67019 "Gx"} (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 1, ogs_dict_gy_entry (conffile=conffile@entry=0x0) at ../lib/diameter/gy/dict.c:147 147 { (gdb) c Continuing. Thread 1 "open5gs-smfd" hit Breakpoint 3, fd_dict_new (dict=0x55555576cb70, type=type@entry=DICT_APPLICATION, data=data@entry=0x7fffffffde80, parent=parent@entry=0x0, ref=ref@entry=0x0) at ./libfdproto/dictionary.c:1519 1519 { (gdb) p *((struct dict_application_data *)data) $35 = {application_id = 4, application_name = 0x7ffff7e4f000 "Gy"} (gdb) [...] 1690 if (ret == EEXIST) { (gdb) 1692 switch (type) { (gdb) 1706 TRACE_DEBUG(FULL, "Application %s already in dictionary", new->data.application.application_name); (gdb) 1708 if (fd_os_cmp(locref->data.application.application_name, locref->datastr_len, (gdb) 1710 TRACE_DEBUG(FULL, "Conflicting application name"); (gdb) 1839 if (ref) (gdb) 1850 CHECK_MALLOC( dict_obj_info[CHECK_TYPE(type) ? type : 0].dump_data(&buf, &len, &offset, data) ); (gdb) 1853 TRACE_DEBUG(INFO, "An error occurred while adding the following data in the dictionary: %s", buf); (gdb) 1855 if (ret == EEXIST) { (gdb) 1856 offset=0; (gdb) 1857 CHECK_MALLOC( dump_object(&buf, &len, &offset, locref, 0, 0, 0) ); (gdb) 1858 TRACE_DEBUG(INFO, "Conflicting entry in the dictionary: %s", buf); (gdb) 1860 free(buf); (gdb) 1863 free(new); (gdb) 1864 return ret; ``` Now it's clear that ``application_id`` 4 is used twice: * https://github.com/freeDiameter/freeDiameter/blob/master/extensions/dict_dc… ``` /* DCCA */ { struct dict_application_data data = { 4, "Diameter Credit Control Application" }; CHECK_dict_new( DICT_APPLICATION, &data, NULL, &dcca); } ``` * https://github.com/open5gs/open5gs/blob/main/lib/diameter/gy/message.c#L89 ``` int ogs_diam_gy_init(void) { application_id_t id = OGS_DIAM_GY_APPLICATION_ID; ogs_assert(ogs_dict_gy_entry(NULL) == 0); ``` defined at: https://github.com/open5gs/open5gs/blob/main/lib/diameter/gy/message.h#L34 ``` /* Gy interface, 3GPP TS 32.299 */ #define OGS_DIAM_GY_APPLICATION_ID 4 ``` -- Reply to this email directly or view it on GitHub: https://github.com/open5gs/open5gs/issues/3074#issuecomment-2796155952 You are receiving this because you commented. Message ID: <open5gs/open5gs/issues/3074/2796155952(a)github.com>

1 0

git:master:92e99afa: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 92e99afa95df80c762ce60f3b9eca7b7936c74b9 URL: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-11T10:01:17+02:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… Patch: https://github.com/kamailio/kamailio/commit/92e99afa95df80c762ce60f3b9eca7b… --- 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] Ims registrar scscf regpv fix (PR #4166)
by Lyubomir Yatanski 11 Apr '25

11 Apr '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, ...) - [ ] 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) - [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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4166 -- Commit Summary -- * ims_registrar_scscf: fix reg_fetch_contacts call * ims_registrar_scscf: fix documentation -- File Changes -- M src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml (6) M src/modules/ims_registrar_scscf/regpv.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4166.patch https://github.com/kamailio/kamailio/pull/4166.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4166 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4166(a)github.com>

3 18

git:master:9caf655c: ims_registrar_scscf: fix reg_fetch_contacts call
by Henning Westerholt 11 Apr '25

11 Apr '25

Module: kamailio Branch: master Commit: 9caf655c51d5a846fa944bb866e3abadeb8b799c URL: https://github.com/kamailio/kamailio/commit/9caf655c51d5a846fa944bb866e3aba… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-11T09:53:57+02:00 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 --- 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/9caf655c51d5a846fa944bb866e3aba… Patch: https://github.com/kamailio/kamailio/commit/9caf655c51d5a846fa944bb866e3aba… --- 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 9ef1da8f2be..236406951c0 100644 --- a/src/modules/ims_registrar_scscf/regpv.c +++ b/src/modules/ims_registrar_scscf/regpv.c @@ -45,6 +45,7 @@ typedef struct _regpv_profile str pname; str domain; str aor; + str impi; int flags; unsigned int aorhash; int nrc; @@ -121,6 +122,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; @@ -245,6 +251,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); @@ -323,6 +332,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; @@ -437,10 +448,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) { @@ -455,8 +474,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

Re: [kamailio/kamailio] ims_registrar_scscf: fix reg_fetch_contacts call (3f942b0)
by Henning Westerholt 11 Apr '25

11 Apr '25

Sorry, to be annoying, but I would prefer to keep here the "-1", as we are not having any memory allocated, and to stay in sync with the main registrar module. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3f942b0d9519fdc0686569ec7e02f65… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3f942b0d9519fdc0686569ec7e02f65feaadab27/155173722(a)github.com>

1 0

git:master:abc0ce47: core: print path in debug before releasing when load module option skips duplicates
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: abc0ce47896f3cd3d5d1ca4def0a79978256d733 URL: https://github.com/kamailio/kamailio/commit/abc0ce47896f3cd3d5d1ca4def0a799… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T19:17:04+02:00 core: print path in debug before releasing when load module option skips duplicates --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/abc0ce47896f3cd3d5d1ca4def0a799… Patch: https://github.com/kamailio/kamailio/commit/abc0ce47896f3cd3d5d1ca4def0a799… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index a2e28acf030..d6d1d117188 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -617,10 +617,12 @@ int ksr_load_module(char *mod_path, char *opts) for(t = modules; t; t = t->next) { if(t->handle == handle) { if(ldopt == 1) { - if(path && path != mod_path) { - pkg_free(path); + if(path) { + LM_DBG("skip loading optional module twice (%s)\n", path); + if(path != mod_path) { + pkg_free(path); + } } - LM_DBG("skip loading optional module twice (%s)\n", path); return 0; } LM_WARN("attempting to load the same module twice (%s)\n", path);

1 0

git:master:7a289357: pv: new transformation {uri.rmparam,name}
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: 7a289357a38ac088ec17ccbcc56d7aff00964d4c URL: https://github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T09:32:28+02:00 pv: new transformation {uri.rmparam,name} - remove the parameter from the uri --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… Patch: https://github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f3432b13eaa..870a644081b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1764,6 +1764,30 @@ int tr_eval_uri( } val->rs = _tr_empty; break; + case TR_URI_RMPARAM: + if(tp == NULL) { + LM_ERR("param invalid parameters\n"); + return -1; + } + if(tp->type == TR_PARAM_STRING) { + sv = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v) != 0 + || (!(v.flags & PV_VAL_STR)) || v.rs.len <= 0) { + LM_ERR("param cannot get p1\n"); + return -1; + } + sv = v.rs; + } + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.len = TR_BUFFER_SIZE; + val->flags = PV_VAL_STR; + val->ri = 0; + if(ksr_uri_remove_param(&_tr_uri, &sv, &val->rs) < 0) { + val->rs = _tr_empty; + } + break; case TR_URI_HEADERS: val->rs = (_tr_parsed_uri.headers.s) ? _tr_parsed_uri.headers : _tr_empty; @@ -3371,6 +3395,23 @@ char *tr_parse_uri(str *in, trans_t *t) goto error; } goto done; + } else if(name.len == 7 && strncasecmp(name.s, "rmparam", 7) == 0) { + t->subtype = TR_URI_RMPARAM; + if(*p != TR_PARAM_MARKER) { + LM_ERR("invalid param transformation: %.*s\n", in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p == ' ' || *p == '\t' || *p == '\n')) + p++; + if(*p != TR_RBRACKET) { + LM_ERR("invalid param transformation: %.*s!\n", in->len, in->s); + goto error; + } + goto done; } else if(name.len == 9 && strncasecmp(name.s, "transport", 9) == 0) { t->subtype = TR_URI_TRANSPORT; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 7db512f0949..ff7979b5163 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -128,7 +128,8 @@ enum _tr_uri_subtype TR_URI_TOSOCKET, TR_URI_SAOR, TR_URI_DURI, - TR_URI_SURI + TR_URI_SURI, + TR_URI_RMPARAM }; enum _tr_param_subtype {

1 0

git:master:bfe69eda: core: helper function to remove param from uri
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: bfe69eda32ee23ebd532f673f76d335ff51f13cd URL: https://github.com/kamailio/kamailio/commit/bfe69eda32ee23ebd532f673f76d335… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T08:56:37+02:00 core: helper function to remove param from uri --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/bfe69eda32ee23ebd532f673f76d335… Patch: https://github.com/kamailio/kamailio/commit/bfe69eda32ee23ebd532f673f76d335… --- diff --git a/src/core/dset.c b/src/core/dset.c index e30277eb7ea..d449f33e325 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -33,6 +33,7 @@ #include "config.h" #include "parser/parser_f.h" #include "parser/parse_uri.h" +#include "parser/parse_param.h" #include "parser/msg_parser.h" #include "globals.h" #include "ut.h" @@ -1317,6 +1318,85 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) return -1; } +/** + * remove param from ouri, storing in nuri + * - nuri->len has to be set to the size of nuri->s buffer + */ +int ksr_uri_remove_param(str *ouri, str *pname, str *nuri) +{ + str t; + str pstart; + sip_uri_t puri; + param_hooks_t hooks; + param_t *params, *pit; + + if(nuri->len < ouri->len + 1) { + LM_ERR("output buffer too small (%d / %d)\n", nuri->len, ouri->len); + return -1; + } + if(parse_uri(ouri->s, ouri->len, &puri) < 0) { + LM_ERR("failed to parse uri [%.*s]\n", ouri->len, ouri->s); + return -1; + } + if(puri.sip_params.len > 0) { + t = puri.sip_params; + } else if(puri.params.len > 0) { + t = puri.params; + } else { + LM_DBG("no uri params [%.*s]\n", ouri->len, ouri->s); + memcpy(nuri->s, ouri->s, ouri->len); + nuri->len = ouri->len; + nuri->s[nuri->len] = 0; + return 0; + } + + if(parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { + LM_ERR("ruri parameter parsing failed\n"); + return -1; + } + + for(pit = params; pit; pit = pit->next) { + if((pit->name.len == pname->len) + && (strncasecmp(pit->name.s, pname->s, pname->len) == 0)) { + break; + } + } + if(pit == NULL) { + LM_DBG("uri param [%.*s] not found\n", pname->len, pname->s); + free_params(params); + memcpy(nuri->s, ouri->s, ouri->len); + nuri->len = ouri->len; + nuri->s[nuri->len] = 0; + return 0; + } + + pstart.s = pit->name.s; + while(pstart.s > ouri->s && *pstart.s != ';') { + pstart.s--; + } + memcpy(nuri->s, ouri->s, pstart.s - ouri->s); + nuri->len = pstart.s - ouri->s; + + if(pit->body.len > 0) { + if(pit->body.s + pit->body.len < ouri->s + ouri->len) { + memcpy(nuri->s + nuri->len, pit->body.s + pit->body.len, + ouri->s + ouri->len - pit->body.s - pit->body.len); + nuri->len += ouri->s + ouri->len - pit->body.s - pit->body.len; + } + } else { + if(pit->name.s + pit->name.len < ouri->s + ouri->len) { + memcpy(nuri->s + nuri->len, pit->name.s + pit->name.len, + ouri->s + ouri->len - pit->name.s - pit->name.len); + nuri->len += ouri->s + ouri->len - pit->name.s - pit->name.len; + } + } + nuri->s[nuri->len] = 0; + + free_params(params); + + return 0; +} + /* address of record (aor) management */ /* address of record considered case sensitive diff --git a/src/core/dset.h b/src/core/dset.h index d735f49d9f4..a46639a1adb 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -291,6 +291,7 @@ int uri_restore_rcv_alias(str *uri, str *nuri, str *suri); int uri_trim_rcv_alias(str *uri, str *nuri); int ksr_uri_alias_encode(str *iuri, str *ualias); int ksr_uri_alias_decode(str *ualias, str *ouri); +int ksr_uri_remove_param(str *ouri, str *pname, str *nuri); int init_dst_set(void);

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

- URL: https://github.com/kamailio/kamailio/commit/ae3734307499c5ca48089dc060dba84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:02:04+02:00 stun: check message len for response (cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af) (cherry picked from commit e11c132cbf57ea1ae6289e734f601104ba83fc25) - URL: https://github.com/kamailio/kamailio/commit/6cd797906c82927037e5a89a638c315… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:03:38+02:00 core: init res inside select_cfg_var() (cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc) (cherry picked from commit 92a3cc4549073d70b1b229149b29017e3a9cf06f) - URL: https://github.com/kamailio/kamailio/commit/8eee8bcf1ba579d012a0f583525ec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:05:41+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() (cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f) (cherry picked from commit d69e65fa4e9448701729ac8f41b069dad294a51e) - URL: https://github.com/kamailio/kamailio/commit/6e1940120cee766a7d90ae0b581e9d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:07:59+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() (cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0) (cherry picked from commit 4732a4a88df9f4cbd2260564b94269157b3c0647) - URL: https://github.com/kamailio/kamailio/commit/f32863addeb3a927b80db65c56a258b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:08:06+02:00 tls: check lenght when parsing pv alt name (cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4) (cherry picked from commit dd4d5e44a60a658772e8288d94193596f7a982a7) - URL: https://github.com/kamailio/kamailio/commit/d7766ffceb98fbc0ceaf58d2f271cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:08:51+02:00 utils: jump to error on pkg allocation failure (cherry picked from commit 34749ab13b31504358761c964f794b283931394c) (cherry picked from commit e016d1ada08edca0adacd42ffa67ffd3c8c2c384) - URL: https://github.com/kamailio/kamailio/commit/61e3e21f42d4b18c69ad9b1c2378dab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:18+02:00 erlang: init xavps for safety destroy on error (cherry picked from commit 29510872607deb3238411b358c422d004fb307b7) (cherry picked from commit f57accd1820b26b40f14d420465402188cb13df1) - URL: https://github.com/kamailio/kamailio/commit/1d561bc70e30cae3ba94aacd51c33e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:28+02:00 jsonrpcc: free allocated pkg buffer on error (cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533) (cherry picked from commit c447bf60d528d8fdc1f5aee52a796ed5f77b2f5a) - URL: https://github.com/kamailio/kamailio/commit/a71d34d64b6539592b8d7532abc3714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:37+02:00 jsonrpcc: declare variables are the beginning of function (cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7) (cherry picked from commit 5baf49a179194ba0eaa5e7f4caba613c72859b0c) - URL: https://github.com/kamailio/kamailio/commit/f75b968d428f23241bde329622f1e2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:52+02:00 core: cfg select - check res before initializing (cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471) (cherry picked from commit 61eb4fe44e66a952ba14e39e1c664878ef52919d) - URL: https://github.com/kamailio/kamailio/commit/17fe6cc64140e2d302e678a34534804… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:10:30+02:00 janssonrpcc: free new servers list on error (cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f) (cherry picked from commit f8201e6d4848081a2dd564e0d5b216fca47ef3f0) - URL: https://github.com/kamailio/kamailio/commit/06a86869b9157783bdd185aa3b43e35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:10:52+02:00 core: cfg select - check res when getting the variable (cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b) (cherry picked from commit dfc2531cf7db70e315613b3242d1b5b41ac20857) - URL: https://github.com/kamailio/kamailio/commit/9a8f9f13c4b98c14bc260680dae15e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:12:13+02:00 db_berkeley: buffer size set to the argument of strftime() (cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b) (cherry picked from commit 1eb7db2f18724b91d18c6b30b529b51117d176b0) - URL: https://github.com/kamailio/kamailio/commit/bfc6a9c0e5cad418ca892d33709636b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:12:49+02:00 core: tcp - use long long constants for operations (cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52) (cherry picked from commit bc8ea1022718c94fbdf9bb93c35759e1a6ce3cde) - URL: https://github.com/kamailio/kamailio/commit/dc009570a7d79de99ce0156c8a163c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:15:52+02:00 corex: small formatting of iflag list (cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce) (cherry picked from commit e14522cab01eba9c5fa636a7c0f6ed40200c6871) - URL: https://github.com/kamailio/kamailio/commit/5a5fbdf6d5bb8ea3cc15063bdf66cd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:16:05+02:00 corex: proper check for iflag lookup return code (cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3) (cherry picked from commit d102f40856512d2c51707bf5ec5a6c949c550890) - URL: https://github.com/kamailio/kamailio/commit/0f56bad610ee3397ce82fcc10626651… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:16:13+02:00 corex: switch to unsigned long long for iflag lookup (cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4) (cherry picked from commit a024fb3c028b8df18a9b855fff99bcddc3a61ef2) - URL: https://github.com/kamailio/kamailio/commit/e65cf6e5393c5dd430a7e5e421f566c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:18:15+02:00 auth_xkey: use memcpy() instead of strncpy() (cherry picked from commit 29686758e1ce51abb8d8dd5bebb0d7fa1a019dc6) (cherry picked from commit 6c88ef7c6abc45f72571aaa713f1d0dfb2d626e6) - URL: https://github.com/kamailio/kamailio/commit/aceb2a89ed79c4bc28b21d70eedfe85… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Date: 2025-04-09T10:19:32+02:00 topos_redis : show redis error for post mortem analysis (cherry picked from commit 72889e945041b6475a43c371aa4e20e99f5d1240) (cherry picked from commit 8331cb1f87b31f66f87a90e7fbaa2553ea3f2728) - URL: https://github.com/kamailio/kamailio/commit/8b830220984d2604c1a89ce3ae7bfa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:12+02:00 core: parser sdp - check for length of sendrecv attribute (cherry picked from commit fc4817064f81ef9a82b1b1468b1b8a4ae352c1f2) (cherry picked from commit 0ba1666fec15ed292e7fe1764bfa985ef282d84e) - URL: https://github.com/kamailio/kamailio/commit/1413ce8512d8a0c00c39243fe1d9d9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:20+02:00 core: parse sdp - check for body limit on mixed content (cherry picked from commit d4bbde619bbf808edebb31e131b3783ba2a4b34d) (cherry picked from commit eb058dba967bb772c8413356163ec6c13533ab6b) - URL: https://github.com/kamailio/kamailio/commit/778ee6deab8376a61e5ec6aff205367… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:31+02:00 core: parser sdp - check field length when extracting the value (cherry picked from commit e802f9187383feb7fdd96c4ded44fda403da4535) (cherry picked from commit e650ace5948c76ea2d8eb7eaeebb5c349970447d) - URL: https://github.com/kamailio/kamailio/commit/bec9f1cc738f35d7a74556bf5a89188… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:52+02:00 core: parser sdp - check if body is enough for rtpmap (cherry picked from commit c7f89e81504c425a83f3423bc4b4d9d1a8a48909) (cherry picked from commit a688b24ac777cb93306a1a777e687de625d6e4d0) - URL: https://github.com/kamailio/kamailio/commit/3a5db8000dcea0a16c491ee54eb3532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:23:29+02:00 core: parser sdp - check length for rtpmap extract (cherry picked from commit c823f41350ab9186a323707e9be32e31922bec17) (cherry picked from commit 0408c2cb412f0df0a17b70aa4d15026a9ef3a9a7) - URL: https://github.com/kamailio/kamailio/commit/ad292d121d0fe41a712385b5f28c83e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:24:07+02:00 core: parser sdp - check len gor extracting fmtp (cherry picked from commit d10257fbfdbb3e3e73c0fe60a224585822bdd7b3) (cherry picked from commit 18dad74a091e693a0bf939dddf144348409e6402) - URL: https://github.com/kamailio/kamailio/commit/1cddf420cbd557a1c756105eb2bf933… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:24:34+02:00 core: parser sdp - check body end for extract_ice_option() (cherry picked from commit 79d7fae0f26f577356f017cfff5e00c348cf259c) (cherry picked from commit 351157cad257986a014dc659231ae0ee48a8d538) - URL: https://github.com/kamailio/kamailio/commit/601e86bcd5f95138a9ad03de2db7faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:29:08+02:00 corez: set sndinfo attributes for corex_sip_reply_out() (cherry picked from commit b003a7184a02da5fd6dfe27def8d928d363e36ce) (cherry picked from commit b512a9e809a658dc9ac731a359afce8fa8acd049) - URL: https://github.com/kamailio/kamailio/commit/641541066953e8b52a4e433c01c8d62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:30:52+02:00 xlog: use crit level with prefix for kemi xcrit() and xlog() - GH #4048 (cherry picked from commit a493e2e0006f89d2f8b5e903134407109ef587da) (cherry picked from commit 98f20996606a200f025dd78f96fbb50cd426f756) - URL: https://github.com/kamailio/kamailio/commit/458abc7692f2f700735af6c37856da9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:31:02+02:00 xlog: evaluate prefix for kemi functions (cherry picked from commit 76e18d0d13a41e93094f9084ac44e0809f91b109) (cherry picked from commit 68e3447e04c06059d47e1f001ae0b34e7f88b2f5) - URL: https://github.com/kamailio/kamailio/commit/b01dcd5b4d48b36aa2c3fe4e46a43df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:33:21+02:00 sanity: log as debug when Content-Length is missing for datagram protocols - the header is optional for datagram protocols (RFC3261, 20.14) (cherry picked from commit e38c7f8bac1aef9890d266fa466cea1561346732) (cherry picked from commit 50e69e9a269e5d5dba0251f893abc34907a12970) - URL: https://github.com/kamailio/kamailio/commit/b85e5fb31813cbbcae350262e52394b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:34:35+02:00 core: parser/sdp - check if still before end of the value (cherry picked from commit b96bc11a54f11ec688429c057bf5a90c40c147b3) (cherry picked from commit 76ffc6d3d4053bc43b81c3363e837c10360b0089) - URL: https://github.com/kamailio/kamailio/commit/63fd213aab064df3ec669047ee3b0ab… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-04-09T10:36:54+02:00 janssonrpcc: fixed warning var may be used uninitialized (cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb) (cherry picked from commit ddd98b09c80dc0d15af080e37961b59ecde17689) (cherry picked from commit f4aed91f5ab78cddbe782e94306c3cf4c49b09c6) - URL: https://github.com/kamailio/kamailio/commit/aa81e83c5fa7b916148c274be9cb0c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:37:09+02:00 msrp: variable for extra headers used in local replies (cherry picked from commit 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d) (cherry picked from commit c29d9d661b3954906cdee7e98a4f9b6502673490) (cherry picked from commit 724a58813d50dcfe965e69914fbdc93291811a85) - URL: https://github.com/kamailio/kamailio/commit/e5c2f3ff4eded8f6d9537fdc6e2ccff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:37:25+02:00 msrp: send failure response after referening the buffer (cherry picked from commit 5f8adb625b6bae81ef44613d774106bf3a943bb0) (cherry picked from commit 4ff58bb3e02b76e2489144867c8b0dc5041dc621) (cherry picked from commit 0f8b36091a64de012377bd2460e299529886a45c) - URL: https://github.com/kamailio/kamailio/commit/3c3c7107980fa23c892e5fe85b524d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:24+02:00 core: pass fd - check for unexpected read size overflow (cherry picked from commit 6c12477f1dad2279431d703d1a4f63fcfc6543b8) (cherry picked from commit ac0a4a5052e9aaf6531130675c8140fdd5c11e97) (cherry picked from commit 42260f34079ddad7662742a64696d2550ee1cce9) - URL: https://github.com/kamailio/kamailio/commit/7876e1ec4785d0199f817cf3cc59c8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:36+02:00 core: check for unexpected long value return by pathconf() (cherry picked from commit 2ba6d4ff2727031e7bca5d3d1da016bfe508b8df) (cherry picked from commit 718692c6d402b6942e0b1e8ebd8e64b306813495) (cherry picked from commit f123ebae553624525ca04d34ddd4c9453eac855a) - URL: https://github.com/kamailio/kamailio/commit/dffd625bf7953d7314287fe67b17c8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:45+02:00 ctl: free rpc struct in case of error (cherry picked from commit 4a71d3c9e6a4f92ef33ce8e62372b2c4dba62a56) (cherry picked from commit 5024235f876df4b3239ef746de700ade362cc7b2) (cherry picked from commit 5e836af2ff198481bde0485a315bbfdf39043f9d) - URL: https://github.com/kamailio/kamailio/commit/c51cc44b7380847d7d1bc04bb6a0d1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:57+02:00 xmlrpc: clean allocated buffer (cherry picked from commit ff712539566c903312ebba2f8e2585f9c80ffdcf) (cherry picked from commit e1398e53e9825db6c20590e1576d960ac0c3c429) (cherry picked from commit 1f6dc4df8572c07280478858087182f273c25fe3) - URL: https://github.com/kamailio/kamailio/commit/6b4fb8ddea8d4674a9e74c261cf5c16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:13+02:00 ctl: fifo - clean intermediary buffer (cherry picked from commit 4c4d7f7967a99d4dd4acdc5e198bce493bf15d67) (cherry picked from commit c68522f5c3c59cb915feb873bd3351e57a8db579) (cherry picked from commit 90122e3a46169e9f10dc7d8e01638d5f89cfaae5) - URL: https://github.com/kamailio/kamailio/commit/c827311923457119d15b2a375e2e454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:35+02:00 pv: free next field on error when parsing xav* names (cherry picked from commit b875e7368dcc8e221007caafa3599c3e354404f7) (cherry picked from commit 8b7637140c5362bf90046ccb3b34ea74ef658c0a) (cherry picked from commit ce55c093d490fd19f10c50e11d12e188b64c1686) - URL: https://github.com/kamailio/kamailio/commit/84035480eaf6d8624faa0859f2ec8bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:50+02:00 xmlrpc: removed unnecessary code (cherry picked from commit e65b03cdd946d735a3ef33ae3582bcfad464d2c7) (cherry picked from commit 6d06293f3fe1c5897a3e01272fdc9ac409925f3d) (cherry picked from commit eaa0d1af8a46fe9a74d0eb1bbb2fbf2089f4e3fb) - URL: https://github.com/kamailio/kamailio/commit/efec4195cb2905434a7674c7886a52b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:40:03+02:00 ctl: refactored error handling and removed unnecessary code (cherry picked from commit edbb5b11e9453be3519e6e9a945937307c95709e) (cherry picked from commit 691eb2600c1fcf24d0d1f9b2648e7257499537a8) (cherry picked from commit 83a4165fc62710027ddf006058c66f082d01b51f) - URL: https://github.com/kamailio/kamailio/commit/0fc84abd5710ff982d4867ea36560f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:40:33+02:00 http_client: free dumplicated name in case of errors (cherry picked from commit 39ba53a2499dd1f0e080bb011d7438a60ea5faec) (cherry picked from commit 7274e353d7c05f5387c64aaf90197c9a8e8d1dd4) (cherry picked from commit 99852d486bd4180c4f571864bfccda526f3e259d) - URL: https://github.com/kamailio/kamailio/commit/42d33d7526fc64c34dce0d51a72f474… Author: Alessio Garzi <agarzi(a)sipwise.com> Date: 2025-04-09T10:41:56+02:00 fix typo on sanity checks module (cherry picked from commit 3b48fff143b49f16b328475a7b26017209e98666) (cherry picked from commit ecb00946bf684b4c8405d71fe9306d35aba21359) (cherry picked from commit 52772bf03ad07758e92eea4a71d22f5df8e976f4) - URL: https://github.com/kamailio/kamailio/commit/ee8c50f6033eeb1c3035ac3e1aa72e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:42:16+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) (cherry picked from commit 0b48c889623a19ed223c252ada049cabebee45f2) (cherry picked from commit 7335ac5b8d174a14a4481215cc787e7cb5cd4542) - URL: https://github.com/kamailio/kamailio/commit/1796009f5ebf77c32014a669a21c1d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:42:26+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) (cherry picked from commit d3d62bde97a86faa7dd1189bf10b697f28d84a63) (cherry picked from commit 44cb112ea155eccf2788400b65f85e8b1c77f589)

1 0

git:5.8:9e4f2cc0: tm: debug message instead of error log
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 9e4f2cc054d04de2aaeceadac5ab876bb94911ff URL: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:42:34+02:00 tm: debug message instead of error log (cherry picked from commit d5cbcfad6e4227b198c90a57ed9a9d7883e7d911) (cherry picked from commit 91cc4a6af20911e96ccc8d88edd1c43c636b3ee2) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… Patch: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 371988c4412..9253ef32391 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -548,9 +548,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" - " buf: %.*s ...]\n", - code, trans->flags, (len > 128) ? 128 : len, buf); + if(unlikely(is_local(trans))) { + LM_DBG("local transaction reply [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } else { + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:5.8:9f92a974: tm: mode details in log message
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 9f92a97457b13d2a3ce27b86e59b2687371c8b26 URL: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:42:27+02:00 tm: mode details in log message (cherry picked from commit 9788fe9d2241fb85e6d78578689d6694161bc5a1) (cherry picked from commit bc5e32c9ba1a4da6cd9dd85098f3576d2c0dc4bc) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… Patch: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index a6c7579cdbf..371988c4412 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -548,7 +548,9 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 128) ? 128 : len, buf); } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:5.8:44cb112e: parser/sdp: check if value is exceeded when looking for o= version field
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 44cb112ea155eccf2788400b65f85e8b1c77f589 URL: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:40:16+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) (cherry picked from commit d3d62bde97a86faa7dd1189bf10b697f28d84a63) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… Patch: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 26a975a96eb..a22e64cb1e6 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,7 +735,12 @@ int extract_sess_version(str *oline, str *sess_version) } i++; - } while(len < oline->len && i < 3); + } while((cp < oline->s + oline->len) && i < 3); + + if(cp >= oline->s + oline->len) { + LM_ERR("broken o= line - version field not found\n"); + return -1; + } len = cp - cp0 - 1; LM_DBG("end %d: >%.*s<\n", len, len, cp0);

1 0

git:5.8:7335ac5b: core: allow route(...) usage inside onsend_route block
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 7335ac5b8d174a14a4481215cc787e7cb5cd4542 URL: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:39:39+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) (cherry picked from commit 0b48c889623a19ed223c252ada049cabebee45f2) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… Patch: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 21a6bcf83c2..d7274e944d4 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2856,6 +2856,7 @@ fcmd: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case ROUTE_T: case SET_FWD_NO_CONNECT_T: case SET_RPL_NO_CONNECT_T: case SET_FWD_CLOSE_T:

1 0

git:6.0:91cc4a6a: tm: debug message instead of error log
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 91cc4a6af20911e96ccc8d88edd1c43c636b3ee2 URL: https://github.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:32:37+02:00 tm: debug message instead of error log (cherry picked from commit d5cbcfad6e4227b198c90a57ed9a9d7883e7d911) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… Patch: https://github.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c9b3ebab40a..fba235fcbfd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,9 +550,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" - " buf: %.*s ...]\n", - code, trans->flags, (len > 128) ? 128 : len, buf); + if(unlikely(is_local(trans))) { + LM_DBG("local transaction reply [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } else { + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:6.0:bc5e32c9: tm: mode details in log message
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: bc5e32c9ba1a4da6cd9dd85098f3576d2c0dc4bc URL: https://github.com/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:32:05+02:00 tm: mode details in log message (cherry picked from commit 9788fe9d2241fb85e6d78578689d6694161bc5a1) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… Patch: https://github.com/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index aa899f9acc0..c9b3ebab40a 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,7 +550,9 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 128) ? 128 : len, buf); } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:6.0:d3d62bde: parser/sdp: check if value is exceeded when looking for o= version field
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: d3d62bde97a86faa7dd1189bf10b697f28d84a63 URL: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:28:14+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… Patch: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 893ef0e58a4..5e9b3f121ab 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,7 +735,12 @@ int extract_sess_version(str *oline, str *sess_version) } i++; - } while(len < oline->len && i < 3); + } while((cp < oline->s + oline->len) && i < 3); + + if(cp >= oline->s + oline->len) { + LM_ERR("broken o= line - version field not found\n"); + return -1; + } len = cp - cp0 - 1; LM_DBG("end %d: >%.*s<\n", len, len, cp0);

1 0

git:6.0:0b48c889: core: allow route(...) usage inside onsend_route block
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 0b48c889623a19ed223c252ada049cabebee45f2 URL: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:26:56+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… Patch: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index d2a6d28a192..a5bb2004dd0 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2886,6 +2886,7 @@ fcmd: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case ROUTE_T: case SET_FWD_NO_CONNECT_T: case SET_RPL_NO_CONNECT_T: case SET_FWD_CLOSE_T:

1 0

git:6.0:70a26690: uid_domain: rename internal is_local() to avoid duplicates
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 70a26690c00c18086dad440abe64268e7270802b URL: https://github.com/kamailio/kamailio/commit/70a26690c00c18086dad440abe64268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:24:27+02:00 uid_domain: rename internal is_local() to avoid duplicates (cherry picked from commit 7cc9a1979a2594f4b19d6750cffb2795b3274ede) --- Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70a26690c00c18086dad440abe64268… Patch: https://github.com/kamailio/kamailio/commit/70a26690c00c18086dad440abe64268… --- diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index e140e003d95..57a2c7d0c63 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -51,7 +51,7 @@ static int mod_init(void); static void destroy(void); static int child_init(int rank); -static int is_local(struct sip_msg *msg, char *s1, char *s2); +static int uid_domain_is_local(struct sip_msg *msg, char *s1, char *s2); static int lookup_domain(struct sip_msg *msg, char *s1, char *s2); static int get_did(str *did, str *domain); @@ -122,8 +122,10 @@ static domain_t dom_buf[2]; * Exported functions */ static cmd_export_t cmds[] = { - {"is_local", is_local, 1, fixup_var_str_1, fixup_free_fparam_1, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, lookup_domain_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, + {"is_local", uid_domain_is_local, 1, fixup_var_str_1, fixup_free_fparam_1, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, + lookup_domain_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -384,7 +386,7 @@ static void destroy(void) /* * Check if domain is local */ -static int is_local(struct sip_msg *msg, char *fp, char *s2) +static int uid_domain_is_local(struct sip_msg *msg, char *fp, char *s2) { str domain;

1 0

git:6.0:202e8bd3: sipt: KEMI support
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 202e8bd38692ec8ed97c218fd0517d9655dcb7df URL: https://github.com/kamailio/kamailio/commit/202e8bd38692ec8ed97c218fd0517d9… Author: Boris Korzun <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:19:28+02:00 sipt: KEMI support - GH #3264 (cherry picked from commit 522fa2fabe1d4ec8fe53a25b2af95cbf8031cbad) --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/202e8bd38692ec8ed97c218fd0517d9… Patch: https://github.com/kamailio/kamailio/commit/202e8bd38692ec8ed97c218fd0517d9…

1 0

git:master:d5cbcfad: tm: debug message instead of error log
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: master Commit: d5cbcfad6e4227b198c90a57ed9a9d7883e7d911 URL: https://github.com/kamailio/kamailio/commit/d5cbcfad6e4227b198c90a57ed9a9d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T08:28:22+02:00 tm: debug message instead of error log --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/d5cbcfad6e4227b198c90a57ed9a9d7… Patch: https://github.com/kamailio/kamailio/commit/d5cbcfad6e4227b198c90a57ed9a9d7… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index dea8c10e2ea..0299ea2dc7b 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,9 +550,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" - " buf: %.*s ...]\n", - code, trans->flags, (len > 128) ? 128 : len, buf); + if(unlikely(is_local(trans))) { + LM_DBG("local transaction reply [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } else { + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:5.8:8bfde421: dlgs: fix dlgs_rpc_briefing
by Federico Cabiddu 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 8bfde421ec8377434d2e508e17af9bdc42117e77 URL: https://github.com/kamailio/kamailio/commit/8bfde421ec8377434d2e508e17af9bd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2025-04-09T08:01:12+02:00 dlgs: fix dlgs_rpc_briefing (cherry picked from commit b856d90b1e63308f23c4510edecc1159d41bfa4e) --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/8bfde421ec8377434d2e508e17af9bd… Patch: https://github.com/kamailio/kamailio/commit/8bfde421ec8377434d2e508e17af9bd… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index f1ba134c411..f6cad29856e 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -1149,7 +1149,7 @@ static void dlgs_rpc_briefing(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "dSSSuu", "count", ++n, "src", &it->src, + if(rpc->struct_add(th, "dSSSu", "count", ++n, "src", &it->src, "dst", &it->dst, "callid", &it->callid, "state", it->state) < 0) {

1 0

git:6.0:a0c724ff: dlgs: fix dlgs_rpc_briefing
by Federico Cabiddu 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: a0c724ff720d71fd9e6c5d5988c3cd59e76bc8ab URL: https://github.com/kamailio/kamailio/commit/a0c724ff720d71fd9e6c5d5988c3cd5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2025-04-09T08:00:30+02:00 dlgs: fix dlgs_rpc_briefing (cherry picked from commit b856d90b1e63308f23c4510edecc1159d41bfa4e) --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/a0c724ff720d71fd9e6c5d5988c3cd5… Patch: https://github.com/kamailio/kamailio/commit/a0c724ff720d71fd9e6c5d5988c3cd5… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index f1ba134c411..f6cad29856e 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -1149,7 +1149,7 @@ static void dlgs_rpc_briefing(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "dSSSuu", "count", ++n, "src", &it->src, + if(rpc->struct_add(th, "dSSSu", "count", ++n, "src", &it->src, "dst", &it->dst, "callid", &it->callid, "state", it->state) < 0) {

1 0

git:master:b856d90b: dlgs: fix dlgs_rpc_briefing
by Federico Cabiddu 09 Apr '25

09 Apr '25

Module: kamailio Branch: master Commit: b856d90b1e63308f23c4510edecc1159d41bfa4e URL: https://github.com/kamailio/kamailio/commit/b856d90b1e63308f23c4510edecc115… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2025-04-09T07:45:35+02:00 dlgs: fix dlgs_rpc_briefing --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/b856d90b1e63308f23c4510edecc115… Patch: https://github.com/kamailio/kamailio/commit/b856d90b1e63308f23c4510edecc115… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index f1ba134c411..f6cad29856e 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -1149,7 +1149,7 @@ static void dlgs_rpc_briefing(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "dSSSuu", "count", ++n, "src", &it->src, + if(rpc->struct_add(th, "dSSSu", "count", ++n, "src", &it->src, "dst", &it->dst, "callid", &it->callid, "state", it->state) < 0) {

1 0

git:master:9788fe9d: tm: mode details in log message
by Daniel-Constantin Mierla 08 Apr '25

08 Apr '25

Module: kamailio Branch: master Commit: 9788fe9d2241fb85e6d78578689d6694161bc5a1 URL: https://github.com/kamailio/kamailio/commit/9788fe9d2241fb85e6d78578689d669… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-08T17:33:53+02:00 tm: mode details in log message --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9788fe9d2241fb85e6d78578689d669… Patch: https://github.com/kamailio/kamailio/commit/9788fe9d2241fb85e6d78578689d669… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 7f3e70ae7cb..dea8c10e2ea 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,7 +550,9 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 128) ? 128 : len, buf); } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

[kamailio/kamailio] docs discrepancies for modules (in 6.0.x) (Issue #4201)
by Paul Donald 08 Apr '25

08 Apr '25

systemcrash created an issue (kamailio/kamailio#4201) https://github.com/kamailio/kamailio/blob/330543f46cbb6bf815ebf77c983783140… This smells of a dependency. Shouldn't these be listed here?: https://www.kamailio.org/docs/modules/6.0.x/modules/cdp.html#idm68 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4201 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4201(a)github.com>

2 4

[kamailio/kamailio] cmake_format all files (PR #4192)
by Xenofon Karamanos 08 Apr '25

08 Apr '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4192 -- Commit Summary -- * cmake: Alter some of cmake-format options * cmake: Fix formatting according to cmake-format config file. -- File Changes -- M CMakeLists.txt (18) M cmake/BuildType.cmake (8) M cmake/cmake-format.py (4) M cmake/compiler-specific.cmake (24) M cmake/defs.cmake (29) M cmake/groups.cmake (45) M cmake/modules-docs.cmake (94) M cmake/modules/FindBerkeleyDB.cmake (60) M cmake/modules/FindErlang.cmake (52) M cmake/modules/FindLdap.cmake (32) M cmake/modules/FindLibev.cmake (4) M cmake/modules/FindLibfreeradiusClient.cmake (21) M cmake/modules/FindMariaDBClient.cmake (3) M cmake/modules/FindMySQL.cmake (114) M cmake/modules/FindNETSNMP.cmake (15) M cmake/modules/FindOracle.cmake (11) M cmake/modules/FindRadius.cmake (6) M cmake/os-specific/darwin.cmake (38) M cmake/os-specific/dragonfly.cmake (9) M cmake/os-specific/freebsd.cmake (3) M cmake/os-specific/linux.cmake (9) M src/CMakeLists.txt (44) M src/core/CMakeLists.txt (16) M src/modules/CMakeLists.txt (55) M src/modules/app_perl/CMakeLists.txt (17) M src/modules/auth_radius/CMakeLists.txt (7) M src/modules/db2_ldap/CMakeLists.txt (3) M src/modules/db_berkeley/CMakeLists.txt (3) M src/modules/dnssec/CMakeLists.txt (5) M src/modules/kazoo/CMakeLists.txt (3) M src/modules/nghttp2/CMakeLists.txt (5) M src/modules/nsq/CMakeLists.txt (5) M src/modules/phonenum/CMakeLists.txt (16) M src/modules/ruxc/CMakeLists.txt (3) M src/modules/sctp/CMakeLists.txt (6) M src/modules/secsipid_proc/CMakeLists.txt (3) M src/modules/snmpstats/CMakeLists.txt (3) M src/modules/tls/CMakeLists.txt (29) M src/modules/tlsa/CMakeLists.txt (11) M src/modules/xhttp_pi/CMakeLists.txt (7) M utils/CMakeLists.txt (6) M utils/db_berkeley/CMakeLists.txt (3) M utils/kamcmd/CMakeLists.txt (26) M utils/kamctl/CMakeLists.txt (161) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4192.patch https://github.com/kamailio/kamailio/pull/4192.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4192 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4192(a)github.com>

3 18

git:master:7c58b8a7: cmake: Fix formatting according to cmake-format config file.
by Victor Seva 08 Apr '25

08 Apr '25

Module: kamailio Branch: master Commit: 7c58b8a7fca0a72b360669ba297e0902cceeb4b0 URL: https://github.com/kamailio/kamailio/commit/7c58b8a7fca0a72b360669ba297e090… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-08T14:37:55+02:00 cmake: Fix formatting according to cmake-format config file. --- Modified: CMakeLists.txt Modified: cmake/BuildType.cmake Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake Modified: cmake/groups.cmake Modified: cmake/modules-docs.cmake Modified: cmake/modules/FindBerkeleyDB.cmake Modified: cmake/modules/FindErlang.cmake Modified: cmake/modules/FindLdap.cmake Modified: cmake/modules/FindLibev.cmake Modified: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindMariaDBClient.cmake Modified: cmake/modules/FindMySQL.cmake Modified: cmake/modules/FindNETSNMP.cmake Modified: cmake/modules/FindOracle.cmake Modified: cmake/modules/FindRadius.cmake Modified: cmake/os-specific/darwin.cmake Modified: cmake/os-specific/dragonfly.cmake Modified: cmake/os-specific/freebsd.cmake Modified: cmake/os-specific/linux.cmake Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/modules/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/dnssec/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/nghttp2/CMakeLists.txt Modified: src/modules/nsq/CMakeLists.txt Modified: src/modules/phonenum/CMakeLists.txt Modified: src/modules/ruxc/CMakeLists.txt Modified: src/modules/sctp/CMakeLists.txt Modified: src/modules/secsipid_proc/CMakeLists.txt Modified: src/modules/snmpstats/CMakeLists.txt Modified: src/modules/tls/CMakeLists.txt Modified: src/modules/tlsa/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt Modified: utils/CMakeLists.txt Modified: utils/db_berkeley/CMakeLists.txt Modified: utils/kamcmd/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/7c58b8a7fca0a72b360669ba297e090… Patch: https://github.com/kamailio/kamailio/commit/7c58b8a7fca0a72b360669ba297e090…

1 0

git:master:b102e3f3: cmake: Alter some of cmake-format options
by Victor Seva 08 Apr '25

08 Apr '25

Module: kamailio Branch: master Commit: b102e3f38a554f65a55424a728821d68cc386015 URL: https://github.com/kamailio/kamailio/commit/b102e3f38a554f65a55424a728821d6… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-08T14:37:55+02:00 cmake: Alter some of cmake-format options --- Modified: cmake/cmake-format.py --- Diff: https://github.com/kamailio/kamailio/commit/b102e3f38a554f65a55424a728821d6… Patch: https://github.com/kamailio/kamailio/commit/b102e3f38a554f65a55424a728821d6… --- diff --git a/cmake/cmake-format.py b/cmake/cmake-format.py index 65103f4e3bd..47074bdf6ee 100644 --- a/cmake/cmake-format.py +++ b/cmake/cmake-format.py @@ -25,7 +25,7 @@ disable = False # How wide to allow formatted cmake files - line_width = 80 + line_width = 100 # How many spaces to tab for indent tab_size = 2 @@ -91,7 +91,7 @@ command_case = 'canonical' # Format keywords consistently as 'lower' or 'upper' case - keyword_case = 'unchanged' + keyword_case = 'upper' # A list of command names which should always be wrapped always_wrap = []

1 0

git:6.0:5d740aa8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Apr '25

08 Apr '25

Module: kamailio Branch: 6.0 Commit: 5d740aa865561a9b7d36fd43647fbc4c4b76cfc1 URL: https://github.com/kamailio/kamailio/commit/5d740aa865561a9b7d36fd43647fbc4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-08T14:31:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cdp/README --- Diff: https://github.com/kamailio/kamailio/commit/5d740aa865561a9b7d36fd43647fbc4… Patch: https://github.com/kamailio/kamailio/commit/5d740aa865561a9b7d36fd43647fbc4… --- diff --git a/src/modules/cdp/README b/src/modules/cdp/README index 79e4f8512b4..244eba29a8a 100644 --- a/src/modules/cdp/README +++ b/src/modules/cdp/README @@ -238,7 +238,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * None. + * libxml, + * openssl. 4. Parameters

1 0

git:master:bd963d94: modules: readme files regenerated - cdp ... [skip ci]
by Kamailio Dev 08 Apr '25

08 Apr '25

Module: kamailio Branch: master Commit: bd963d949be75160d3f4b777c125522297d18075 URL: https://github.com/kamailio/kamailio/commit/bd963d949be75160d3f4b777c125522… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-08T14:31:11+02:00 modules: readme files regenerated - cdp ... [skip ci] --- Modified: src/modules/cdp/README --- Diff: https://github.com/kamailio/kamailio/commit/bd963d949be75160d3f4b777c125522… Patch: https://github.com/kamailio/kamailio/commit/bd963d949be75160d3f4b777c125522… --- diff --git a/src/modules/cdp/README b/src/modules/cdp/README index 79e4f8512b4..244eba29a8a 100644 --- a/src/modules/cdp/README +++ b/src/modules/cdp/README @@ -238,7 +238,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * None. + * libxml, + * openssl. 4. Parameters

1 0

git:6.0:6c55de3b: cdp: document library dependencies
by Henning Westerholt 08 Apr '25

08 Apr '25

Module: kamailio Branch: 6.0 Commit: 6c55de3be8ff537dc2d3ba0169b26917c5765094 URL: https://github.com/kamailio/kamailio/commit/6c55de3be8ff537dc2d3ba0169b2691… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-08T12:30:31Z cdp: document library dependencies (cherry picked from commit 72579affd6751c096a7f6457b5f0b245be8f3389) --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c55de3be8ff537dc2d3ba0169b2691… Patch: https://github.com/kamailio/kamailio/commit/6c55de3be8ff537dc2d3ba0169b2691… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index 2be9398684b..d1e313247e1 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -82,7 +82,10 @@ <para>The following libraries or applications must be installed before running &kamailio; with this module loaded: <itemizedlist> <listitem> - <para><emphasis>None</emphasis>.</para> + <para><emphasis>libxml</emphasis>,</para> + </listitem> + <listitem> + <para><emphasis>openssl</emphasis>.</para> </listitem> </itemizedlist></para> </section>

1 0

git:master:72579aff: cdp: document library dependencies
by Henning Westerholt 08 Apr '25

08 Apr '25

Module: kamailio Branch: master Commit: 72579affd6751c096a7f6457b5f0b245be8f3389 URL: https://github.com/kamailio/kamailio/commit/72579affd6751c096a7f6457b5f0b24… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-08T12:29:29Z cdp: document library dependencies --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/72579affd6751c096a7f6457b5f0b24… Patch: https://github.com/kamailio/kamailio/commit/72579affd6751c096a7f6457b5f0b24… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index 2be9398684b..d1e313247e1 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -82,7 +82,10 @@ <para>The following libraries or applications must be installed before running &kamailio; with this module loaded: <itemizedlist> <listitem> - <para><emphasis>None</emphasis>.</para> + <para><emphasis>libxml</emphasis>,</para> + </listitem> + <listitem> + <para><emphasis>openssl</emphasis>.</para> </listitem> </itemizedlist></para> </section>

1 0

[kamailio/kamailio] IPv6 bind wrong IP. (Issue #4199)
by Minh Vũ 08 Apr '25

08 Apr '25

minhvu7896 created an issue (kamailio/kamailio#4199)  ### Description Kamailio (5.8.x): SIP proxy FreeSWITCH: Media ref: https://kb.asipto.com/kamailio:kamailio-mixed-ipv4-ipv6 https://lists.kamailio.org/pipermail/sr-users/2018-April/101159.html OS: Debian 12 gateway: aaaa:bbb:cccc:20::1 ipv6: aaaa:bbb:cccc:20::41e kamailio.cfg: ``` #!define ADDR_IPV4 xxx.xxx.xxx.xxx #!define ADDR_IPV6 [aaaa:bbb:cccc:20::41e] listen=ADDR_IPV4 listen=ADDR_IPV6 ``` I execute ```netstat -nlutp``` ``` tcp6 0 0 aaaa:bbb:cccc:20:::5060 :::* LISTEN 1691274/kamailio tcp6 0 0 aaaa:bbb:cccc:20:::5061 :::* LISTEN 1691274/kamailio udp6 0 0 aaaa:bbb:cccc:20:::5060 :::* 1691222/kamailio ``` Why I set listen ip is ```aaaa:bbb:cccc:20::41e``` but kamailio stripped the last part of the address ```aaaa:bbb:cccc:20::``` Thank you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4199 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4199(a)github.com>

5 7

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev