sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
302 discussions

git:master:eb23e6b6: ims_qos: kemi export
by Stefan Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: eb23e6b63b24aa4afdef6d24352eab536c7c7a48 URL: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-09-12T13:26:05+03:00 ims_qos: kemi export --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5… Patch: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5…

1 0

git:master:39944102: ims_dialog: kemi export some functions
by Stefan Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 399441029be19f7367a0831f297b81086741a9e2 URL: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-09-12T13:26:05+03:00 ims_dialog: kemi export some functions --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… Patch: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 439fb6c3ebb..a9fd0aecebf 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -20,6 +20,7 @@ #include "../../modules/tm/tm_load.h" #include "../../core/rpc_lookup.h" #include "../../modules/rr/api.h" +#include "../../core/kemi.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -1049,3 +1050,102 @@ static rpc_export_t rpc_methods[] = { {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, rpc_end_all_active_dlg_doc, 0}, {0, 0, 0, 0}}; + + +static int ki_is_known_dlg(sip_msg_t *msg) +{ + return is_known_dlg(msg); +} + +static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + + return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); +} + +static int ki_get_profile_size( + sip_msg_t *msg, str *sprofile, str *svalue, str *spv) + +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + pv_spec_t *pvs = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + if(spv == NULL || spv->s == NULL || spv->len <= 0) { + LM_ERR("invalid destination var name\n"); + return -1; + } + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + pvs = pv_cache_get(spv); + if(pvs == NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); + return -1; + } + if(pvs->type != PVT_AVP && pvs->type != PVT_SCRIPTVAR) { + LM_ERR("return must be an AVP or SCRIPT VAR!\n"); + return -1; + } + + return w_get_profile_size3( + msg, (char *)profile, (char *)pvvalue, (char *)pvs); +} + +/* clang-format off */ +static sr_kemi_t sr_kemi_ims_dialog_exports[] = { + { str_init("ims_dialog"), str_init("is_known_dlg"), + SR_KEMIP_INT, ki_is_known_dlg, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("set_dlg_profile"), + SR_KEMIP_INT, ki_set_dlg_profile, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("get_profile_size"), + SR_KEMIP_INT, ki_get_profile_size, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ims_dialog_exports); + return 0; +}

1 0

[kamailio/kamailio] statsd: Add labels to metrics. (PR #3529)
by Eloy Coto 12 Sep '23

12 Sep '23

A user reached me to add a way to add the custom labels into the statsd module, so a better way to report metrics to the observability platform. I keep the same old functions and add a new parameter to the statsd modules to both interfaces cfg and kemi. The full documentation can be found here: https://docs.datadoghq.com/developers/dogstatsd/datagram_shell/?tab=metrics So, each function can be used like this: ``` statsd_set("fooo", 1, "inbound"); statsd_gauge("NotFound", "+1", "outbound,carrierFoo"); statsd_gauge("AuthFailed", "+1", "carrier=foo,priority=10"); ``` Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> Tested-by: Alex Antonevych <alex.antonevych(a)replicant.ai>  #### 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 - [x] Tested changes locally I'm waiting until first review on function arguments to create the docs changes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3529 -- Commit Summary -- * statsd: Add labels to metrics. -- File Changes -- M src/modules/statsd/lib_statsd.c (102) M src/modules/statsd/lib_statsd.h (10) M src/modules/statsd/statsd.c (129) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3529.patch https://github.com/kamailio/kamailio/pull/3529.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3529 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3529(a)github.com>

3 8

git:master:888fc7f4: statsd: adding _labels to kemi exported function with duplicated name
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 888fc7f4cdaf3b179334394a344c6d831b93d25e URL: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:52:20+02:00 statsd: adding _labels to kemi exported function with duplicated name --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… Patch: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index ff2f948137d..9724c9244e2 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -337,7 +337,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_gauge"), + { str_init("statsd"), str_init("statsd_labels_gauge"), SR_KEMIP_INT, ki_statsd_gauge_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -347,7 +347,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_histogram"), + { str_init("statsd"), str_init("statsd_labels_histogram"), SR_KEMIP_INT, ki_statsd_histogram_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -362,7 +362,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_stop"), + { str_init("statsd"), str_init("statsd_labels_stop"), SR_KEMIP_INT, ki_statsd_stop_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -372,7 +372,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_incr"), + { str_init("statsd"), str_init("statsd_labels_incr"), SR_KEMIP_INT, ki_statsd_incr_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -382,7 +382,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_decr"), + { str_init("statsd"), str_init("statsd_labels_decr"), SR_KEMIP_INT, ki_statsd_decr_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -392,7 +392,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_set"), + { str_init("statsd"), str_init("statsd_labels_set"), SR_KEMIP_INT, ki_statsd_set_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:bff7b033: statsd: Add labels to metrics.
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: bff7b033d817c6ed63f3de63dfa7f1b45ead2ff8 URL: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b… Author: Eloy Coto <eloy.coto(a)acalustra.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:41:54+02:00 statsd: Add labels to metrics. A user reached me to add a way to add the custom labels into the statsd module, so a better way to report metrics to the observability platform. I keep the same old functions and add a new parameter to the statsd modules to both interfaces cfg and kemi. The full documentation can be found here: https://docs.datadoghq.com/developers/dogstatsd/datagram_shell/?tab=metrics So, each function can be used like this: ``` statsd_set("fooo", 1, "inbound"); statsd_gauge("NotFound", "+1", "outbound,carrierFoo"); statsd_gauge("AuthFailed", "+1", "carrier:foo,priority:10"); ``` Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> Tested-by: Alex Antonevych <alex.antonevych(a)replicant.ai> Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> --- Added: src/modules/statsd/doc/statsd.txt Modified: src/modules/statsd/lib_statsd.c Modified: src/modules/statsd/lib_statsd.h Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b… Patch: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b…

1 0

[kamailio/kamailio] core: Add option for increasing socket send buffer size (PR #3561)
by Bastian Triller 12 Sep '23

12 Sep '23

#### 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 #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/3561 -- Commit Summary -- * core: Add option for increasing socket send buffer size -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (7) M src/core/globals.h (1) M src/core/udp_server.c (104) M src/core/udp_server.h (1) M src/main.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3561.patch https://github.com/kamailio/kamailio/pull/3561.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3561 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3561(a)github.com>

2 6

git:master:31507501: core: Add option for increasing socket send buffer size
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 31507501b1d35bcf8665f9e6cc70e5fbd0bf38c2 URL: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:34:21+02:00 core: Add option for increasing socket send buffer size --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/udp_server.c Modified: src/core/udp_server.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f… Patch: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f…

1 0

git:master:34cadf6b: modules: readme files regenerated - pdt ... [skip ci]
by Kamailio Dev 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 34cadf6badb5d7db16780e0e59bf46c6fb54fd45 URL: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-12T10:32:15+02:00 modules: readme files regenerated - pdt ... [skip ci] --- Modified: src/modules/pdt/README --- Diff: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… Patch: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… --- diff --git a/src/modules/pdt/README b/src/modules/pdt/README index 569ababf54b..8404139d3f1 100644 --- a/src/modules/pdt/README +++ b/src/modules/pdt/README @@ -39,6 +39,7 @@ Elena-Ramona Modroiu 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 4. Functions @@ -64,8 +65,9 @@ Elena-Ramona Modroiu 1.8. Set fetch_rows parameter 1.9. Set char_list parameter 1.10. Set check_domain parameter - 1.11. prefix2domain usage - 1.12. pd_translate usage + 1.11. Set mode parameter + 1.12. prefix2domain usage + 1.13. pd_translate usage Chapter 1. Admin Guide @@ -88,6 +90,7 @@ Chapter 1. Admin Guide 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 4. Functions @@ -172,6 +175,7 @@ sip:12391001@mydomain.com => sip:91001@alpha.org 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 3.1. db_url (string) @@ -277,6 +281,18 @@ modparam("pdt", "char_list", "0123456789*+") modparam("pdt", "check_domain", 0) ... +3.10. mode (integer) + + If set to 1, duplicated prefixes are ingnored and starting continues, + if 0, then starting or loading fails. + + Default value is 0. + + Example 1.11. Set mode parameter +... +modparam("pdt", "mode", 1) +... + 4. Functions 4.1. prefix2domain(rewrite_mode, multidomain_mode) @@ -320,7 +336,7 @@ modparam("pdt", "check_domain", 0) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.11. prefix2domain usage + Example 1.12. prefix2domain usage ... prefix2domain("2", "2"); ... @@ -367,7 +383,7 @@ prefix2domain(); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE or BRANCH_ROUTE. - Example 1.12. pd_translate usage + Example 1.13. pd_translate usage ... pd_translate("$fd", "2"); ...

1 0

[kamailio/kamailio] pdt: make add_to_tree() idempotent (PR #3485)
by vcill 12 Sep '23

12 Sep '23

- the function call will suceed even if the prefix being inserted already exists in the tree   #### 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  PDT module initialization currently fails if you try to insert a prefix multiple times. We use kamailio as a loadbalancer and have had this change out in the field for quite some time now as our database often contains a prefix multiple times (associated with the same domain). Would it make sense to change the behavior in this case ? Thanks, Vladimir. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3485 -- Commit Summary -- * pdt: make add_to_tree() idempotent -- File Changes -- M src/modules/pdt/pdtree.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3485.patch https://github.com/kamailio/kamailio/pull/3485.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3485 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3485(a)github.com>

2 5

git:master:11154863: pdt: docs for mode parameter
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 111548639b8cf743d3919048da0ccf971c2340bf URL: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:23:55+02:00 pdt: docs for mode parameter - GH #3485 --- Modified: src/modules/pdt/doc/pdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… Patch: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… --- diff --git a/src/modules/pdt/doc/pdt_admin.xml b/src/modules/pdt/doc/pdt_admin.xml index f49f9515798..47aefffcf6e 100644 --- a/src/modules/pdt/doc/pdt_admin.xml +++ b/src/modules/pdt/doc/pdt_admin.xml @@ -299,6 +299,27 @@ modparam("pdt", "char_list", "0123456789*+") ... modparam("pdt", "check_domain", 0) ... +</programlisting> + </example> + </section> + + <section> + <title><varname>mode</varname> (integer)</title> + <para> + If set to 1, duplicated prefixes are ingnored and starting continues, + if 0, then starting or loading fails. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pdt", "mode", 1) +... </programlisting> </example> </section>

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023