- sr-dev - kamailio.org

git:master:b86030cf: regex: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: b86030cfbd66ba95f33f312595edae29e2b5cde0 URL: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:15+02:00 regex: remove pcre2_free() warning related to #3851 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… Patch: https://github.com/kamailio/kamailio/commit/b86030cfbd66ba95f33f312595edae2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 52ed60b295c..f4e93e48a3e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -170,8 +170,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*! \brief

1 0

[kamailio/kamailio] tcpops: fix memory leak in $tcp(conid) (PR #3924)
by Dennis 18 Jul '24

18 Jul '24

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Reference counter to tcp session not decremented after use $tcp(conid), so shm for session never free. Can be releated to: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21294.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3924 -- Commit Summary -- * tcpops: fix memory leak in $tcp(conid) -- File Changes -- M src/modules/tcpops/tcpops_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3924.patch https://github.com/kamailio/kamailio/pull/3924.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3924 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3924(a)github.com>

2 2

git:master:acf50d86: tcpops: fix memory leak in $tcp(conid)
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: acf50d86b502af36e3635d61745feaa5c577231d URL: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T13:31:26+02:00 tcpops: fix memory leak in $tcp(conid) - reference counter to tcp session not decremented, so shm for session never free --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… Patch: https://github.com/kamailio/kamailio/commit/acf50d86b502af36e3635d61745feaa… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 6b648230894..a89a18992aa 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -811,6 +811,9 @@ static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); default: /* conid */ + if(con) { + tcpconn_put(con); + } return pv_get_sintval(msg, param, res, msg->rcv.proto_reserved1); } }

1 0

git:master:84ea36b4: core: remove unnecessary check after using the structure
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 84ea36b4b79c07c4fc0a8c9e119184433353764e URL: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:29:05+02:00 core: remove unnecessary check after using the structure --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… Patch: https://github.com/kamailio/kamailio/commit/84ea36b4b79c07c4fc0a8c9e1191844… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ab02fb7c47c..f26abd2e79d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2384,7 +2384,7 @@ char *generate_res_buf_from_sip_res( } /* test and add xavp via reply params */ - if(msg && msg->via2 && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) + if(msg->via2 && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params,

1 0

git:master:15b2a546: core: set digit 0 in the md5 buffer in case of error inside char_msg_val()
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 15b2a5467f11e009ae4efad1ee29af860326095f URL: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:17:10+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() --- Modified: src/core/char_msg_val.h --- Diff: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… Patch: https://github.com/kamailio/kamailio/commit/15b2a5467f11e009ae4efad1ee29af8… --- diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h index b3d7e4a1bea..bcdea56b85e 100644 --- a/src/core/char_msg_val.h +++ b/src/core/char_msg_val.h @@ -41,8 +41,11 @@ inline static int char_msg_val(struct sip_msg *msg, char *cv) str sempty = str_init(""); if(unlikely(!check_transaction_quadruple(msg))) { - LM_ERR("can't calculate char_value due to a parsing error\n"); - memset(cv, '0', MD5_LEN); + int i; + for(i = 0; i < MD5_LEN; i++) { + cv[i] = '0'; + } + LM_ERR("cannot calculate char_value due to a parsing error\n"); return 0; } /* to body is automatically parsed (via check_transactionquadruple /

1 0

git:master:a471d34d: core: init res inside select_cfg_var()
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: a471d34d6162387a1427f5d0c5b3c6079a2b0bdc URL: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T12:00:47+02:00 core: init res inside select_cfg_var() --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… Patch: https://github.com/kamailio/kamailio/commit/a471d34d6162387a1427f5d0c5b3c60… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index f948dd4ab4c..f3b2d681d3e 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -147,6 +147,9 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) int i; static char buf[INT2STR_MAX_LEN]; + res->s = 0; + res->len = 0; + if(msg == NULL) { /* fixup call */ @@ -228,12 +231,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) break; case CFG_VAR_STR: - if(p) { - memcpy(res, p, sizeof(str)); - } else { - res->s = 0; - res->len = 0; - } + memcpy(res, p, sizeof(str)); break; default:

1 0

[kamailio/kamailio] ims_qos_npn: forked module from ims_qos, for better rx support (PR #3921)
by Dragos Vingarzan 18 Jul '24

18 Jul '24

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [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  The `ims_qos` module had a few limitations. This fork of that module adds: - AAR for the registration (signaling path monitoring) - subsequent AARs in calls - support for STR - extra event_routes on Rx authorization session events - extra AVPs decoding and use The dependency and use of the `ims_dialog` was removed. We think that the respective module has fallen behind `dialog` (although it should've replaced it? don't know...). Cleaning/upgrading that module too might be too much effort. Since these changes might be breaking things for other folks using IMS, we are pushing these as an alternative module. We hope that we'll find though consensus in the future and either remove or merge with the older `ims_qos` module. Same would be valid for `ims_dialog` and `dialog`, yet those also might need some upgrades. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3921 -- Commit Summary -- * ims_qos_npn: imported modified module * src: added ims_qos_npn to Makefile.groups -- File Changes -- M src/Makefile.groups (2) A src/modules/ims_qos_npn/Makefile (19) A src/modules/ims_qos_npn/README (781) A src/modules/ims_qos_npn/cdpeventprocessor.c (382) A src/modules/ims_qos_npn/cdpeventprocessor.h (87) A src/modules/ims_qos_npn/doc/Makefile (4) A src/modules/ims_qos_npn/doc/ims_qos.xml (113) A src/modules/ims_qos_npn/doc/ims_qos_admin.xml (882) A src/modules/ims_qos_npn/ims_qos_mod.c (2173) A src/modules/ims_qos_npn/ims_qos_mod.h (85) A src/modules/ims_qos_npn/ims_qos_stats.c (156) A src/modules/ims_qos_npn/ims_qos_stats.h (38) A src/modules/ims_qos_npn/rx_aar.c (1296) A src/modules/ims_qos_npn/rx_aar.h (131) A src/modules/ims_qos_npn/rx_asr.c (124) A src/modules/ims_qos_npn/rx_asr.h (59) A src/modules/ims_qos_npn/rx_authdata.c (494) A src/modules/ims_qos_npn/rx_authdata.h (125) A src/modules/ims_qos_npn/rx_avp.c (2144) A src/modules/ims_qos_npn/rx_avp.h (118) A src/modules/ims_qos_npn/rx_rar.c (160) A src/modules/ims_qos_npn/rx_rar.h (34) A src/modules/ims_qos_npn/rx_str.c (184) A src/modules/ims_qos_npn/rx_str.h (61) A src/modules/ims_qos_npn/sem.h (90) A src/modules/ims_qos_npn/stats.c (79) A src/modules/ims_qos_npn/stats.h (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3921.patch https://github.com/kamailio/kamailio/pull/3921.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3921 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3921(a)github.com>

2 4

[kamailio/kamailio] siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (PR #3919)
by emvondo 18 Jul '24

18 Jul '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] 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/3919 -- Commit Summary -- * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull -- File Changes -- M src/modules/siprepo/siprepo_data.c (6) M src/modules/siprepo/siprepo_mod.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3919.patch https://github.com/kamailio/kamailio/pull/3919.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3919 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3919(a)github.com>

2 3

git:master:a3a63655: siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919)
by GitHub 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: a3a63655dbcbf1bc8067f34c36f4a7295b2a1745 URL: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… Author: emvondo <106535097+emvondo(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2024-07-18T10:10:33+02:00 siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919) * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull --------- Co-authored-by: emvondo <bycl2332(a)orange.com> --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… Patch: https://github.com/kamailio/kamailio/commit/a3a63655dbcbf1bc8067f34c36f4a72… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 397def720fb..2720c50c2c0 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -496,15 +496,15 @@ int siprepo_msg_async_pull(str *callid, str *msgid, str *gname, str *rname, return -1; } stp->callid.s = (char*)stp + ROUND_POINTER(sizeof(siprepo_task_param_t)); - memcpy(callid->s, stp->callid.s, callid->len); + memcpy(stp->callid.s, callid->s, callid->len); stp->callid.len = callid->len; stp->msgid.s = stp->callid.s + ROUND_POINTER(callid->len + 1); - memcpy(msgid->s, stp->msgid.s, msgid->len); + memcpy(stp->msgid.s, msgid->s, msgid->len); stp->msgid.len = msgid->len; stp->rname.s = stp->msgid.s + ROUND_POINTER(msgid->len + 1); - memcpy(rname->s, stp->rname.s, rname->len); + memcpy(stp->rname.s, rname->s, rname->len); stp->rname.len = rname->len; stp->rmode = rmode; diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index d8f8b02c5ad..e6acc23368e 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -58,6 +58,8 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); +static int fixup_sr_msg_async_pull(void **param, int param_no); + /* clang-format off */ typedef struct sworker_task_param { char *buf; @@ -69,10 +71,10 @@ typedef struct sworker_task_param { static cmd_export_t cmds[]={ {"sr_msg_push", (cmd_function)w_sr_msg_push, 2, fixup_spve_igp, fixup_free_spve_null, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, - {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 3, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, - {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, + {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 4, fixup_sssi, + fixup_free_sssi, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, + {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_sr_msg_async_pull, + 0, ANY_ROUTE}, {"sr_msg_rm", (cmd_function)w_sr_msg_rm, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_check", (cmd_function)w_sr_msg_check, 0, 0, @@ -282,6 +284,15 @@ static int w_sr_msg_async_pull(sip_msg_t *msg, char *pcallid, char *pmsgid, } +static int fixup_sr_msg_async_pull(void **param, int param_no) +{ + if(param_no >= 1 && param_no <= 4) + return fixup_spve_null(param, 1); + if(param_no == 5) + return fixup_igp_null(param, 1); + return 0; +} + /** * */

1 0

git:master:aa79588c: dispatcher: added ocidx to the rpc response
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: aa79588ceacaaae118230bd06b0eb7aadf9b31f3 URL: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T09:09:01+02:00 dispatcher: added ocidx to the rpc response --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… Patch: https://github.com/kamailio/kamailio/commit/aa79588ceacaaae118230bd06b0eb7a… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 3fd941c21c4..74ee7cc8e8d 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,13 +1869,14 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjjujj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", - node->dlist[j].attrs.ocrate, "OCTIME_SEC", + node->dlist[j].attrs.ocrate, "OCIDX", + (unsigned long)node->dlist[j].ocidx, "OCTIME_SEC", (unsigned long)node->dlist[j].octime.tv_sec, "OCTIME_USEC", (unsigned long)node->dlist[j].octime.tv_usec)

1 0

git:master:8c3b5ab3: dispatcher: remove reference to MI in comments
by Daniel-Constantin Mierla 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 8c3b5ab3818c86b90b02e20aa4631654e0b51745 URL: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-18T09:09:01+02:00 dispatcher: remove reference to MI in comments --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… Patch: https://github.com/kamailio/kamailio/commit/8c3b5ab3818c86b90b02e20aa463165… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 287164f829d..bdb615ad3ea 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3982,14 +3982,14 @@ static void ds_options_callback( } } - /* Check if in the meantime someone disabled probing of the target through RPC, MI or reload */ + /* Check if in the meantime someone disabled probing of the target + * through RPC or reload */ if(ds_probing_mode == DS_PROBE_ONLYFLAGGED && !(ds_get_state(group, &uri) & DS_PROBING_DST)) { return; } /* ps->code contains the result-code of the request. - * * We accept both a "200 OK" or the configured reply as a valid response */ if((ps->code >= 200 && ps->code <= 299) || ds_ping_check_rplcode(ps->code)) { @@ -4000,7 +4000,7 @@ static void ds_options_callback( && (ds_get_state(group, &uri) & DS_PROBING_DST))) state |= DS_PROBING_DST; - /* Check if in the meantime someone disabled the target through RPC or MI */ + /* Check if in the meantime someone disabled the target through RPC */ if(!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state, &rctx) != 0) { LM_ERR("Setting the state failed (%.*s, group %d)\n", uri.len, @@ -4010,7 +4010,7 @@ static void ds_options_callback( state = DS_TRYING_DST; if(ds_probing_mode != DS_PROBE_NONE) state |= DS_PROBING_DST; - /* Check if in the meantime someone disabled the target through RPC or MI */ + /* Check if in the meantime someone disabled the target through RPC */ if(!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state, &rctx) != 0) { LM_ERR("Setting the probing state failed (%.*s, group %d)\n",

1 0

git:master:39be7eb5: src: added ims_qos_npn to Makefile.groups
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 39be7eb53773a1e3776d185f47d13a41e95408c3 URL: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 src: added ims_qos_npn to Makefile.groups --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… Patch: https://github.com/kamailio/kamailio/commit/39be7eb53773a1e3776d185f47d13a4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 909abc7541b..b40781bf5cd 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -167,7 +167,7 @@ mod_list_redis=db_redis ndb_redis topos_redis mod_list_mono=app_mono # - modules related to IMS extensions -mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \ +mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_npn \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging ims_ocs ims_diameter_server \ ims_ipsec_pcscf

1 0

git:master:5ee7d35c: ims_qos_npn: imported modified module
by Dragos Vingarzan 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 5ee7d35cfd9839230efbb163bac81ecbd461d6b5 URL: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Author: Dragos Vingarzan <dragos(a)neatpath.net> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-18T09:02:17+02:00 ims_qos_npn: imported modified module --- Added: src/modules/ims_qos_npn/Makefile Added: src/modules/ims_qos_npn/README Added: src/modules/ims_qos_npn/cdpeventprocessor.c Added: src/modules/ims_qos_npn/cdpeventprocessor.h Added: src/modules/ims_qos_npn/doc/Makefile Added: src/modules/ims_qos_npn/doc/ims_qos.xml Added: src/modules/ims_qos_npn/doc/ims_qos_admin.xml Added: src/modules/ims_qos_npn/ims_qos_mod.c Added: src/modules/ims_qos_npn/ims_qos_mod.h Added: src/modules/ims_qos_npn/ims_qos_stats.c Added: src/modules/ims_qos_npn/ims_qos_stats.h Added: src/modules/ims_qos_npn/rx_aar.c Added: src/modules/ims_qos_npn/rx_aar.h Added: src/modules/ims_qos_npn/rx_asr.c Added: src/modules/ims_qos_npn/rx_asr.h Added: src/modules/ims_qos_npn/rx_authdata.c Added: src/modules/ims_qos_npn/rx_authdata.h Added: src/modules/ims_qos_npn/rx_avp.c Added: src/modules/ims_qos_npn/rx_avp.h Added: src/modules/ims_qos_npn/rx_rar.c Added: src/modules/ims_qos_npn/rx_rar.h Added: src/modules/ims_qos_npn/rx_str.c Added: src/modules/ims_qos_npn/rx_str.h Added: src/modules/ims_qos_npn/sem.h Added: src/modules/ims_qos_npn/stats.c Added: src/modules/ims_qos_npn/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec… Patch: https://github.com/kamailio/kamailio/commit/5ee7d35cfd9839230efbb163bac81ec…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 17 Jul '24

17 Jul '24

- URL: https://github.com/kamailio/kamailio/commit/fa792054a58126b57797675aadc4f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:27:27+02:00 core: pvapi - use defined types for pv_get_avp_name() name and flags - URL: https://github.com/kamailio/kamailio/commit/4b35f78c57a679723ec77c10c1a2f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:33:01+02:00 corex: use defined types for avp name and flags - URL: https://github.com/kamailio/kamailio/commit/ac9417cb0db60f9a4a0ff9f532edd07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:36:30+02:00 corex: destroy all msg avps after nio event route - URL: https://github.com/kamailio/kamailio/commit/07e5c94cad90474f8e2f2918ca28741… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:55:52+02:00 core: pvar - use defined types for avp type and name - URL: https://github.com/kamailio/kamailio/commit/dedba13bf159d780c3c0ae4dd524e92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T20:57:24+02:00 core: avp - coherent use of defined types for name and type - URL: https://github.com/kamailio/kamailio/commit/bdd8619d4389b3a84b3ca601d5fe02a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:44:51+02:00 core: cfg.y - use avp flags type - URL: https://github.com/kamailio/kamailio/commit/f8782d7f7522c83ca5490d133a6f696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:01+02:00 acc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7de3f755d7f613cb324768466d3122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:04+02:00 avpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/4f61b76640f3bca27642a4e0e973b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:07+02:00 call_control: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/d1bca3506b931164fb7993936107a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:10+02:00 cfgt: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dcce0b7f9c742ce2fdc512da87f5b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:13+02:00 cplc: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e1e2ad2fc278a05a1ad82e7cb18511d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:16+02:00 debugger: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/a6a191be5aa389f82f4f6d56b48eb9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:19+02:00 dialplan: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/896fc467901da9e99426866ce6348fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:22+02:00 drouting: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/ee07ab29297a7ac86fe975d692f2bf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:25+02:00 exec: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/308246a76a268980038d2435ad7c259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:28+02:00 h350: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/98504b4f7557299cd5c52e95aeb307e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:31+02:00 ims_registrar_pcscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/604f900ca8a0e64757ff123c2f0b6a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:34+02:00 ims_registrar_scscf: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e67ad97d3da4e3b5149ea0de31f0930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:37+02:00 json: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/2ac3e5daafe8c48835aaf8c488e5aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:39+02:00 kazoo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b523f5e4f4a4f5b8c2f40717c57d093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:42+02:00 lcr: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/def2e8fcd09ba4bceb21169410da4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:44+02:00 ldap: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/3bc58f2a3cdf1db930b3836d2d19614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:48+02:00 matrix: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/be98520dd9366d30be74ec9078212f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:50+02:00 mediaproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/b7ae09d3b311a7e5cc6d7ded81fc034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:53+02:00 msilo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/bf996241f712a8645ffb28906aeb849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:55+02:00 mtree: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/cb7ad3e8cfeb2bfc3b8d092d3b03073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:54:59+02:00 nathelper: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/11ac3d05d5d1f1222bf025d26f92f43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:01+02:00 osp: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/dda660bdb3fc3f9257e9291cf38182d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:04+02:00 pdb: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/594a4b39b15a2d4db361554d091e14e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:06+02:00 permissions: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/456608939cf5970eaa3df0919088308… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:09+02:00 pua_dialoginfo: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/53f9a571315c151bdd1bf4a6bd5e21f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:11+02:00 pv: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/59c2ebad7d030fd8b2d2e675e3f481f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:14+02:00 registrar: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/0483f1c74e9f3f48e573b445655a622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:16+02:00 rtpengine: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e14e80a29a8d6edcef955a66b696c3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:19+02:00 rtpproxy: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/44654f476a7ebc3b8531e3dc0455ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:21+02:00 sdpops: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/e703f9454f8d2b48562e254d79d6102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:23+02:00 siptrace: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72e8f2a201c9084c3ac86f7921c7787… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:25+02:00 siputils: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/32963fa84244fb0b6b80a50101866c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:27+02:00 tm: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/61ed552911e5ac633cdfdabd9ed2a26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:28+02:00 uac: coherent use of defined types for avp flags, name and value - URL: https://github.com/kamailio/kamailio/commit/72b80c120c28fbc910c946c9a075e87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-17T08:55:31+02:00 xprint: coherent use of defined types for avp flags, name and value

1 0

[kamailio/kamailio] Dialog DMQ sync: Timer needs fixing, firing on wrong node! (Issue #3656)
by Benoît Panizzon 17 Jul '24

17 Jul '24

Situation: Two Kamailio nodes syncing dialog profiles via DMQ Observation: When a dialog timeout is encountered, about half of the time, the timeout is triggered on the peer node not handling the dialog preventing the call to be correctly terminated and also leaving entries in the dialog database which never get deleted. https://kamailio.org/docs/modules/5.7.x/modules/dialog.html#dialog.p.enable… Makes clear, that only the node which is handling the dialog in question, can make changes not related to the dialog profiles. So when a dialog times out, it is this node which has to trigger the timeout, not any other one. When looking at the source code, it is clear, that the 'lifetime' is transmitted via DMQ dialog message to the peer nodes, which in turn arm a timer. So it is obvious, this time will trigger, sometimes before the instance handling the dialog itself triggers that timer. With some assistance of @oej I found a way to alter the JSON payload to extend the lifetime on the peer nodes: ``` route[DMQ_CAPTURE] { if(is_method("KDMQ")) { if(has_body("application/json") && $fU == 'dialog') { if (jansson_get("lifetime", $rb, "$var(lifetime)")) { $var(new_lifetime) = $var(lifetime) + 60; # Add 60 seconds on DMQ peer to make sure it expires AFTER main node. $var(newrb) = $rb; jansson_set("integer", "lifetime", $var(new_lifetime), "$var(newrb)"); set_body("$var(newrb)","application/json"); msg_apply_changes(); } } dmq_handle_message(); exit; } } ``` Testing with this config fixed the issue of the timeout firing on a peer node instead of the node handling the dialog. Issue is present in 5.5, 5.6 and after looking at the code, I assume also on 5.7 -Benoît -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3656 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3656(a)github.com>

6 15

git:master:ba31a006: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: ba31a0065af34490650a205738328f52b95a784b URL: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-16T10:31:11+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… Patch: https://github.com/kamailio/kamailio/commit/ba31a0065af34490650a205738328f5… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 41f9d7bb812..16c10332df7 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1883,6 +1883,7 @@ kamctl rpc dispatcher.hash 4 bob server.com startup, useful when the hostname of the destination address is a NAPTR or SRV record only. Such addresses cannot be matched anymore with ds_is_from_list(...). + + 32 (bit at index 5 - 1 <<5) - no ping to destination * priority: sets the priority in destination list (based on it is done the initial ordering inside the set) * attributes: extra fields in form of name1=value1;...;nameN=valueN.

1 0

git:master:2ce75082: dispatcher: docs - listed flag 32
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: 2ce75082134a7e03c29e3096316cee5ad455d9af URL: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T10:20:17+02:00 dispatcher: docs - listed flag 32 --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… Patch: https://github.com/kamailio/kamailio/commit/2ce75082134a7e03c29e3096316cee5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index e50ea26f518..a17e87f68e7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2372,6 +2372,8 @@ kamctl rpc dispatcher.hash 4 bob server.com useful when the hostname of the destination address is a NAPTR or SRV record only. Such addresses cannot be matched anymore with ds_is_from_list(...).</para> </listitem> + <listitem><para>32 (bit at index 5 - 1 <<5) - no ping to destination</para> + </listitem> </itemizedlist> </para> </listitem>

1 0

git:master:abdd0bfa: dispatcher: new flag 32 to not send ping to destination
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: abdd0bfaf6a2e50fb96e2f522f03a65f331b57b5 URL: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T10:10:06+02:00 dispatcher: new flag 32 to not send ping to destination --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… Patch: https://github.com/kamailio/kamailio/commit/abdd0bfaf6a2e50fb96e2f522f03a65… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d36141bbafd..287164f829d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4069,6 +4069,9 @@ void ds_ping_set(ds_set_t *node) /* skip addresses set in disabled state by admin */ if((node->dlist[j].flags & DS_DISABLED_DST) != 0) continue; + /* skip addresses with no-ping flag */ + if((node->dlist[j].flags & DS_NOPING_DST) != 0) + continue; /* If the Flag of the entry has "Probing set, send a probe: */ if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id, diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 06410225a62..cf1842aeb47 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -46,7 +46,8 @@ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ #define DS_PROBING_DST 8 /*!< checking destination */ #define DS_NODNSARES_DST 16 /*!< no DNS A/AAAA resolve for host in uri */ -#define DS_STATES_ALL 31 /*!< all bits for the states of destination */ +#define DS_NOPING_DST 32 /*!< no ping to destination */ +#define DS_STATES_ALL 63 /*!< all bits for the states of destination */ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST))

1 0

git:master:eda03789: core: remove unnecessary cleanup when locating a module
by Daniel-Constantin Mierla 16 Jul '24

16 Jul '24

Module: kamailio Branch: master Commit: eda03789f693bb72ec4ee05a8b2b4723e5080504 URL: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-16T08:27:42+02:00 core: remove unnecessary cleanup when locating a module --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… Patch: https://github.com/kamailio/kamailio/commit/eda03789f693bb72ec4ee05a8b2b472… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index d67e7e44af3..5db20255874 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -535,9 +535,6 @@ int ksr_locate_module(char *mod_path, char **new_path) return 0; error: - if(path != NULL && path != mod_path) { - pkg_free(path); - } return -1; }

1 0

[kamailio/kamailio] nathelper: fixed handle_ruri_alias() for alias being an IPv6 (PR #3913)
by Dragos Vingarzan 15 Jul '24

15 Jul '24

#### 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  `handle_ruri_alias()` wasn't handling correctly the IP address in the alias, in case it was an IPv6. This adds `[` and `]` around the IP if v6 when composing a destination SIP URI, such that the downstream functions will handle it correctly and not be confused by the `:` before the port. Arguably, nathelper is not needed in IPv6. Yet I have discovered a scenario where it could be quite helpful as a way to force some UE routing through an intermediary proxy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3913 -- Commit Summary -- * nathelper: fixed handle_ruri_alias() for alias being an IPv6 -- File Changes -- M src/modules/nathelper/nathelper.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3913.patch https://github.com/kamailio/kamailio/pull/3913.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3913 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3913(a)github.com>

2 5

git:master:52ab6f3d: nathelper: fixed handle_ruri_alias() for alias being an IPv6
by Dragos Vingarzan 15 Jul '24

15 Jul '24

Module: kamailio Branch: master Commit: 52ab6f3dcf5ad8d967be8bdecaa64ef31cbfbe33 URL: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-15T21:50:48+02:00 nathelper: fixed handle_ruri_alias() for alias being an IPv6 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… Patch: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6e6d44ad7ed..9c0bebad3a7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1139,7 +1139,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) char buf[MAX_URI_SIZE], *val, *sep, *at, *next, *cur_uri, *rest, *port, *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, - ip_port_len; + ip_len, ip_port_len, port_len, i; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1185,18 +1185,46 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) LM_ERR("no '~' in alias param value\n"); return -1; } + // IPv6 needs some [] added when composing a SIP URI, which further + // complicates this code. + ip_len = port - val; + int is_ipv6 = 0; + for(i = 0; i < ip_len; i++) { + if(val[i] == ':') { + is_ipv6 = 1; + break; + } + } *(port++) = ':'; trans = memchr(port, 126 /* ~ */, val_len - (port - val)); if(trans == NULL) { LM_ERR("no second '~' in alias param value\n"); return -1; } + // Compose the URI in a buffer at = &(buf[0]); append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - memcpy(at, val, ip_port_len); - at = at + ip_port_len; + if(is_ipv6) { + // IPv6 - add '[' ']' around IP + // then append ':' and copy the port + append_chr(at, '['); + memcpy(at, val, ip_len); + at = at + ip_len; + append_chr(at, ']'); + port_len = trans - port; + if(port_len > 0) { + append_chr(at, ':'); + memcpy(at, port, port_len); + at = at + port_len; + } + } else { + // IPv4 - copy directly as is + // separator '~' between IP and port was changed to ':' + memcpy(at, val, ip_port_len); + at = at + ip_port_len; + } trans = trans + 1; if((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n");

1 0

[kamailio/kamailio] Debian package build fails for Kamailio 5.7.4 (Issue #3722)
by Alexander Bakker 15 Jul '24

15 Jul '24

### Description The Debian package build fails for Kamailio 5.7.4 because it can't find static libssl. This happens because ``LIBSSL_STATIC_SRCPATH`` is set to the wrong location in the rules file. ### Troubleshooting #### Reproduction 1. Run ``ln -s pkg/kamailio/deb/bookworm debian`` 2. Run ``make deb`` #### Output ``` gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions tls_bio.o tls_cfg.o tls_config.o tls_ct_wrq.o tls_domain.o tls_dump_vf.o tls_init.o tls_locking.o tls_map.o tls_rand.o tls_rpc.o tls_select.o tls_server.o tls_util.o tls_verify.o tlsa_mod.o -lm /usr/lib64/libssl.a /usr/lib64/libcrypto.a -o tlsa.so /usr/bin/ld: cannot find /usr/lib64/libssl.a: No such file or directory /usr/bin/ld: cannot find /usr/lib64/libcrypto.a: No such file or directory collect2: error: ld returned 1 exit status make[5]: *** [../../Makefile.rules:191: tlsa.so] Error 1 ``` ### Possible Solutions An extremely hacky workaround is to patch the rules file to point ``LIBSSL_STATIC_SRCPATH`` to the right location: ``` sed -i -e "/LIBSSL_STATIC_SRCPATH/a export\\ LIBSSL_STATIC_SRCPATH=\\/usr\\/lib\\/$(uname -m)-linux-gnu" pkg/kamailio/deb/bookworm/rules ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm ``` ``` Linux 6.5.0-14-generic #14-Ubuntu SMP PREEMPT_DYNAMIC Tue Nov 14 14:59:49 UTC 2023 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3722 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3722(a)github.com>

3 10

[kamailio/kamailio] No CDR is written on failover (Issue #3254)
by Earn330 15 Jul '24

15 Jul '24

Hi, I think there is an issue with writing CDRs on failover scenarios. I have two servers with Kamailio. Both server running Debian 11 (bulleye) and latest Kamailio 5.6.1 from git. I'm using DMQ to sync dialogs and htable between these servers, so both servers have the same knowledge of dialog state. Both Kamailio uses nobind option, so I can switch a VIP from one server to the other one. This is managed with keepalived. Switching the VIP from one server the other one works fine an while a call is running I can switch the VIP. I can see that the BYE Message is handled OK after I made a switch. I can see that acc is triggered but what is missing is acc_cdr in this case. I'm using htable to fill all necessary variables to complete the CDR an I can see that all values are synced correctly. The acc_cdr is created fine if there is no failover so i think it can't be an configuration issue. Both server holds the same Kamailio configuration except the IP. `version: kamailio 5.6.1 (x86_64/linux) bfc5c2-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: bfc5c2 -dirty compiled with gcc 10.2.1` `root@voip-lab-proxy01:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye` `root@voip-lab-proxy01:~# lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian Address sizes: 38 bits physical, 48 bits virtual CPU(s): 4 On-line CPU(s) list: 0-3 Thread(s) per core: 1 Core(s) per socket: 4 Socket(s): 1 NUMA node(s): 1 Vendor ID: GenuineIntel CPU family: 6 Model: 23 Model name: Intel(R) Xeon(R) CPU E5420 @ 2.50GHz Stepping: 10 CPU MHz: 2500.088 BogoMIPS: 5000.17 Virtualization: VT-x Hypervisor vendor: KVM Virtualization type: full L1d cache: 128 KiB L1i cache: 128 KiB L2 cache: 16 MiB L3 cache: 16 MiB NUMA node0 CPU(s): 0-3 Vulnerability Itlb multihit: Not affected Vulnerability L1tf: Mitigation; PTE Inversion; VMX EPT disabled Vulnerability Mds: Vulnerable: Clear CPU buffers attempted, no microcode; SMT Host state unknown Vulnerability Meltdown: Mitigation; PTI Vulnerability Mmio stale data: Unknown: No mitigations Vulnerability Retbleed: Not affected Vulnerability Spec store bypass: Vulnerable Vulnerability Spectre v1: Mitigation; usercopy/swapgs barriers and __user pointer sanitization Vulnerability Spectre v2: Mitigation; Retpolines, STIBP disabled, RSB filling, PBRSB-eIBRS Not affected Vulnerability Srbds: Not affected Vulnerability Tsx async abort: Not affected Flags: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx pdpe1gb lm constant_tsc arch_perfmon rep_good nopl xtopology cpuid tsc_known_freq pni vmx ssse3 cx16 pdcm sse4_1 x2apic tsc_deadline_timer xsave hypervisor lahf_lm cpuid_fault pti tpr_shadow vnmi flexpriority vpid tsc_adjust arat arch_capabilit ies` If you need more information, please let me know. As I'm running this on a test system I can reproduce the issue at any time. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3254 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3254(a)github.com>

5 9

[kamailio/kamailio] test (Issue #3918)
by ale5kamailio 15 Jul '24

15 Jul '24

test posting issue -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3918 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3918(a)github.com>

1 1

git:master:f92fe42d: nghttp2: free the addr info on listen failure
by Daniel-Constantin Mierla 15 Jul '24

15 Jul '24

Module: kamailio Branch: master Commit: f92fe42dc6c8d3d5b79cf6543b387501a41c09b3 URL: https://github.com/kamailio/kamailio/commit/f92fe42dc6c8d3d5b79cf6543b38750… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-15T08:24:59+02:00 nghttp2: free the addr info on listen failure --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f92fe42dc6c8d3d5b79cf6543b38750… Patch: https://github.com/kamailio/kamailio/commit/f92fe42dc6c8d3d5b79cf6543b38750… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 6f5faf02ad6..ba0290bc4ac 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -793,11 +793,11 @@ static void start_listen(struct event_base *evbase, app_context *app_ctx) (int)rp->ai_addrlen); if(listener) { freeaddrinfo(res); - return; } } LM_ERR("Could not start listener"); + freeaddrinfo(res); } static void initialize_app_context(

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev