sr-dev

sr-dev@lists.kamailio.org

17 participants
45417 discussions

git:master:fdce48b0: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 11 May '25

11 May '25

Module: kamailio Branch: master Commit: fdce48b007d0bede3b1b18cc9249f8351a8ce220 URL: https://github.com/kamailio/kamailio/commit/fdce48b007d0bede3b1b18cc9249f83… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-05-11T16:01:10+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/fdce48b007d0bede3b1b18cc9249f83… Patch: https://github.com/kamailio/kamailio/commit/fdce48b007d0bede3b1b18cc9249f83…

1 0

git:master:57316690: pv: docs for the new xavp/i rm all functions
by Daniel-Constantin Mierla 11 May '25

11 May '25

Module: kamailio Branch: master Commit: 57316690e96f8c458e9f83af7e102bfa816bf2cf URL: https://github.com/kamailio/kamailio/commit/57316690e96f8c458e9f83af7e102bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-11T15:57:50+02:00 pv: docs for the new xavp/i rm all functions --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/57316690e96f8c458e9f83af7e102bf… Patch: https://github.com/kamailio/kamailio/commit/57316690e96f8c458e9f83af7e102bf… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 6a06bb717de..0d962a81ca5 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -726,6 +726,29 @@ xavi_child_sets("WhatEver", "FoO", "Count: $var(n)"); ... xavp_rm("x"); # same result as: $xavp(x) = $null; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_rm_all"> + <title> + <function moreinfo="none">xavp_rm_all(rname)</function> + </title> + <para> + Remove all the values of $xavp(rname). + </para> + <para> + The parameter has to be the name of XAVP in the root list. + It can be static or dynamic string (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_rm_all</function> usage</title> + <programlisting format="linespecific"> +... +xavp_rm_all("x"); ... </programlisting> </example> @@ -750,6 +773,29 @@ xavp_rm("x"); ... xavi_rm("WhatEver"); # same result as: $xavi(whatever) = $null; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavi_rm_all"> + <title> + <function moreinfo="none">xavi_rm_all(rname)</function> + </title> + <para> + Remove all the values of $xavi(rname). + </para> + <para> + The parameter has to be the name of XAVI in the root list. + It can be static or dynamic string (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavi_rm_all</function> usage</title> + <programlisting format="linespecific"> +... +xavi_rm_all("WhatEver"); ... </programlisting> </example>

1 0

git:master:acf3f1eb: pv: added functions to remove all root xavp/xavi items
by Daniel-Constantin Mierla 11 May '25

11 May '25

Module: kamailio Branch: master Commit: acf3f1ebeebec1540d0e93a80c8df54fee939610 URL: https://github.com/kamailio/kamailio/commit/acf3f1ebeebec1540d0e93a80c8df54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-11T15:57:50+02:00 pv: added functions to remove all root xavp/xavi items --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/acf3f1ebeebec1540d0e93a80c8df54… Patch: https://github.com/kamailio/kamailio/commit/acf3f1ebeebec1540d0e93a80c8df54… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index d5f21ebba65..81781303049 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -507,6 +507,7 @@ static int w_xavp_child_seti( static int w_xavp_child_sets( sip_msg_t *msg, char *prname, char *pcname, char *pval); static int w_xavp_rm(sip_msg_t *msg, char *prname, char *p2); +static int w_xavp_rm_all(sip_msg_t *msg, char *prname, char *p2); static int w_xavp_child_rm(sip_msg_t *msg, char *prname, char *pcname); static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); @@ -519,6 +520,7 @@ static int w_xavi_child_seti( static int w_xavi_child_sets( sip_msg_t *msg, char *prname, char *pcname, char *pval); static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2); +static int w_xavi_rm_all(sip_msg_t *msg, char *prname, char *p2); static int w_xavi_child_rm(sip_msg_t *msg, char *prname, char *pcname); static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx); @@ -577,6 +579,8 @@ static cmd_export_t cmds[] = { fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"xavp_rm", (cmd_function)w_xavp_rm, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"xavp_rm_all", (cmd_function)w_xavp_rm_all, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"xavp_child_rm", (cmd_function)w_xavp_child_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"xavi_child_seti", (cmd_function)w_xavi_child_seti, 3, @@ -585,6 +589,8 @@ static cmd_export_t cmds[] = { fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"xavi_rm", (cmd_function)w_xavi_rm, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"xavi_rm_all", (cmd_function)w_xavi_rm_all, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"xavi_child_rm", (cmd_function)w_xavi_child_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"xavp_lshift", (cmd_function)w_xavp_lshift, 2, @@ -1645,6 +1651,56 @@ static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2) return w_xav_rm(msg, prname, p2, 1); } +/** + * + */ +static int ki_xav_rm_all(sip_msg_t *msg, str *rname, int _case) +{ + int ret; + if(_case) { + ret = xavi_rm_by_name(rname, 1, NULL); + } else { + ret = xavp_rm_by_name(rname, 1, NULL); + } + + return (ret == 0) ? 1 : ret; +} + +static int ki_xavp_rm_all(sip_msg_t *msg, str *rname) +{ + return ki_xav_rm_all(msg, rname, 0); +} + +static int ki_xavi_rm_all(sip_msg_t *msg, str *rname) +{ + return ki_xav_rm_all(msg, rname, 1); +} + +/** + * + */ +static int w_xav_rm_all(sip_msg_t *msg, char *prname, char *p2, int _case) +{ + str rname; + + if(fixup_get_svalue(msg, (gparam_t *)prname, &rname) < 0) { + LM_ERR("failed to get root xavp name\n"); + return -1; + } + + return ki_xav_rm_all(msg, &rname, _case); +} + +static int w_xavp_rm_all(sip_msg_t *msg, char *prname, char *p2) +{ + return w_xav_rm_all(msg, prname, p2, 0); +} + +static int w_xavi_rm_all(sip_msg_t *msg, char *prname, char *p2) +{ + return w_xav_rm_all(msg, prname, p2, 1); +} + /** * */ @@ -3041,6 +3097,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_rm_all"), + SR_KEMIP_INT, ki_xavp_rm_all, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_is_null"), SR_KEMIP_INT, ki_xavp_is_null, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -3196,6 +3257,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavi_rm_all"), + SR_KEMIP_INT, ki_xavi_rm_all, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavi_is_null"), SR_KEMIP_INT, ki_xavi_is_null, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:35733d16: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 10 May '25

10 May '25

Module: kamailio Branch: master Commit: 35733d163829e6c9ffd5a5391da872ecf46f4fa1 URL: https://github.com/kamailio/kamailio/commit/35733d163829e6c9ffd5a5391da872e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-05-10T13:16:11+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/35733d163829e6c9ffd5a5391da872e… Patch: https://github.com/kamailio/kamailio/commit/35733d163829e6c9ffd5a5391da872e… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 6bfa6e44d81..be626d40c7c 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2211,6 +2211,7 @@ kamcmd dlg.list_ctx greater comparison; 'lt' - match using integer lesser comparison. Integer comparison can be used only with 'start_ts' key. * mval - matching value. + * limit (optional) - limit of matched dialogs. RPC Command Format: ...

1 0

git:master:c66d9f72: dialog: add missing documentation for optional limit parameter for list_match
by Henning Westerholt 10 May '25

10 May '25

Module: kamailio Branch: master Commit: c66d9f7298aa1d76d1905b3388e3e55023baa5ae URL: https://github.com/kamailio/kamailio/commit/c66d9f7298aa1d76d1905b3388e3e55… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-05-10T11:07:56Z dialog: add missing documentation for optional limit parameter for list_match --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c66d9f7298aa1d76d1905b3388e3e55… Patch: https://github.com/kamailio/kamailio/commit/c66d9f7298aa1d76d1905b3388e3e55… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 4a522cd553e..2653f159ea4 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2848,6 +2848,9 @@ dlg_set_state("early"); <listitem><para> <emphasis>mval</emphasis> - matching value. </para></listitem> + <listitem><para> + <emphasis>limit</emphasis> (optional) - limit of matched dialogs. + </para></listitem> </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific">

1 0

git:master:1f5afd30: app_jsdt: use snprintf() to build path instead of strcat()
by Daniel-Constantin Mierla 08 May '25

08 May '25

Module: kamailio Branch: master Commit: 1f5afd3044dd399a7a8b03430c9d2b899d044b5a URL: https://github.com/kamailio/kamailio/commit/1f5afd3044dd399a7a8b03430c9d2b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-08T10:08:21+02:00 app_jsdt: use snprintf() to build path instead of strcat() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1f5afd3044dd399a7a8b03430c9d2b8… Patch: https://github.com/kamailio/kamailio/commit/1f5afd3044dd399a7a8b03430c9d2b8… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 93383860379..53464f3ced5 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -459,7 +459,7 @@ static int jsdt_load_dir(duk_context *ctx, const char *path) DIR *directory = NULL; struct dirent *dir_entry = NULL; size_t size_to_allocate = 0; - char full_path_to_file[255] = {0}; + char full_path_to_file[512] = {0}; size_t name_len = 0; directory = opendir(_sr_jsdt_load_dir.s); @@ -474,9 +474,8 @@ static int jsdt_load_dir(duk_context *ctx, const char *path) name_len = strlen(dir_entry->d_name); if(name_len >= 3 && strcmp(dir_entry->d_name + name_len - 3, ".js") == 0) { - strcpy(full_path_to_file, _sr_jsdt_load_dir.s); - strcat(full_path_to_file, "/"); - strcat(full_path_to_file, dir_entry->d_name); + snprintf(full_path_to_file, 512, "%s/%s", _sr_jsdt_load_dir.s, + dir_entry->d_name); LM_DBG("loading js script file: %s from folder %.*s\n", dir_entry->d_name, _sr_jsdt_load_dir.len,

1 0

git:master:03c93484: app_jsdt: initialize allocated buffer
by Daniel-Constantin Mierla 08 May '25

08 May '25

Module: kamailio Branch: master Commit: 03c93484901928700d282a1684e4b6e4eaeed6c4 URL: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-08T09:59:25+02:00 app_jsdt: initialize allocated buffer --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… Patch: https://github.com/kamailio/kamailio/commit/03c93484901928700d282a1684e4b6e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index b11d66aa519..93383860379 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -496,6 +496,7 @@ static int jsdt_load_dir(duk_context *ctx, const char *path) full_buffer = (char *)malloc(size_to_allocate); if(full_buffer) { + memset(full_buffer, 0, size_to_allocate); buf = full_buffer; allocated_len = size_to_allocate; }

1 0

[kamailio/kamailio] rtpengine: improve compatibility of rtpengine per call leg stats parsing (PR #4233)
by tsearle 08 May '25

08 May '25

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [*] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [*] PR should be backported to stable branches - [*] Tested changes locally - [*] Related to issue #4232 #### Description not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4233 -- Commit Summary -- * rtpengine: improve compatibility of rtpengine per call leg stats parsing -- File Changes -- M src/modules/rtpengine/rtpengine.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4233.patch https://github.com/kamailio/kamailio/pull/4233.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4233 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4233(a)github.com>

3 8

git:5.8:9fb936b7: rtpengine: improve compatibility of rtpengine per call leg stats parsing
by Torrey Searle 07 May '25

07 May '25

Module: kamailio Branch: 5.8 Commit: 9fb936b75dd7a06ac8b9a012b03b7c85ca7884ab URL: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… Author: Torrey Searle <torrey.searle(a)wavecrest.com> Committer: Torrey Searle <torrey.searle(a)wavecrest.com> Date: 2025-05-07T16:41:50+02:00 rtpengine: improve compatibility of rtpengine per call leg stats parsing not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. (cherry picked from commit 992ee3df02148a940c255b8be7eb9d8e63465834) (cherry picked from commit e3b1220b375b48f16ae361cfe592e8c1bd8e7649) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… Patch: https://github.com/kamailio/kamailio/commit/9fb936b75dd7a06ac8b9a012b03b7c8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 561384df566..81456c4faea 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4052,7 +4052,8 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, long long ssrc; char *endp; bencode_item_t *ssrc_list, *ssrc_key, *ssrc_dict, *tags, *tag_key, - *tag_dict, *medias, *media, *streams, *stream; + *tag_dict, *medias, *media, *streams, *stream, *ingress_ssrcs, + *ingress_ssrc; struct minmax_stats_vals min_vals = {.mos = 100}, max_vals = {.mos = -1}, average_vals = {.avg_samples = 0}, vals_decoded; @@ -4107,9 +4108,21 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, (char *)stream->child->iov[1].iov_base); LM_DBG("rtpengine: XXX stream child val type %i\n", stream->child->sibling->type); - if((ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1)) - == -1) - continue; + ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1); + if(ssrc == -1) { + ingress_ssrcs = bencode_dictionary_get_expect( + stream, "ingress SSRCs", BENCODE_LIST); + if(!ingress_ssrcs || !ingress_ssrcs->child) + continue; + LM_DBG("rtpengine: XXX got ingress SSRCs\n"); + ingress_ssrc = ingress_ssrcs->child; + if((ssrc = bencode_dictionary_get_integer( + ingress_ssrc, "SSRC", -1)) + == -1) { + continue; + } + } + /* got a valid SSRC to watch for */ ssrcs[num_ssrcs] = ssrc; LM_DBG("rtpengine: found SSRC '%lli' for label '%.*s'\n", ssrc,

1 0

git:6.0:e3b1220b: rtpengine: improve compatibility of rtpengine per call leg stats parsing
by Torrey Searle 07 May '25

07 May '25

Module: kamailio Branch: 6.0 Commit: e3b1220b375b48f16ae361cfe592e8c1bd8e7649 URL: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… Author: Torrey Searle <torrey.searle(a)wavecrest.com> Committer: Torrey Searle <torrey.searle(a)wavecrest.com> Date: 2025-05-07T16:40:06+02:00 rtpengine: improve compatibility of rtpengine per call leg stats parsing not all versions of rtpengine sends a key SSRC per stream. For those that do not the same information can be found in ingress SSRCs. Add logic to check for the SSRC value there if the SSRC key is not present. (cherry picked from commit 992ee3df02148a940c255b8be7eb9d8e63465834) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… Patch: https://github.com/kamailio/kamailio/commit/e3b1220b375b48f16ae361cfe592e8c… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 49c942627cd..2401ad09cbd 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4490,7 +4490,8 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, long long ssrc; char *endp; bencode_item_t *ssrc_list, *ssrc_key, *ssrc_dict, *tags, *tag_key, - *tag_dict, *medias, *media, *streams, *stream; + *tag_dict, *medias, *media, *streams, *stream, *ingress_ssrcs, + *ingress_ssrc; struct minmax_stats_vals min_vals = {.mos = 100}, max_vals = {.mos = -1}, average_vals = {.avg_samples = 0}, vals_decoded; @@ -4545,9 +4546,21 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, (char *)stream->child->iov[1].iov_base); LM_DBG("rtpengine: XXX stream child val type %i\n", stream->child->sibling->type); - if((ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1)) - == -1) - continue; + ssrc = bencode_dictionary_get_integer(stream, "SSRC", -1); + if(ssrc == -1) { + ingress_ssrcs = bencode_dictionary_get_expect( + stream, "ingress SSRCs", BENCODE_LIST); + if(!ingress_ssrcs || !ingress_ssrcs->child) + continue; + LM_DBG("rtpengine: XXX got ingress SSRCs\n"); + ingress_ssrc = ingress_ssrcs->child; + if((ssrc = bencode_dictionary_get_integer( + ingress_ssrc, "SSRC", -1)) + == -1) { + continue; + } + } + /* got a valid SSRC to watch for */ ssrcs[num_ssrcs] = ssrc; LM_DBG("rtpengine: found SSRC '%lli' for label '%.*s'\n", ssrc,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev