sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
299 discussions

git:master:bff7b033: statsd: Add labels to metrics.

by Daniel-Constantin Mierla

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 year, 4 months

[kamailio/kamailio] core: Add option for increasing socket send buffer size (PR #3561)

by Bastian Triller

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

1 year, 4 months

git:master:31507501: core: Add option for increasing socket send buffer size

by Daniel-Constantin Mierla

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 year, 4 months

git:master:34cadf6b: modules: readme files regenerated - pdt ... [skip ci]

by Kamailio Dev

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 year, 4 months

[kamailio/kamailio] pdt: make add_to_tree() idempotent (PR #3485)

by vcill

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

1 year, 4 months

git:master:11154863: pdt: docs for mode parameter

by Daniel-Constantin Mierla

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 year, 4 months

git:master:ad7df67c: pdt: added mode parameter to allow ignoring duplicated prefixes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad7df67cfd58713fc0993e2d2365a86d9d6068e1 URL: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… 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: added mode parameter to allow ignoring duplicated prefixes --- Modified: src/modules/pdt/pdt.c Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… Patch: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 22d5f663067..ae28aa1a552 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -57,6 +57,7 @@ int pdt_fetch_rows = 1000; /** structures containing prefix-domain pairs */ pdt_tree_t **_ptree = NULL; +int _pdt_mode = 0; /** database connection */ static db1_con_t *db_con = NULL; @@ -118,6 +119,7 @@ static param_export_t params[] = { {"char_list", PARAM_STR, &pdt_char_list}, {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, {"check_domain", INT_PARAM, &pdt_check_domain}, + {"mode", PARAM_INT, &_pdt_mode}, {0, 0, 0} }; diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index 7f83132cd40..b211ca6611d 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -35,6 +35,7 @@ //extern str pdt_char_list = {"1234567890*",11}; extern str pdt_char_list; +extern int _pdt_mode; /** * */ @@ -117,9 +118,15 @@ int add_to_tree(pdt_tree_t *pt, str *sp, str *sd) if(itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s != NULL) { - LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, - sd->len, sd->s); - return -1; + if(_pdt_mode & 1) { + LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", + sp->len, sp->s, sd->len, sd->s); + return -1; + } else { + LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, + sd->len, sd->s); + return -1; + } } itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s =

1 year, 4 months

git:master:2a10c158: pkg/kamailio/deb: remove pcre3 dependency [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 2a10c158cbdc6b654aca328b4bdc42e9a88018ba URL: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:54:16+02:00 pkg/kamailio/deb: remove pcre3 dependency [skip ci] --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Patch: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e…

1 year, 4 months

git:master:ef8d7119: pdf: reformat export structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef8d71197442ffd130a6e80ca147b5feb6c316a4 URL: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:33:17+02:00 pdf: reformat export structures --- Modified: src/modules/pdt/pdt.c --- Diff: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Patch: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 252a275917c..22d5f663067 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -95,40 +95,46 @@ static int fixup_translate(void **param, int param_no); static int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode); static int pdt_init_rpc(void); -static cmd_export_t cmds[] = {{"prefix2domain", (cmd_function)w_prefix2domain, - 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_table", PARAM_STR, &db_table}, - {"sdomain_column", PARAM_STR, &sdomain_column}, - {"prefix_column", PARAM_STR, &prefix_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"prefix", PARAM_STR, &pdt_prefix}, - {"char_list", PARAM_STR, &pdt_char_list}, - {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, - {"check_domain", INT_PARAM, &pdt_check_domain}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"prefix2domain", (cmd_function)w_prefix2domain, + 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_table", PARAM_STR, &db_table}, + {"sdomain_column", PARAM_STR, &sdomain_column}, + {"prefix_column", PARAM_STR, &prefix_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"prefix", PARAM_STR, &pdt_prefix}, + {"char_list", PARAM_STR, &pdt_char_list}, + {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, + {"check_domain", INT_PARAM, &pdt_check_domain}, + {0, 0, 0} +}; struct module_exports exports = { - "pdt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "pdt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** * init module function @@ -846,9 +852,13 @@ static void pdt_rpc_list(rpc_t *rpc, void *ctx) } +/* clang-format off */ rpc_export_t pdt_rpc_cmds[] = { - {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, - {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, {0, 0, 0, 0}}; + {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, + {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ /**

1 year, 4 months

[kamailio/kamailio] lcr: pcre2 migration (PR #3545)

by Victor Seva

#### 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) - [ ] 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 - [x] Related to issue #2946 #### Description migrate lcr to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3545 -- Commit Summary -- * lcr: pcre2 migration -- File Changes -- M src/modules/lcr/Makefile (12) M src/modules/lcr/hash.c (24) M src/modules/lcr/hash.h (10) M src/modules/lcr/lcr_mod.c (187) M src/modules/lcr/lcr_mod.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3545.patch https://github.com/kamailio/kamailio/pull/3545.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3545 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3545(a)github.com>

1 year, 4 months

← Newer
1
...
22
23
24
25
26
27
28
29
30
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