sr-dev

sr-dev@lists.kamailio.org

13 participants
44206 discussions

git:master:15b2a546: core: set digit 0 in the md5 buffer in case of error inside char_msg_val()

by Daniel-Constantin Mierla

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 /

6 months

git:master:84ea36b4: core: remove unnecessary check after using the structure

by Daniel-Constantin Mierla

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,

6 months

git:master:a471d34d: core: init res inside select_cfg_var()

by Daniel-Constantin Mierla

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:

6 months

[kamailio/kamailio] ims_qos_npn: forked module from ims_qos, for better rx support (PR #3921)

by Dragos Vingarzan

#### 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>

6 months

[kamailio/kamailio] siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (PR #3919)

by emvondo

6 months

git:master:a3a63655: siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919)

by GitHub

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; +} + /** * */

6 months

git:master:aa79588c: dispatcher: added ocidx to the rpc response

by Daniel-Constantin Mierla

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)

6 months

git:master:8c3b5ab3: dispatcher: remove reference to MI in comments

by Daniel-Constantin Mierla

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",

6 months

git:master:39be7eb5: src: added ims_qos_npn to Makefile.groups

by Dragos Vingarzan

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

6 months

git:master:5ee7d35c: ims_qos_npn: imported modified module

by Dragos Vingarzan

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…

6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev