- sr-dev - kamailio.org

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

[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:ad7df67c: pdt: added mode parameter to allow ignoring duplicated prefixes
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

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 0

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

git:master:2a10c158: pkg/kamailio/deb: remove pcre3 dependency [skip ci]
by Victor Seva 12 Sep '23

12 Sep '23

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 0

git:master:ef8d7119: pdf: reformat export structures
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

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 0

[kamailio/kamailio] lcr: pcre2 migration (PR #3545)
by Victor Seva 12 Sep '23

12 Sep '23

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

2 2

git:master:e3e2c41e: lcr: pcre2 migration
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e3e2c41e8c46a13bad18dd40fd9e3540020dd5eb URL: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:12:09+02:00 lcr: pcre2 migration --- Modified: src/modules/lcr/Makefile Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/hash.h Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Patch: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354…

1 0

[kamailio/kamailio] dialplan: pcre2 migration (PR #3543)
by Victor Seva 12 Sep '23

12 Sep '23

#### 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 dialplan to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3543 -- Commit Summary -- * regex: migration to pcre2 * dialplan: migrate to pcre2 -- File Changes -- M src/modules/dialplan/Makefile (11) M src/modules/dialplan/dialplan.c (5) M src/modules/dialplan/dialplan.h (21) M src/modules/dialplan/dp_db.c (103) M src/modules/dialplan/dp_repl.c (56) M src/modules/regex/Makefile (11) M src/modules/regex/regex_mod.c (240) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3543.patch https://github.com/kamailio/kamailio/pull/3543.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3543 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3543(a)github.com>

2 4

git:master:374227b1: dialplan: migrate to pcre2
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 374227b15ff7fbed8660beb93d52da15dcb4ba9e URL: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:11:51+02:00 dialplan: migrate to pcre2 --- Modified: src/modules/dialplan/Makefile Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dialplan.h Modified: src/modules/dialplan/dp_db.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Patch: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1…

1 0

[kamailio/kamailio] smsops: fixes as per static code analyzer report (PR #3551)
by Supreeth Herle 12 Sep '23

12 Sep '23

#### 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 - [ ] 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/3551 -- Commit Summary -- * smsops: fixes as per static code analyzer report -- File Changes -- M src/modules/smsops/smsops_impl.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3551.patch https://github.com/kamailio/kamailio/pull/3551.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3551 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3551(a)github.com>

2 3

git:master:5fe367c0: smsops: fixes as per static code analyzer report
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 5fe367c098123bf2dcbef2d81d1ad7ff940cb092 URL: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:01:24+02:00 smsops: fixes as per static code analyzer report --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Patch: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 10700b37db9..485a814774c 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -605,16 +605,18 @@ int utf8_to_ucs2(char *utf8, int utf8_len, char *ucs2, int buffer_len) } else if((utf8_char & 0xF0) == 0xE0) { // Three-byte UTF-8 character codepoint = ((utf8_char & 0x0F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 2] & 0x3F); + utf8_index += 2; tmp_buff[ucs2_index++] = (uint8_t)(codepoint >> 8); tmp_buff[ucs2_index++] = (uint8_t)(codepoint & 0xFF); } else if((utf8_char & 0xF8) == 0xF0) { // Four-byte UTF-8 character codepoint = ((utf8_char & 0x07) << 18) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 12) + | (((unsigned char)utf8[utf8_index + 2] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 3] & 0x3F); + utf8_index += 3; // Convert to UCS-2 surrogate pair codepoint -= 0x10000; high_surrogate = 0xD800 | (codepoint >> 10);

1 0

git:master:e0a058b0: misc/ typos (#3559)
by GitHub 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e0a058b08129e615f51e051401a41cfae6ffaf46 URL: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Author: �� <git-dpa(a)aegee.org> Committer: GitHub <noreply(a)github.com> Date: 2023-09-12T09:00:44+02:00 misc/ typos (#3559) --- Modified: misc/examples/exec/exec_s5b.cfg Modified: misc/examples/ims/icscf/README.md Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/README.md Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/sems/sems.conf Modified: misc/examples/ims/scscf/README.md Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/ims/scscf/scscf.cfg.sample Modified: misc/examples/kamailio/acc-mysql.cfg Modified: misc/examples/kamailio/acc.cfg Modified: misc/examples/kamailio/ctd.sh Modified: misc/examples/kamailio/fork.cfg Modified: misc/examples/kamailio/nathelper.cfg Modified: misc/examples/kamailio/replicate.cfg Modified: misc/examples/kamailio/web_im/README Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/mixed/acc.cfg Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg Modified: misc/examples/mixed/kamailio-minimal-proxy.cfg Modified: misc/examples/mixed/nathelper.cfg Modified: misc/examples/mixed/onr.cfg Modified: misc/examples/mixed/replicate.cfg Modified: misc/examples/mixed/sip-router.cfg.m4 Modified: misc/examples/mixed/voicemail.cfg Modified: misc/examples/obsoleted/imgw.cfg Modified: misc/examples/obsoleted/secondary.cfg Modified: misc/examples/obsoleted/sms.cfg Modified: misc/examples/obsoleted/smsgw.cfg Modified: misc/examples/obsoleted/test.cfg Modified: misc/examples/obsoleted/tmtest.cfg Modified: misc/examples/pkg/kamailio-basic.cfg Modified: misc/examples/pkg/kamailio-oob.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/examples/presence/full-no-failover.cfg Modified: misc/examples/presence/no-db.cfg Modified: misc/examples/scripts/ctd.sh Modified: misc/examples/scripts/serresponse Modified: misc/examples/scripts/web_im/README Modified: misc/examples/webrtc/kamailio-default-websocket.cfg Modified: misc/scripts/dbtext/ser_dbtext.sh Modified: misc/scripts/mysql/sip-router_mysql.sh Modified: misc/scripts/postgres/ser_postgres.sh Modified: misc/scripts/serconf.sh Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/pike_top/pike_top.c Modified: misc/tools/profile/launch.sh Modified: misc/tools/sipgrep/sipgrep --- Diff: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Patch: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf…

1 0

[kamailio/kamailio] misc/ typos (PR #3559)
by Дилян Палаузов 12 Sep '23

12 Sep '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3559 -- Commit Summary -- * misc/ typos -- File Changes -- M misc/examples/exec/exec_s5b.cfg (2) M misc/examples/ims/icscf/README.md (2) M misc/examples/ims/icscf/kamailio.cfg (4) M misc/examples/ims/pcscf/README.md (2) M misc/examples/ims/pcscf/kamailio.cfg (4) M misc/examples/ims/pcscf/pcscf.cfg.sample (2) M misc/examples/ims/pcscf/route/mo.cfg (2) M misc/examples/ims/pcscf/sems/sems.conf (2) M misc/examples/ims/scscf/README.md (2) M misc/examples/ims/scscf/kamailio.cfg (6) M misc/examples/ims/scscf/scscf.cfg.sample (2) M misc/examples/kamailio/acc-mysql.cfg (2) M misc/examples/kamailio/acc.cfg (2) M misc/examples/kamailio/ctd.sh (4) M misc/examples/kamailio/fork.cfg (2) M misc/examples/kamailio/nathelper.cfg (2) M misc/examples/kamailio/replicate.cfg (2) M misc/examples/kamailio/web_im/README (2) M misc/examples/kemi/kamailio-basic-kemi-ruby.rb (4) M misc/examples/kemi/kamailio-basic-kemi.cfg (2) M misc/examples/mixed/acc.cfg (2) M misc/examples/mixed/kamailio-minimal-anycast.cfg (4) M misc/examples/mixed/kamailio-minimal-proxy.cfg (4) M misc/examples/mixed/nathelper.cfg (2) M misc/examples/mixed/onr.cfg (4) M misc/examples/mixed/replicate.cfg (2) M misc/examples/mixed/sip-router.cfg.m4 (14) M misc/examples/mixed/voicemail.cfg (2) M misc/examples/obsoleted/imgw.cfg (4) M misc/examples/obsoleted/secondary.cfg (2) M misc/examples/obsoleted/sms.cfg (2) M misc/examples/obsoleted/smsgw.cfg (2) M misc/examples/obsoleted/test.cfg (2) M misc/examples/obsoleted/tmtest.cfg (4) M misc/examples/pkg/kamailio-basic.cfg (2) M misc/examples/pkg/kamailio-oob.cfg (10) M misc/examples/pkg/sip-router-basic.cfg (2) M misc/examples/pkg/sip-router-oob.cfg (32) M misc/examples/presence/full-no-failover.cfg (6) M misc/examples/presence/no-db.cfg (4) M misc/examples/scripts/ctd.sh (4) M misc/examples/scripts/serresponse (8) M misc/examples/scripts/web_im/README (2) M misc/examples/webrtc/kamailio-default-websocket.cfg (4) M misc/scripts/dbtext/ser_dbtext.sh (2) M misc/scripts/mysql/sip-router_mysql.sh (4) M misc/scripts/postgres/ser_postgres.sh (4) M misc/scripts/serconf.sh (18) M misc/tools/kemi/python_mock/README.md (4) M misc/tools/kemi/python_mock/kemi_mock.py (2) M misc/tools/pike_top/pike_top.c (12) M misc/tools/profile/launch.sh (2) M misc/tools/sipgrep/sipgrep (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3559.patch https://github.com/kamailio/kamailio/pull/3559.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3559 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3559(a)github.com>

3 5

[kamailio/kamailio] Path: incorrect path added after the merger of "use snprintf() instead of sprintf()" branch (Issue #3560)
by Harish S 11 Sep '23

11 Sep '23

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` in $mb from xlog shows path header as Path: <sip:xx.xxx.xx.xx suffix header part is not getting appended creating malformed packet ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.0-dev1 (x86_64/linux) 99eb1b 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: 99eb1b compiled on 10:38:25 Sep 8 2023 with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu 22.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3560 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3560(a)github.com>

2 4

git:master:d0d6436c: path: fix prepend_path()
by Victor Seva 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: d0d6436cfc46ad1d5be485592decee4efe7bcce0 URL: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-11T18:17:14+02:00 path: fix prepend_path() bug introduced at dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Patch: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 2431a985553..8fde991260c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path( prefix_len = snprintf( prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else - prefix_len = sprintf(prefix, PATH_PREFIX); + prefix_len = snprintf(prefix, prefix_len, PATH_PREFIX); if(parse_headers(_m, HDR_PATH_F, 0) < 0) { LM_ERR("failed to parse message for Path header\n"); @@ -208,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.len, 0); if(!l) goto out2; @@ -223,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp.s - suffix); + dp = path_strzdup(suffix, cp.len); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp.s - suffix, 0); + l = insert_new_lump_before(l, dp, cp.len, 0); if(!l) goto out1; }

1 0

git:master:ea2babf7: pv: allow via oc param names with dashes
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: ea2babf79d8b66cbfdccdae51ddf806964b16138 URL: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T16:25:08+02:00 pv: allow via oc param names with dashes --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Patch: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index dc611de7f1a..4fa8e4677aa 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4519,12 +4519,16 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "ocalgo", 6) == 0) sp->pvp.pvn.u.isname.name.n = 10; + else if(strncmp(in->s, "oc-seq", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; case 7: if(strncmp(in->s, "protoid", 7) == 0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "oc-algo", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4540,6 +4544,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 11: + if(strncmp(in->s, "oc-validity", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; }

1 0

git:master:06b1a35c: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: 06b1a35c727155974eb3c10971eaac2606b430ea URL: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-11T14:46:24+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Patch: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index fa73e19ea32..3979dfdf185 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -104,6 +104,7 @@ Ovidiu Sas 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 2. Developer Guide @@ -175,6 +176,7 @@ Ovidiu Sas 1.60. get_body_part_raw usage 1.61. remove_body_part usage 1.62. _regex_substring usage + 1.63. via_param_rm usage Chapter 1. Admin Guide @@ -252,6 +254,7 @@ Chapter 1. Admin Guide 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 1. Overview @@ -355,6 +358,7 @@ From: medabeda 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 4.1. search(re) @@ -1621,6 +1625,25 @@ msg_apply_changes(); ---- ... +4.62. via_param_rm(name, idx) + + Remove parameter matching by name from Via body at the specified index. + The index starts from 0 (first Via body). Negative index counts from + the end of the list for Via header bodies (-1 is the last Via body). + + Meaning of the parameters is as follows: + * name - name of the parameter + * idx - index of the Via body. + + The parameters can also be variables. + + This function can be used from ANY_ROUTE. + + Example 1.63. via_param_rm usage +... +via_param_rm("p1", "0"); +... + Chapter 2. Developer Guide Table of Contents

1 0

git:master:9fb28d50: textops: new function via_param_rm("name", idx)
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: 9fb28d509274a659b221b0360f45d4fefafdb041 URL: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:26:30+02:00 textops: new function via_param_rm("name", idx) - remove paramter of a via body at a specific index --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… Patch: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 8fc0e5a7be7..b1999fed43c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -169,6 +169,8 @@ static int fixup_search_hf(void **param, int param_no); static int fixup_subst_hf(void **param, int param_no); static int fixup_regex_substring(void **param, int param_no); +static int w_via_param_rm(sip_msg_t *msg, char *pname, char *pidx); + static int mod_init(void); static tr_export_t mod_trans[] = {{{"re", sizeof("re") - 1}, /* regexp class */ @@ -287,6 +289,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"append_time_to_request", (cmd_function)append_time_request_f, 0, 0, 0, ANY_ROUTE}, + {"via_param_rm", (cmd_function)w_via_param_rm, 2, fixup_spve_igp, + fixup_free_spve_igp, ANY_ROUTE}, {"set_body_multipart", (cmd_function)set_multibody_0, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, @@ -4870,6 +4874,118 @@ static int fixup_subst_hf(void **param, int param_no) return 0; } +/** + * + */ +static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) +{ + via_body_t *vb; + hdr_field_t *hf = NULL; + int n = 0; + int ret = 0; + via_param_t *vp; + sr_lump_t *l; + char *p; + + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_DBG("failed to parse sip headers\n"); + return -1; + } + if(msg->h_via1 == NULL) { + LM_WARN("no Via header\n"); + return -1; + } + + if(idx < 0) { + n = 1; + /* count Via header bodies */ + for(hf = msg->h_via1; hf != NULL; hf = hf->next) { + if(hf->type == HDR_VIA_T) { + for(vb = (via_body_t *)hf->parsed; vb != NULL; vb = vb->next) { + n++; + } + } + } + + idx = -idx; + if(idx > n) { + LM_DBG("index out of range\n"); + return -1; + } + idx = n - idx; + } + n = 0; + for(hf = msg->h_via1; hf != NULL; hf = hf->next) { + if(hf->type == HDR_VIA_T) { + for(vb = (via_body_t *)hf->parsed; vb != NULL; vb = vb->next) { + if(n == idx) { + for(vp = vb->param_lst; vp != NULL; vp = vp->next) { + if(vp->name.len == name->len + && strncasecmp(vp->name.s, name->s, name->len) + == 0) { + p = vp->name.s - 1; + while(p >= vb->host.s + vb->host.len && *p != ';') { + p--; + } + if(*p != ';') { + LM_ERR("missing start of via parameters\n"); + return -1; + } + if(vp->value.len > 0) { + if(vp->flags & VIA_PARAM_F_QUOTED) { + l = del_lump(msg, p - msg->buf, + vp->value.s + vp->value.len - p + 1, + 0); + } else { + l = del_lump(msg, p - msg->buf, + vp->value.s + vp->value.len - p, 0); + } + } else { + l = del_lump(msg, p - msg->buf, + vp->name.s + vp->name.len - p, 0); + } + if(l == 0) { + LM_ERR("no memory for delete operation\n"); + return -1; + } + if(ret < 0) { + ret = 1; + } else { + ret++; + } + } + } + if(ret > 0) { + return ret; + } + } + n++; + } + } + } + return ret; +} + +/** + * + */ +static int w_via_param_rm(sip_msg_t *msg, char *pname, char *pidx) +{ + str name = STR_NULL; + int idx = 0; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &name) != 0) { + LM_ERR("cannot get name parameter\n"); + return -2; + } + if(fixup_get_ivalue(msg, (gparam_t *)pidx, &idx) != 0) { + LM_ERR("cannot get name parameter\n"); + return -2; + } + + return ki_via_param_rm(msg, &name, idx); +} + /** * */

1 0

git:master:fb2be385: textops: docs for via_param_rm(...)
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: fb2be3855c5971d312bad52ffc3c4cb99aeb63d8 URL: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:32:58+02:00 textops: docs for via_param_rm(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… Patch: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4af7a8bb805..9c121e51c70 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -2303,5 +2303,40 @@ msg_apply_changes(); </example> </section> + <section id="textops.f.via_param_rm"> + <title> + <function moreinfo="none">via_param_rm(name, idx)</function> + </title> + <para> + Remove parameter matching by name from Via body at the specified index. + The index starts from 0 (first Via body). Negative index counts from the + end of the list for Via header bodies (-1 is the last Via body). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>name</emphasis> - name of the parameter + </para> + </listitem> + <listitem> + <para><emphasis>idx</emphasis> - index of the Via body. + </para> + </listitem> + </itemizedlist> + <para>The parameters can also be variables.</para> + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title><function>via_param_rm</function> usage</title> + <programlisting format="linespecific"> +... +via_param_rm("p1", "0"); +... +</programlisting> + </example> + </section> + </section> </chapter>

1 0

git:master:d3acf9cc: core: parser - handle comma inside quoted params of via
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: d3acf9cc56f0ee73bee3c7cf1210c052d79a4c46 URL: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:25:47+02:00 core: parser - handle comma inside quoted params of via --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… Patch: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index a978d1aaf2e..c604f55aa2e 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -1162,10 +1162,18 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end, case ',': switch(state) { case P_VALUE: + if(param->flags & VIA_PARAM_F_QUOTED) { + /* inside a quoted value */ + break; + } param->value.len = tmp - param->value.s; state = F_VIA; goto endofvalue; case P_STRING: + if(param->flags & VIA_PARAM_F_QUOTED) { + /* inside a quoted value */ + break; + } case F_LF: case F_CR: case F_CRLF: @@ -1217,6 +1225,7 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end, case F_VALUE: state = P_STRING; param->value.s = tmp + 1; + param->flags |= VIA_PARAM_F_QUOTED; break; case P_STRING: state = L_PARAM; diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index bd0a4ffbb14..d3de9737b68 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -53,9 +53,12 @@ enum }; +#define VIA_PARAM_F_QUOTED (1) + typedef struct via_param { int type; /* Type of the parameter */ + unsigned int flags; /* Flags for the parameter */ str name; /* Name of the parameter */ str value; /* Value of the parameter */ char *start; /* Pointer to param start, just after ';',

1 0

git:master:7000c33a: core: parser - internal msg flags typedefed to unsigned long long
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

Module: kamailio Branch: master Commit: 7000c33ab5d4dc71a3471eb46c1972a3f17b5ceb URL: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T07:30:03+02:00 core: parser - internal msg flags typedefed to unsigned long long - type msg_flags_t - unsigned int size flags were filled --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… Patch: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index fdc4a844350..5d2e799d69d 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -63,7 +63,7 @@ /* number of via's encountered */ int via_cnt; /* global request flags */ -unsigned int global_req_flags = 0; +msg_flags_t global_req_flags = 0; int ksr_sip_parser_mode = KSR_SIP_PARSER_MODE_STRICT; diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 187385f2491..67650523451 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -234,6 +234,8 @@ enum _uri_flags }; /* bit fields */ typedef enum _uri_flags uri_flags; +typedef unsigned long long msg_flags_t; + /*! \brief The SIP uri object */ struct sip_uri { @@ -423,7 +425,7 @@ typedef struct sip_msg unsigned int hash_index; /*!< index to TM hash table; stored in core to avoid unnecessary calculations */ - unsigned int msg_flags; /*!< internal flags used by core */ + msg_flags_t msg_flags; /*!< internal flags used by core */ flag_t flags; /*!< config flags */ flag_t xflags[KSR_XFLAGS_SIZE]; /*!< config extended flags */ str set_global_address; @@ -459,7 +461,7 @@ extern int via_cnt; * a flag value is checked, e.g.: * if ((msg->msg_flags|global_req_flags) & FL_XXX) ... */ -extern unsigned int global_req_flags; +extern msg_flags_t global_req_flags; int parse_msg(

1 0

git:master:9f9d5df5: core: action - updated cast for internal message flags
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

Module: kamailio Branch: master Commit: 9f9d5df5f5cb5503b685cb1ab3ab7162726d58e5 URL: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T07:34:29+02:00 core: action - updated cast for internal message flags --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… Patch: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… --- diff --git a/src/core/action.c b/src/core/action.c index 4a29a73b06e..bd75eacec33 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1413,7 +1413,7 @@ int do_action(struct run_act_ctx *h, struct action *a, struct sip_msg *msg) ret = 1; /* continue processing */ break; case UDP_MTU_TRY_PROTO_T: - msg->msg_flags |= (unsigned int)a->val[0].u.number & FL_MTU_FB_MASK; + msg->msg_flags |= (msg_flags_t)a->val[0].u.number & FL_MTU_FB_MASK; ret = 1; /* continue processing */ break; case SET_ADV_ADDR_T:

1 0

git:master:49912924: uac: updated the type for internal msg flags
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

Module: kamailio Branch: master Commit: 499129246e948ec765f5f74d1b15a55a5bb43eb0 URL: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T15:58:35+02:00 uac: updated the type for internal msg flags --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… Patch: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c77167ae0d8..f13a661ca95 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -248,7 +248,7 @@ int replace_uri(struct sip_msg *msg, str *display, str *uri, char *p; str param; str buf; - unsigned int uac_flag; + msg_flags_t uac_flag; int i; int_str avp_value; struct dlg_cell *dlg = 0; @@ -558,7 +558,7 @@ int restore_uri( char *p; int i; int_str avp_value; - int flag; + msg_flags_t flag; int bsize; /* we should process only sequential request, but since we are looking

1 0

git:master:99eb1bd2: core: debug message about adding xavp params to via
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 99eb1bd2046fa9501bd9ba599c4eae16b0259373 URL: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T14:33:52+02:00 core: debug message about adding xavp params to via --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… Patch: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0140fc1d98a..f3e2ce6c28b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2348,6 +2348,7 @@ char *generate_res_buf_from_sip_res( xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { + LM_DBG("adding via reply xavp params\n"); anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0);

1 0

git:master:82b0f273: core: parser - set via->params.len when body is finished
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 82b0f273e1cf65051b6c50301c5073dce56c1149 URL: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T14:16:49+02:00 core: parser - set via->params.len when body is finished --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… Patch: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 921911f1d17..a978d1aaf2e 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2692,6 +2692,17 @@ char *parse_via( goto error; } } + if(vb->params.s != NULL && vb->params.len == 0 && vb->last_param != NULL) { + if(vb->last_param->name.len > 0) { + if(vb->last_param->value.len > 0) { + vb->params.len = vb->last_param->value.s + vb->last_param->value.len + - vb->params.s; + } else { + vb->params.len = vb->last_param->name.s + vb->last_param->name.len + - vb->params.s; + } + } + } return tmp; nextvia: DBG("parsing via: next via\n"); @@ -2706,6 +2717,18 @@ char *parse_via( goto error; } } + if(vb->params.s != NULL && vb->params.len == 0 && vb->last_param != NULL) { + if(vb->last_param->name.len > 0) { + if(vb->last_param->value.len > 0) { + vb->params.len = vb->last_param->value.s + vb->last_param->value.len + - vb->params.s; + } else { + vb->params.len = vb->last_param->name.s + vb->last_param->name.len + - vb->params.s; + } + } + } + vb->next = pkg_malloc(sizeof(struct via_body)); if(vb->next == 0) { PKG_MEM_ERROR;

1 0

git:master:cf959e29: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: cf959e29ed71caa75b789d73fb8d5132cbc4e08a URL: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-07T08:47:15+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513… Patch: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513…

1 0

git:master:1e5d1e35: core: xavp - helper function to set style when serializing
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 1e5d1e35fbebd25d3d4b81839e40dfbea841f7d2 URL: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:39:41+02:00 core: xavp - helper function to set style when serializing --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… Patch: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 9a0e4ad600a..551a039ab80 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1105,19 +1105,22 @@ int xavp_set_child_sval(str *rname, str *cname, str *sval) } /** - * serialize the values in subfields of an xavp in name=value; format + * serialize the values in subfields of an xavp in name=value format styles * - rname - name of the root list xavp + * - mode - 0 - style is 'name=value;', 1 - style is ';name=value' * - obuf - buffer were to write the output * - olen - the size of obuf * return: 0 - not found; -1 - error; >0 - length of output */ -int xavp_serialize_fields(str *rname, char *obuf, int olen) +int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) { sr_xavp_t *ravp = NULL; sr_xavp_t *avp = NULL; str ostr; int rlen; + char *pr = ""; + char *sf = ""; ravp = xavp_get(rname, NULL); if(ravp == NULL || ravp->val.type != SR_XTYPE_XAVP) { @@ -1125,6 +1128,14 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) return 0; } + if(mode & 1) { + pr = ";"; + sf = ""; + } else { + pr = ""; + sf = ";"; + } + rlen = 0; ostr.s = obuf; avp = ravp->val.v.xavp; @@ -1132,9 +1143,9 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) switch(avp->val.type) { case SR_XTYPE_LONG: LM_DBG(" XAVP long int value: %ld\n", avp->val.v.l); - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%lu;", - avp->name.len, avp->name.s, - (unsigned long)avp->val.v.l); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", + pr, avp->name.len, avp->name.s, + (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, olen - rlen); @@ -1144,12 +1155,12 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); if(avp->val.v.s.len == 0) { - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s;", - avp->name.len, avp->name.s); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", + pr, avp->name.len, avp->name.s, sf); } else { - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%.*s;", - avp->name.len, avp->name.s, avp->val.v.s.len, - avp->val.v.s.s); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%.*s%s", + pr, avp->name.len, avp->name.s, avp->val.v.s.len, + avp->val.v.s.s, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, @@ -1170,6 +1181,19 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) return rlen; } +/** + * serialize the values in subfields of an xavp in 'name=value;' format + * - rname - name of the root list xavp + * - obuf - buffer were to write the output + * - olen - the size of obuf + * return: 0 - not found; -1 - error; >0 - length of output + */ + +int xavp_serialize_fields(str *rname, char *obuf, int olen) +{ + return xavp_serialize_fields_style(rname, 0, obuf, olen); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index c1aa7d8c651..4d5c30d989b 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -114,6 +114,7 @@ sr_xavp_t *xavp_get_child(str *rname, str *cname); sr_xavp_t *xavp_get_child_with_ival(str *rname, str *cname); sr_xavp_t *xavp_get_child_with_sval(str *rname, str *cname); int xavp_serialize_fields(str *rname, char *obuf, int olen); +int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen); int xavp_set_child_ival(str *rname, str *cname, long ival); int xavp_set_child_sval(str *rname, str *cname, str *sval);

1 0

git:master:a7e63e43: core: better style for serializing via reply xavp params
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: a7e63e43cc63781c53bd3fc44e55f0530e1754d6 URL: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:39:41+02:00 core: better style for serializing via reply xavp params --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f05… Patch: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f05… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 42f445983f1..0140fc1d98a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2345,13 +2345,15 @@ char *generate_res_buf_from_sip_res( if(msg && 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( - &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, + 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { - anchor = anchor_lump(msg, msg->via2->params.s - + msg->via2->params.len - msg->buf, 0, 0); + anchor = anchor_lump(msg, + msg->via2->params.s + msg->via2->params.len - msg->buf, 0, + 0); if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) == 0) { + if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) + == 0) { LM_ERR("unable to add via reply xavp params\n"); } } @@ -2481,10 +2483,10 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(msg && (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( - &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, + 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { - len += xparams.len; /* ending ';' included */ + len += xparams.len; /* starting ';' included */ } } @@ -2621,8 +2623,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } if(xparams.len > 0) { - append_str(p, ";", 1); - append_str(p, xparams.s, xparams.len - 1); + append_str(p, xparams.s, xparams.len); } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia

1 0

git:master:d5fa60a9: corex: docs - added missing end of section
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: d5fa60a96702a5a6f3ee562fa439ac2f23bc2247 URL: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:41:08+02:00 corex: docs - added missing end of section --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… Patch: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index b0babf26886..6b60cbbf445 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -889,6 +889,7 @@ request_route { ... </programlisting> </example> + </section> <section id="corex.f.is_faked_msg"> <title> <function moreinfo="none">is_faked_msg()</function>

1 0

git:master:1832880c: core: add via reply xavp params for generation when using another reply
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 1832880c4d8e2e0c5b5444542d414b13bbab47ca URL: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:39:41+02:00 core: add via reply xavp params for generation when using another reply --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… Patch: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index c5c4172c045..42f445983f1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2320,6 +2320,8 @@ char *generate_res_buf_from_sip_res( unsigned offset, s_offset, via_offset; char *buf; unsigned int len; + str xparams; + sr_lump_t *anchor; buf = msg->buf; len = msg->len; @@ -2339,6 +2341,23 @@ 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) + && _ksr_xavp_via_reply_params.len > 0) { + xparams.s = pv_get_buffer(); + xparams.len = xavp_serialize_fields( + &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + if(xparams.len > 0) { + anchor = anchor_lump(msg, msg->via2->params.s + + msg->via2->params.len - msg->buf, 0, 0); + if(anchor != NULL) { + if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + } + } + } + } + /* Calculate message body difference and adjust * Content-Length */ @@ -2458,7 +2477,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, len -= msg->via1->rport->size + 1; /* include ';' */ } - /* test and add xavpvia params */ + /* test and add xavp via reply params */ if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer();

1 0

git:master:c92a73f8: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: c92a73f84c1fc8701f5c1b938a40ba46f5a619c8 URL: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-07T07:46:59+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4… Patch: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4…

1 0

git:master:1880737b: cores: new function via_reply_add_xavp_params()
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 1880737b9251a14eb7395f5968b955475848780d URL: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:09:35+02:00 cores: new function via_reply_add_xavp_params() - enable adding parameters to top via of replies from xavp fields --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Patch: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 24eba482489..d65f49dd8cf 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -70,6 +70,7 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2); +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); @@ -156,6 +157,8 @@ static cmd_export_t cmds[] = {{"forward_reply", (cmd_function)w_forward_reply, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE}, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, @@ -1114,6 +1117,33 @@ static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *s2) return ki_via_use_xavp_fields(msg, fval); } +/** + * + */ +static int ki_via_reply_add_xavp_params(sip_msg_t *msg, int fval) +{ + if(msg == NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_ADD_XAVP_VIA_REPLY_PARAMS; + } else { + msg->msg_flags &= ~(FL_ADD_XAVP_VIA_REPLY_PARAMS); + } + return 1; +} + +/** + * + */ +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_t *)pflags, &fval) != 0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_reply_add_xavp_params(msg, fval); +} /** * @@ -1317,6 +1347,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("via_reply_add_xavp_params"), + SR_KEMIP_INT, ki_via_reply_add_xavp_params, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("corex"), str_init("has_ruri_user"), SR_KEMIP_INT, ki_has_ruri_user, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:faa0bdcc: corex: docs for via_reply_add_xavp_params(flags) function
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: faa0bdcc5d87d40cac8a279c524fbe724c1f7f1d URL: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:38:51+02:00 corex: docs for via_reply_add_xavp_params(flags) function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Patch: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0346c2bc3fd..b0babf26886 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -854,6 +854,41 @@ request_route { </programlisting> </example> </section> + <section id="corex.f.via_reply_add_xavp_params"> + <title><function moreinfo="none">via_reply_add_xavp_params(flags)</function></title> + <para> + Control if fields of the xavp with the name specified by + xavp_via_reply_params global parameter are added or not to the top Via + of replies. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - add xavp parameters; 0 - do not + add xavp parameters. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_reply_add_xavp_params</function> usage</title> + <programlisting format="linespecific"> +... +xavp_via_reply_params="xviarpl" +... +request_route { + ... + $xavp(xviarpl=>srvid) = "1"; + $xavp(xviarpl[0]=>myval) = "xyz"; + via_reply_add_xavp_params("1"); + ... +} +... +</programlisting> + </example> <section id="corex.f.is_faked_msg"> <title> <function moreinfo="none">is_faked_msg()</function>

1 0

git:master:3ed56db3: pv: proper name id for oc field of via variables
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 3ed56db363ace8162abdfda6e5bc0cbd51a73c70 URL: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:39:38+02:00 pv: proper name id for oc field of via variables --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Patch: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index a491d10d643..dc611de7f1a 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4490,7 +4490,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) break; case 2: if(strncmp(in->s, "oc", 2) == 0) - sp->pvp.pvn.u.isname.name.n = 0; + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

git:master:cf0e802b: core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: cf0e802bbf62ec4a19f26c786c07e7436ba07f0a URL: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:04:16+02:00 core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Patch: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index b33317da0cb..187385f2491 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -118,6 +118,8 @@ typedef enum request_method #define FL_ROUTE_ADDR (1 << 25) /*!< request has Route address for next hop */ #define FL_USE_OTCPID \ (1 << 26) /*!< request to be routed using outbound tcp con id */ +#define FL_ADD_XAVP_VIA_REPLY_PARAMS \ + (1 << 27) /*!< add xavp fields to first (previous sip node) via params */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:439eae7a: core: ability to add paramters to top via of generated sip replies
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 439eae7aa2154a25a0d9143345e526e22162b24f URL: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:08:20+02:00 core: ability to add paramters to top via of generated sip replies - parameters and values are taken from xavp specified by xavp_via_reply_params --- Modified: src/core/globals.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Patch: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… --- diff --git a/src/core/globals.h b/src/core/globals.h index da693a06bae..a11f8521a3b 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -218,6 +218,7 @@ extern int ksr_all_errors; extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; +extern str _ksr_xavp_via_reply_params; extern int ksr_sip_parser_mode; extern int ksr_cfg_print_mode; extern int ksr_return_mode; diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index fcc6f133439..c5c4172c045 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -114,6 +114,7 @@ extern int version_len; str _ksr_xavp_via_params = STR_NULL; str _ksr_xavp_via_fields = STR_NULL; +str _ksr_xavp_via_reply_params = STR_NULL; int ksr_local_rport = 0; /** per process fixup function for global_req_flags. @@ -2415,6 +2416,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, char *totags; int httpreq; char *pvia; + str xparams = STR_NULL; body = 0; buf = 0; @@ -2456,6 +2458,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, len -= msg->via1->rport->size + 1; /* include ';' */ } + /* test and add xavpvia params */ + if(msg && (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( + &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + if(xparams.len > 0) { + len += xparams.len; /* ending ';' included */ + } + } + /* first line */ len += msg->first_line.u.request.version.len + 1 /*space*/ + 3 /*code*/ + 1 /*space*/ + text->len @@ -2588,6 +2601,10 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(xparams.len > 0) { + append_str(p, ";", 1); + append_str(p, xparams.s, xparams.len - 1); + } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:master:d394724e: core: config parser extended with xavp_via_reply_params parameter
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: d394724ee79e168786abb9ac94ef1e965f169a7c URL: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:02:42+02:00 core: config parser extended with xavp_via_reply_params parameter - allows to specify xavp name that is going to hold parameters to be added to the top via of replies --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Patch: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e0500769bb5..6ec71fcf6d1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -304,6 +304,7 @@ LOGENGINETYPE log_engine_type LOGENGINEDATA log_engine_data XAVPVIAPARAMS xavp_via_params XAVPVIAFIELDS xavp_via_fields +XAVPVIAREPLYPARAMS xavp_via_reply_params LISTEN listen ADVERTISE advertise|ADVERTISE VIRTUAL virtual @@ -753,6 +754,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGENGINEDATA} { yylval.strval=yytext; return LOGENGINEDATA; } <INITIAL>{XAVPVIAPARAMS} { yylval.strval=yytext; return XAVPVIAPARAMS; } <INITIAL>{XAVPVIAFIELDS} { yylval.strval=yytext; return XAVPVIAFIELDS; } +<INITIAL>{XAVPVIAREPLYPARAMS} { yylval.strval=yytext; return XAVPVIAREPLYPARAMS; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{VIRTUAL} { count(); yylval.strval=yytext; return VIRTUAL; } diff --git a/src/core/cfg.y b/src/core/cfg.y index eef8e6acd28..19d0ee6949e 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -328,6 +328,7 @@ extern char *default_routename; %token LOGENGINEDATA %token XAVPVIAPARAMS %token XAVPVIAFIELDS +%token XAVPVIAREPLYPARAMS %token LISTEN %token ADVERTISE %token VIRTUAL @@ -890,6 +891,10 @@ assign_stm: _ksr_xavp_via_fields.len=strlen($3); } | XAVPVIAFIELDS EQUAL error { yyerror("string value expected"); } + | XAVPVIAREPLYPARAMS EQUAL STRING { _ksr_xavp_via_reply_params.s=$3; + _ksr_xavp_via_reply_params.len=strlen($3); + } + | XAVPVIAREPLYPARAMS EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; }

1 0

[kamailio/kamailio] Function `sdp_mangle_ip("IP/MASK","IP")` Malfunction (Issue #3554)
by teamwcp 06 Sep '23

06 Sep '23

I have been trying to replace the SDP connection IP with some other IP using module `mangler` (`Kamailio v5.7.0`). But It seem like its malfunctioning ``` if ($rs == 200) { xlog("L_INFO", "200 $rm Detected"); sdp_mangle_ip("192.168.0.132/24","8.8.8.8"); } ``` and results I received are like this below ``` v=0 o=- 107808851201429815 2 IN IP4 192.168.0.132 s=- t=0 0 m=audio 24794 RTP/AVP 0 8 101 c=IN IP4 192.168.0.1328.8.8.8 a=mid:audio a=sendrecv a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:822878909 cname:0ZfUBhl8cMeHaeVl a=nortpproxy:yes ``` I first ask the same question in mailing list `sr-users(a)lists.kamailio.org` but after waiting for some time (>24hrs) i cant see my question on on forum, that why I open a ticket here. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3554 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3554(a)github.com>

2 2

[kamailio/kamailio] sdp_remove_transport() corrupts SDP payload in conjunction with NAT-traversal rewriting using rtpproxy (Issue #3555)
by Nathan Whitehorn 06 Sep '23

06 Sep '23

### Description I have some buggy devices that get upset by SRTP payloads in SDP that are marked inactive. As a hack, I was attempting to delete them when going to certain endpoints that are known to be problematic: ``` if (is_method("INVITE")) sdp_remove_transport("RTP/SAVP"); ``` ### Troubleshooting Per below, there is some garbage that looks like a port number inserted before `m=audio` that seems to have come from rtpproxy rewriting for NAT traversal. Removing the NAT traversal rewrite logic entirely fixes the problem, but also makes NAT traversal not happen. Changing the order of `sdp_remove_transport()` with respect to `rtpproxy_manage()` does not change anything. #### Reproduction This was seen with a Grandstream DP752 phone talking to SEMS, but applying the code snippet above and getting a packet trace will be enough. The original SDP had the RTP/SAVP transport first, followed by an RTP/AVP one. For the problem to occur, NAT SDP rewriting has to occur using rtpproxy. #### Debugging Data Here is the payload after sfp_remove_transport() removed the RTP/SAVP section: ``` v=0 o=15176190619 8000 8000 IN IP4 X.X.X.X s=SIP Call c=IN IP4 X.X.X.X t=0 0 46108m=audio 55082 RTP/AVP 125 9 0 8 2 18 97 101 a=sendrecv a=rtpmap:125 opus/48000/2 a=fmtp:125 maxplaybackrate=16000 a=ptime:20 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:2 G726-32/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=rtpmap:97 iLBC/8000 a=fmtp:97 mode=20 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16,32-36,54 a=nortpproxy:yes ``` There is a garbage 46108 (I think what would have been the port number for SAVP data) at the beginning of the m=audio line. It seems that the rewrite by rtpproxy is still inserting this port number even though the transport in question has been removed. #### Log Messages None relevant. #### SIP Traffic (See above) ### Possible Solutions None. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ kamailio -v version: kamailio 5.6.2 (x86_64/freebsd) 54a9c1 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, 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, select, kqueue. id: 54a9c1 compiled on 10:44:33 Jul 20 2023 with cc FreeBSD clang version 13.0.0 (git@github.com:llvm/llvm-project.git llvmorg-13.0.0-0-gd7b669b3a303) ``` * **Operating System**: FreeBSD 13.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3555 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3555(a)github.com>

2 2

git:master:629a5451: pv: via-related variables can retun oc parameters
by Daniel-Constantin Mierla 06 Sep '23

06 Sep '23

Module: kamailio Branch: master Commit: 629a5451d3924fff5c9b4e06c37bd498fc6b58db URL: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T15:05:06+02:00 pv: via-related variables can retun oc parameters - overload control - rfc7339 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Patch: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b81f37bc9a5..a491d10d643 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 2: + if(strncmp(in->s, "oc", 2) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "host", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4501,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "rport", 5) == 0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; @@ -4509,6 +4517,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "params", 6) == 0) sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "ocalgo", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4524,7 +4534,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; - + case 10: + if(strncmp(in->s, "ocvalidity", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; } @@ -4544,6 +4559,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) int pv_get_via_attr( sip_msg_t *msg, via_body_t *vb, pv_param_t *param, pv_value_t *res) { + via_oc_t ocv; + if(vb == NULL) { LM_DBG("null via header\n"); return pv_get_null(msg, param, res); @@ -4587,6 +4604,34 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->params); } break; + case 9: /* oc */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.oc == 1) { + return pv_get_sintval(msg, param, res, 1); + } else { + return pv_get_sintval(msg, param, res, 2); + } + break; + case 10: /* oc-algo */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.algo.s != NULL && ocv.algo.len > 0) { + return pv_get_strval(msg, param, res, &ocv.algo); + } + return pv_get_null(msg, param, res); + case 11: /* oc-validity */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, ocv.validity); + case 12: /* oc-seq */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, (unsigned long)ocv.seq); default: return pv_get_null(msg, param, res);

1 0

git:master:062dbc7c: dispatcher: added pactive and pinactive for $dsg(key)
by Daniel-Constantin Mierla 06 Sep '23

06 Sep '23

Module: kamailio Branch: master Commit: 062dbc7c7f74ebe705eff711e994c3eec5956e03 URL: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T13:00:12+02:00 dispatcher: added pactive and pinactive for $dsg(key) - return percent of active/inactive route in the group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Patch: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e9676b0aae7..741fbe7fab7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1424,6 +1424,10 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, active); case 2: /* inactive */ return pv_get_sintval(msg, param, res, inactive); + case 3: /* pactive */ + return pv_get_sintval(msg, param, res, (int)((active*100)/count)); + case 4: /* pinactive */ + return pv_get_sintval(msg, param, res, (int)((inactive*100)/count)); default: return pv_get_null(msg, param, res); } @@ -1450,12 +1454,24 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 7: + if(strncmp(in->s, "pactive", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + else + goto error; + break; case 8: if(strncmp(in->s, "inactive", 8) == 0) sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; + case 9: + if(strncmp(in->s, "pinactive", 9) == 0) + sp->pvp.pvn.u.isname.name.n = 4; + else + goto error; + break; default: goto error; }

1 0

git:master:d07eb9e5: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: d07eb9e54a075716c6bc96b123c3bbb885466da8 URL: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-05T12:46:34+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Patch: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 307217bf070..79fc82ec175 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -121,6 +121,7 @@ Federico Cabiddu 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -208,8 +209,10 @@ Federico Cabiddu 1.55. ds_is_from_list usage 1.56. ds_is_active usage 1.57. ds_load_unset usage - 1.58. dispatcher list file - 1.59. Kamailio config script - sample dispatcher usage + 1.58. ds_reload usage + 1.59. ds_dsg_fetch() usage + 1.60. dispatcher list file + 1.61. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -285,6 +288,7 @@ Chapter 1. Admin Guide 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -1110,6 +1114,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 4.1. ds_select_dst(set, alg[, limit]) @@ -1597,6 +1602,26 @@ onreply_route { This function can be used from ANY_ROUTE. + Example 1.58. ds_reload usage +... + ds_reload(); +... + +4.16. ds_dsg_fetch(setid) + + Sets the destination group id to setid for fetching $dsg(key) + attributes. + + Parameters: setid - integer or variable holding the set id value + + This function can be used from ANY_ROUTE. + + Example 1.59. ds_dsg_fetch() usage +... + ds_dsg_fetch("1"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); +... + 5. RPC Commands 5.1. dispatcher.set_state @@ -1875,7 +1900,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.58. dispatcher list file + Example 1.60. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1900,7 +1925,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.59. Kamailio config script - sample dispatcher usage + Example 1.61. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

1 0

git:master:b6979b50: modules: readme files regenerated - tm ... [skip ci]
by The Root 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: b6979b503ffe65314526a8a2824f50b3f46b7a22 URL: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-09-05T12:46:08+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Patch: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 0b44b81813c..19f4a9a3781 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1864,11 +1864,12 @@ modparam("tm", "failover_reply_codes", "code=403;code=488;class=5") 4.1. t_relay([host, port]) - Relay a message statefully either to the destination indicated in the - current URI (if called without any parameters) or to the specified host - and port. In the later case (host and port specified) the protocol used - is the same protocol on which the message was received. It creates a - transaction. + Relay a SIP request statefully either to the destination indicated in + the current URI (if called without any parameters) or to the specified + host and port. In the later case (host and port specified) the protocol + used is the same protocol on which the message was received. It creates + the SIP transaction, if none was created before (e.g., with + t_newtran()). t_relay() is the stateful version for forward() while t_relay(host, port) is similar to forward(host, port).

1 0

git:master:0e640014: dispatcher: docs - example for ds_reload()
by Daniel-Constantin Mierla 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: 0e640014019fff58d665e8c3f2d37b7c8d0cfd21 URL: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:34:41+02:00 dispatcher: docs - example for ds_reload() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Patch: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 46148b03e4b..011c9af827e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1970,6 +1970,14 @@ onreply_route { <para> This function can be used from ANY_ROUTE. </para> + <example> + <title><function>ds_reload</function> usage</title> + <programlisting format="linespecific"> +... + ds_reload(); +... +</programlisting> + </example> </section> </section>

1 0

git:master:2e341d96: dispatcher: docs for ds_dsg_fetch()
by Daniel-Constantin Mierla 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: 2e341d961e6a9c24c93316459dbfe5c8fbb8db65 URL: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:39:41+02:00 dispatcher: docs for ds_dsg_fetch() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… Patch: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 011c9af827e..334271038fe 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1976,6 +1976,28 @@ onreply_route { ... ds_reload(); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_dsg_fetch"> + <title> + <function moreinfo="none">ds_dsg_fetch(setid)</function> + </title> + <para> + Sets the destination group id to setid for fetching $dsg(key) attributes. + </para> + <para>Parameters: <emphasis>setid</emphasis> - integer or variable + holding the set id value</para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_dsg_fetch()</function> usage</title> + <programlisting format="linespecific"> +... + ds_dsg_fetch("1"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); +... </programlisting> </example> </section>

1 0

git:master:fef59a82: dispatcher: $dsg(key) - count active/inactive targets in the group
by Daniel-Constantin Mierla 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: fef59a8216e70a0eef47ce9c2eb9da32a16cd764 URL: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:31:32+02:00 dispatcher: $dsg(key) - count active/inactive targets in the group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… Patch: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 0264a37bc7e..e9676b0aae7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1395,6 +1395,7 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int count = 0; int active = 0; int inactive = 0; + int j = 0; if(param == NULL) { return -1; @@ -1405,6 +1406,17 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + lock_get(&dsg->lock); + count = dsg->nr; + for(j = 0; j < dsg->nr; j++) { + if(ds_skip_dst(dsg->dlist[j].flags)) { + inactive++; + } else { + active++; + } + } + lock_release(&dsg->lock); + switch(param->pvn.u.isname.name.n) { case 0: /* count */ return pv_get_sintval(msg, param, res, count);

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/checkout from 3 to 4 (PR #3557)
by dependabot[bot] 05 Sep '23

05 Sep '23

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/checkout/releases">actions/ch… releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update default runtime to node20 by <a href="https://github.com/takost"><code>@takost</code… in <a href="https://redirect.github.com/actions/checkout/pull/1436">… <li>Support fetching without the --progress option by <a href="https://github.com/simonbaird"><code>@simonbaird&… in <a href="https://redirect.github.com/actions/checkout/pull/1067">… <li>Release 4.0.0 by <a href="https://github.com/takost"><code>@takost</code… in <a href="https://redirect.github.com/actions/checkout/pull/1447">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/takost"><code>@takost</code… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1436">… <li><a href="https://github.com/simonbaird"><code>@simonbaird&… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1067">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3...v4.0.0"&gt… <h2>v3.6.0</h2> <h2>What's Changed</h2> <ul> <li>Mark test scripts with Bash'isms to be run via Bash by <a href="https://github.com/dscho"><code>@dscho</code&g… in <a href="https://redirect.github.com/actions/checkout/pull/1377">… <li>Add option to fetch tags even if fetch-depth &gt; 0 by <a href="https://github.com/RobertWieczoreck"><code>@Rober… in <a href="https://redirect.github.com/actions/checkout/pull/579">a… <li>Release 3.6.0 by <a href="https://github.com/luketomlinson"><code>@luketoml… in <a href="https://redirect.github.com/actions/checkout/pull/1437">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/RobertWieczoreck"><code>@Rober… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/579">a… <li><a href="https://github.com/luketomlinson"><code>@luketoml… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1437">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3.5.3...v3.6.0&quot… <h2>v3.5.3</h2> <h2>What's Changed</h2> <ul> <li>Fix: Checkout Issue in self hosted runner due to faulty submodule check-ins by <a href="https://github.com/megamanics"><code>@megamanics&… in <a href="https://redirect.github.com/actions/checkout/pull/1196">… <li>Fix typos found by codespell by <a href="https://github.com/DimitriPapadopoulos"><code>@Di… in <a href="https://redirect.github.com/actions/checkout/pull/1287">… <li>Add support for sparse checkouts by <a href="https://github.com/dscho"><code>@dscho</code&g… and <a href="https://github.com/dfdez"><code>@dfdez</code&g… in <a href="https://redirect.github.com/actions/checkout/pull/1369">… <li>Release v3.5.3 by <a href="https://github.com/TingluoHuang"><code>@TingluoHu… in <a href="https://redirect.github.com/actions/checkout/pull/1376">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/megamanics"><code>@megamanics&… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1196">… <li><a href="https://github.com/DimitriPapadopoulos"><code>@Di… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1287">… <li><a href="https://github.com/dfdez"><code>@dfdez</code&g… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1369">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3...v3.5.3"&gt… <h2>v3.5.2</h2> <h2>What's Changed</h2> <ul> <li>Fix: Use correct API url / endpoint in GHES by <a href="https://github.com/fhammerl"><code>@fhammerl</… in <a href="https://redirect.github.com/actions/checkout/pull/1289">… based on <a href="https://redirect.github.com/actions/checkout/issues/1286"&g… by <a href="https://github.com/1newsr"><code>@1newsr</code… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3.5.1...v3.5.2&quot… <h2>v3.5.1</h2> <h2>What's Changed</h2> <ul> <li>Improve checkout performance on Windows runners by upgrading <code>@actions/github</code> dependency by <a href="https://github.com/BrettDong"><code>@BrettDong&lt… in <a href="https://redirect.github.com/actions/checkout/pull/1246">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/BrettDong"><code>@BrettDong&lt… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1246">… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/checkout/blob/main/CHANGELOG.md"… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h2>v4.0.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1067">… fetching without the --progress option</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1436">… to node20</a></li> </ul> <h2>v3.6.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1377">…">Fix: Mark test scripts with Bash'isms to be run via Bash</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/579">A… option to fetch tags even if fetch-depth &gt; 0</a></li> </ul> <h2>v3.5.3</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1196">…">Fix: Checkout fail in self-hosted runners when faulty submodule are checked-in</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1287">… typos found by codespell</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1369">… support for sparse checkouts</a></li> </ul> <h2>v3.5.2</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1289">… api endpoint for GHES</a></li> </ul> <h2>v3.5.1</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1246">… slow checkout on Windows</a></li> </ul> <h2>v3.5.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1237">… new public key for known_hosts</a></li> </ul> <h2>v3.4.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1209">… codeql actions to v2</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1210">… dependencies</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1225">… <code>@actions/io</code></a></li> </ul> <h2>v3.3.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1045">… branch list using callbacks from exec function</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1050">… in explicit reference to private checkout options</a></li> <li>[Fix comment typos (that got added in <a href="https://redirect.github.com/actions/checkout/issues/770"&gt… href="https://redirect.github.com/actions/checkout/pull/1057">… </ul> <h2>v3.2.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/942">A… GitHub Action to perform release</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/967">F… status badge</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1002">… datadog/squid with ubuntu/squid Docker image</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/964">W… pipeline commands for submoduleForeach in quotes</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1029">… <code>@actions/io</code> to 1.1.2</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1039">… version to 3.2.0</a></li> </ul> <h2>v3.1.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/939">U… <code>@actions/core</code> <code>saveState</code> and <code>getState</code></a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/922">A… <code>github-server-url</code> input</a></li> </ul> <h2>v3.0.2</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/770">A… input <code>set-safe-directory</code></a></li> </ul> <h2>v3.0.1</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/checkout/commit/3df4ab11eba7bda6032a0… Release 4.0.0 (<a href="https://redirect.github.com/actions/checkout/issues/1447"&g… <li><a href="https://github.com/actions/checkout/commit/8b5e8b768746b50394015… Support fetching without the --progress option (<a href="https://redirect.github.com/actions/checkout/issues/1067"&g… <li><a href="https://github.com/actions/checkout/commit/97a652b80035363df47ba… Update default runtime to node20 (<a href="https://redirect.github.com/actions/checkout/issues/1436"&g… <li>See full diff in <a href="https://github.com/actions/checkout/compare/v3...v4">com… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3557 -- Commit Summary -- * github: [skip ci]: bump actions/checkout from 3 to 4 -- File Changes -- M .github/workflows/alpine.yml (2) M .github/workflows/codeql.yml (2) M .github/workflows/main.yml (2) M .github/workflows/pull_request.yml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3557.patch https://github.com/kamailio/kamailio/pull/3557.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3557 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3557(a)github.com>

2 1

git:master:873cd24f: github: [skip ci]: bump actions/checkout from 3 to 4
by Victor Seva 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: 873cd24f6aa49b0b567a858ac8ab1b60eba2ef5f URL: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-05T12:02:16+02:00 github: [skip ci]: bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… Patch: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 22cb34cd55b..7f2f5395734 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: print latest_commit run: echo ${{ github.sha }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5fde27446e3..b6837bbdd0b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1cd2b414452..04885eaf034 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - distribution: sid compilier: clang steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bf3168859de..bfba0702bdf 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: check-format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: wolletd/clang-format-checker(a)v1.10 with: target-ref: master @@ -33,7 +33,7 @@ jobs: - distribution: bookworm compilier: clang steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: |

1 0

[kamailio/kamailio] jwt: build jwt module for debian distributions (PR #3556)
by Emmanuel Schmidbauer 05 Sep '23

05 Sep '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I am not very familiar with the build/packaging process but I'm hoping we can get `jwt` module packaged for debian since the dependencies (`libjwt`) already ship with most recent debian distributions. Any feedback would be appreciated here, thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3556 -- Commit Summary -- * jwt: build jwt module for debian distributions -- File Changes -- M pkg/kamailio/deb/bionic/rules (1) M pkg/kamailio/deb/bookworm/rules (1) M pkg/kamailio/deb/bullseye/rules (1) M pkg/kamailio/deb/buster/rules (1) M pkg/kamailio/deb/debian/rules (1) M pkg/kamailio/deb/focal/rules (1) M pkg/kamailio/deb/jammy/rules (1) M pkg/kamailio/deb/jessie/rules (1) M pkg/kamailio/deb/precise/rules (1) M pkg/kamailio/deb/sid/rules (1) M pkg/kamailio/deb/stretch/rules (1) M pkg/kamailio/deb/trusty/rules (1) M pkg/kamailio/deb/wheezy/rules (1) M pkg/kamailio/deb/xenial/rules (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3556.patch https://github.com/kamailio/kamailio/pull/3556.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3556 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3556(a)github.com>

3 8

git:master:ff323e8d: dispatcher: new variable $dsg(key) to get attributes of a dispatcher group
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: ff323e8d7166fd781763608434da982e0918c7c9 URL: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-04T11:29:49+02:00 dispatcher: new variable $dsg(key) to get attributes of a dispatcher group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Patch: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 5ba70524359..0264a37bc7e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -184,6 +184,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -194,10 +195,15 @@ static int ds_warn_fixup(void** param, int param_no); static int pv_get_dsv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsv(pv_spec_p sp, str *in); +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_dsg(pv_spec_p sp, str *in); +static void ds_dsg_fetch(int dg); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, pv_parse_dsv, 0, 0, 0 }, + { {"dsg", (sizeof("dsg")-1)}, PVT_OTHER, pv_get_dsg, 0, + pv_parse_dsg, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -255,6 +261,8 @@ static cmd_export_t cmds[]={ 0, 0, 0}, {"ds_reload", (cmd_function)w_ds_reload, 0, 0, 0, ANY_ROUTE}, + {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1349,6 +1357,106 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) return -1; } +/** + * + */ +static int _pv_dsg_fetch = 1; + +/** + * + */ +static void ds_dsg_fetch(int dg) +{ + _pv_dsg_fetch = dg; +} + +/** + * + */ +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) +{ + int set; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + ds_dsg_fetch(set); + + return 1; +} + +/** + * + */ +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + ds_set_t *dsg; + int count = 0; + int active = 0; + int inactive = 0; + + if(param == NULL) { + return -1; + } + dsg = ds_list_lookup(_pv_dsg_fetch); + + if(dsg == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* count */ + return pv_get_sintval(msg, param, res, count); + case 1: /* active */ + return pv_get_sintval(msg, param, res, active); + case 2: /* inactive */ + return pv_get_sintval(msg, param, res, inactive); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_dsg(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 5: + if(strncmp(in->s, "count", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; + case 6: + if(strncmp(in->s, "active", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 1; + else + goto error; + break; + case 8: + if(strncmp(in->s, "inactive", 8) == 0) + sp->pvp.pvn.u.isname.name.n = 2; + else + goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV key: %.*s\n", in->len, in->s); + return -1; +} + /* KEMI wrappers */ /** *

1 0

git:master:f1ef0fa0: pv: added $viaX(params) to retun the parameters part of a Via body
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: f1ef0fa09983969066784f20a78ec604e7ab66d2 URL: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:20:20+02:00 pv: added $viaX(params) to retun the parameters part of a Via body --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Patch: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index fc3cc7d125b..b81f37bc9a5 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4507,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) case 6: if(strncmp(in->s, "branch", 6) == 0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "params", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -4580,6 +4582,11 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->i->value); } break; + case 8: /* params */ + if(vb->params.s != NULL && vb->params.len > 0) { + return pv_get_strval(msg, param, res, &vb->params); + } + break; default: return pv_get_null(msg, param, res);

1 0

git:master:4bbeaad2: dispatcher: helper function to return dispatcher set
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: 4bbeaad235f8db5216380c3b381071a45d469ee0 URL: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:49:33+02:00 dispatcher: helper function to return dispatcher set --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Patch: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9356fe65e1b..f64ab45ab16 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1598,6 +1598,25 @@ int ds_list_exist(int set) return 1; /* True */ } +/* + * Return a destination set + */ +ds_set_t *ds_list_lookup(int set) +{ + ds_set_t *si = NULL; + LM_DBG("looking for destination set [%d]\n", set); + + /* get the index of the set */ + si = ds_avl_find(_ds_list, set); + + if(si == NULL) { + LM_DBG("destination set [%d] not found\n", set); + return NULL; + } + LM_DBG("destination set [%d] found\n", set); + return si; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 1add2d7000f..7b4d59edb0f 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -160,7 +160,6 @@ int ds_log_sets(void); int ds_list_exist(int set); int ds_is_active_uri(sip_msg_t *msg, int group, str *uri); - int ds_load_unset(struct sip_msg *msg); int ds_load_update(struct sip_msg *msg); @@ -278,6 +277,8 @@ struct ds_filter_dest_cb_arg { ds_set_t *ds_get_list(void); int ds_get_list_nr(void); +ds_set_t *ds_list_lookup(int set); + int ds_ping_active_init(void); int ds_ping_active_get(void); int ds_ping_active_set(int v);

1 0

git:master:753a60bf: core: parser for overflow control parameters in via header
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: 753a60bf538985a54f8b9eafb98b7ce86b616a63 URL: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:08:07+02:00 core: parser for overflow control parameters in via header - RFC7339 --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Patch: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 9452ce51132..921911f1d17 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2817,3 +2817,40 @@ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q) } else return -1; } + + +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp) +{ + via_param_t *vp; + + if(vbp == NULL || ocp == NULL) { + return -1; + } + memset(ocp, 0, sizeof(via_oc_t)); + + for(vp = vbp->param_lst; vp != NULL; vp = vp->next) { + if(vp->name.len == 2 && strncasecmp(vp->name.s, "oc", 2) == 0) { + ocp->oc = 1; + } else if(vp->name.len == 7 + && strncasecmp(vp->name.s, "oc-algo", 7) == 0) { + if(vp->value.len > 0) { + ocp->algo.len = vp->value.len; + ocp->algo.s = vp->value.s; + } + } else if(vp->name.len == 11 + && strncasecmp(vp->name.s, "oc-validity", 11) == 0) { + if(vp->value.len > 0) { + str2ulong(&vp->value, &ocp->validity); + } + } else if(vp->name.len == 6 + && strncasecmp(vp->name.s, "oc-seq", 6) == 0) { + if(vp->value.len > 0) { + str2int(&vp->value, &ocp->seq); + } + } + } + return 0; +} diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index 4cd17ca3e19..bd0a4ffbb14 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -66,6 +66,15 @@ typedef struct via_param } via_param_t; +/* RFC7339 - overload control */ +typedef struct via_oc +{ + int oc; + str algo; + unsigned long validity; + unsigned int seq; +} via_oc_t; + /* Format: name/version/transport host:port;params comment */ /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ typedef struct via_body @@ -123,5 +132,9 @@ void free_via_list(struct via_body *vb); */ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q); +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp); #endif /* PARSE_VIA_H */

1 0

Kamailio Patching Issues
by Bin LIU 03 Sep '23

03 Sep '23

Halo Experts, So sorry to disturb you for the kamailio start failure issue I faced recently when doing patching from version 5.5.4 to 5.5.6. Really appreciated if you could give me some assistance on it ! And attached is the start log. Thanks. Best regards, Louis LIU Senior Software Engineer (Cloud Platform && Audio/Video Intercom) M +86 18575580920 8F-A CES Building,No.3099 Global Offer Innovation E bin.liu2(a)se.com<mailto:bin.liu2@se.com> Keyuan South Road, Nanshan District Home & Distribution Division, Energy Management Shenzhen, China [cid:image001.png@01D9CAE5.A472D190] Download mySchneider app<https://www.se.com/ww/en/work/support/myschneider-app/> 24/7 support Mobile catalog. Acces to expert help. Internal

2 4

git:master:b56110ac: usrloc: check for enough space to build aor on udomain_contact_expired_cb()
by Daniel-Constantin Mierla 29 Aug '23

29 Aug '23

Module: kamailio Branch: master Commit: b56110aca34a5633029654ae457ff3ed4424e62f URL: https://github.com/kamailio/kamailio/commit/b56110aca34a5633029654ae457ff3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-29T17:18:35+02:00 usrloc: check for enough space to build aor on udomain_contact_expired_cb() --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b56110aca34a5633029654ae457ff3e… Patch: https://github.com/kamailio/kamailio/commit/b56110aca34a5633029654ae457ff3e… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 578ae208aa4..43278fca004 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1071,7 +1071,7 @@ int udomain_contact_expired_cb(db1_con_t *_c, udomain_t *_d) continue; } user.len = strlen(user.s); - if(user.len < AORBUF_SIZE) { + if(user.len + 1 < AORBUF_SIZE) { memcpy(aorbuf, user.s, user.len); aor.s = aorbuf; aor.len = user.len; @@ -1090,7 +1090,7 @@ int udomain_contact_expired_cb(db1_con_t *_c, udomain_t *_d) if(ul_use_domain) { domain.s = (char *)VAL_STRING(ROW_VALUES(row) + 20); domain.len = strlen(domain.s); - if(domain.len + aor.len < AORBUF_SIZE) { + if(domain.len + aor.len + 2 < AORBUF_SIZE) { aorbuf[aor.len] = '@'; memcpy(aorbuf + aor.len + 1, domain.s, domain.len); aor.len += domain.len + 1;

1 0

git:5.7:1cf38982: crypto: SHA1_Init deprecated at openssl 3.0
by Victor Seva 29 Aug '23

29 Aug '23

Module: kamailio Branch: 5.7 Commit: 1cf389829bebad2013a6cf3b4ab919fa6b78a7c2 URL: https://github.com/kamailio/kamailio/commit/1cf389829bebad2013a6cf3b4ab919f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-29T16:11:54+02:00 crypto: SHA1_Init deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). related to #3502 (cherry picked from commit e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483) --- Modified: src/modules/crypto/crypto_uuid.c --- Diff: https://github.com/kamailio/kamailio/commit/1cf389829bebad2013a6cf3b4ab919f… Patch: https://github.com/kamailio/kamailio/commit/1cf389829bebad2013a6cf3b4ab919f… --- diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index a4049e62821..63a9db07df6 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -169,14 +169,33 @@ static inline int crypto_format_rfc4122_uuid(char *sbuf, size_t sbuf_len, */ void crypto_generate_callid(str* callid) { +#if OPENSSL_VERSION_NUMBER > 0x030000000L + EVP_MD_CTX *crypto_ctx = NULL; +#else static SHA_CTX crypto_ctx = {0}; +#endif static unsigned char crypto_buf[SHA_DIGEST_LENGTH] = {0}; static char crypto_sbuf[UUID_LEN] = {0}; crypto_inc_counter(crypto_callid_counter, CTR_LEN); + +#if OPENSSL_VERSION_NUMBER > 0x030000000L + if((crypto_ctx = EVP_MD_CTX_new()) == NULL) { + LM_ERR("can't get new context\n"); + callid->s = NULL; + callid->len = 0; + return; + } + EVP_DigestInit_ex(crypto_ctx, EVP_sha1(), NULL); + EVP_DigestUpdate(crypto_ctx, crypto_callid_seed, SEED_LEN); + EVP_DigestUpdate(crypto_ctx, crypto_callid_counter, CTR_LEN); + EVP_DigestFinal_ex(crypto_ctx, crypto_buf, NULL); + EVP_MD_CTX_free(crypto_ctx); +#else SHA1_Init(&crypto_ctx); SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN); SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN); SHA1_Final(crypto_buf, &crypto_ctx); +#endif crypto_format_rfc4122_uuid(crypto_sbuf, sizeof(crypto_sbuf), crypto_buf, sizeof(crypto_buf)); callid->s = crypto_sbuf;

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,buster #2475
by kamailio＠sipwise.com 29 Aug '23

29 Aug '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 47.10 KB...] Get: 92 http://security.debian.org/debian-security buster/updates/main amd64 ruby2.5 amd64 2.5.5-3+deb10u6 [401 kB] Get: 93 http://deb.debian.org/debian buster/main amd64 libmongoc-dev amd64 1.14.0-1 [50.5 kB] Get: 94 http://deb.debian.org/debian buster/main amd64 libodbc1 amd64 2.3.6-0.1 [223 kB] Get: 95 http://deb.debian.org/debian buster/main amd64 libpci3 amd64 1:3.5.2-1 [56.5 kB] Get: 96 http://deb.debian.org/debian buster/main amd64 libpci-dev amd64 1:3.5.2-1 [76.9 kB] Get: 97 http://security.debian.org/debian-security buster/updates/main amd64 libruby2.5 amd64 2.5.5-3+deb10u6 [3442 kB] Get: 98 http://deb.debian.org/debian buster/main amd64 libperl-dev amd64 5.28.1-6+deb10u1 [3607 kB] Get: 99 http://security.debian.org/debian-security buster/updates/main amd64 libsnmp-base all 5.7.3+dfsg-5+deb10u4 [1595 kB] Get: 100 http://security.debian.org/debian-security buster/updates/main amd64 libsnmp30 amd64 5.7.3+dfsg-5+deb10u4 [2319 kB] Get: 101 http://security.debian.org/debian-security buster/updates/main amd64 libsnmp-dev amd64 5.7.3+dfsg-5+deb10u4 [1099 kB] Get: 102 http://deb.debian.org/debian buster/main amd64 libphonenumber7 amd64 7.1.0-5+b4 [192 kB] Get: 103 http://security.debian.org/debian-security buster/updates/main amd64 libsqlite3-dev amd64 3.27.2-3+deb10u2 [787 kB] Get: 104 http://security.debian.org/debian-security buster/updates/main amd64 libxml2-dev amd64 2.9.4+dfsg1-7+deb10u6 [785 kB] Get: 105 http://security.debian.org/debian-security buster/updates/main amd64 libxslt1.1 amd64 1.1.32-2.2~deb10u2 [236 kB] Get: 106 http://security.debian.org/debian-security buster/updates/main amd64 python2.7-dev amd64 2.7.16-2+deb10u2 [297 kB] Get: 107 http://security.debian.org/debian-security buster/updates/main amd64 python3.7-dev amd64 3.7.3-2+deb10u5 [513 kB] Get: 108 http://security.debian.org/debian-security buster/updates/main amd64 ruby2.5-dev amd64 2.5.5-3+deb10u6 [416 kB] Get: 109 http://security.debian.org/debian-security buster/updates/main amd64 xsltproc amd64 1.1.32-2.2~deb10u2 [122 kB] Get: 110 http://security.debian.org/debian-security buster/updates/main amd64 libjson-c3 amd64 0.12.1+ds-2+deb10u1 [27.3 kB] Get: 111 http://security.debian.org/debian-security buster/updates/main amd64 libjson-c-dev amd64 0.12.1+ds-2+deb10u1 [39.1 kB] Get: 112 http://security.debian.org/debian-security buster/updates/main amd64 libldap2-dev amd64 2.4.47+dfsg-3+deb10u7 [332 kB] Err http://deb.debian.org/debian buster/main amd64 libphonenumber-dev amd64 7.1.0-5+b4 502 Gateway Error [IP: 199.232.26.132 80] Get: 113 http://deb.debian.org/debian buster/main amd64 libpython2-dev amd64 2.7.16-1 [20.9 kB] Get: 114 http://deb.debian.org/debian buster/main amd64 libpython-dev amd64 2.7.16-1 [20.9 kB] Get: 115 http://deb.debian.org/debian buster/main amd64 libpython3-dev amd64 3.7.3-1 [20.1 kB] Get: 116 http://deb.debian.org/debian buster/main amd64 librabbitmq4 amd64 0.9.0-0.2 [41.2 kB] Get: 117 http://deb.debian.org/debian buster/main amd64 librabbitmq-dev amd64 0.9.0-0.2 [66.6 kB] Get: 118 http://deb.debian.org/debian buster/main amd64 libradcli4 amd64 1.2.6-4 [37.8 kB] Get: 119 http://deb.debian.org/debian buster/main amd64 libradcli-dev amd64 1.2.6-4 [40.2 kB] Get: 120 http://deb.debian.org/debian buster/main amd64 rubygems-integration all 1.11+deb10u1 [5212 B] Get: 121 http://deb.debian.org/debian buster/main amd64 ruby amd64 1:2.5.1 [11.3 kB] Get: 122 http://deb.debian.org/debian buster/main amd64 rake all 12.3.1-3+deb10u1 [67.1 kB] Get: 123 http://deb.debian.org/debian buster/main amd64 ruby-did-you-mean all 1.2.1-1 [14.4 kB] Get: 124 http://deb.debian.org/debian buster/main amd64 ruby-minitest all 5.11.3-1 [54.8 kB] Get: 125 http://deb.debian.org/debian buster/main amd64 ruby-net-telnet all 0.1.1-2 [12.5 kB] Get: 126 http://deb.debian.org/debian buster/main amd64 ruby-power-assert all 1.1.1-1 [10.9 kB] Get: 127 http://deb.debian.org/debian buster/main amd64 ruby-test-unit all 3.2.8-1 [72.4 kB] Get: 128 http://deb.debian.org/debian buster/main amd64 ruby-xmlrpc all 0.3.0-2 [23.7 kB] Get: 129 http://deb.debian.org/debian buster/main amd64 libsctp1 amd64 1.0.18+dfsg-1 [28.3 kB] Get: 130 http://deb.debian.org/debian buster/main amd64 libsctp-dev amd64 1.0.18+dfsg-1 [81.5 kB] Get: 131 http://deb.debian.org/debian buster/main amd64 libsensors-config all 1:3.5.0-3 [31.6 kB] Get: 132 http://deb.debian.org/debian buster/main amd64 libsensors5 amd64 1:3.5.0-3 [52.6 kB] Get: 133 http://deb.debian.org/debian buster/main amd64 libsensors4-dev amd64 1:3.5.0-3 [63.0 kB] Get: 134 http://deb.debian.org/debian buster/main amd64 libwrap0 amd64 7.6.q-28 [58.7 kB] Get: 135 http://deb.debian.org/debian buster/main amd64 libwrap0-dev amd64 7.6.q-28 [21.6 kB] Get: 136 http://deb.debian.org/debian buster/main amd64 libunistring-dev amd64 0.9.10-1 [550 kB] Get: 137 http://deb.debian.org/debian buster/main amd64 odbcinst1debian2 amd64 2.3.6-0.1 [78.1 kB] Get: 138 http://deb.debian.org/debian buster/main amd64 odbcinst amd64 2.3.6-0.1 [48.4 kB] Get: 139 http://deb.debian.org/debian buster/main amd64 python2-dev amd64 2.7.16-1 [1212 B] Get: 140 http://deb.debian.org/debian buster/main amd64 python-dev amd64 2.7.16-1 [1192 B] Get: 141 http://deb.debian.org/debian buster/main amd64 python3-dev amd64 3.7.3-1 [1264 B] Get: 142 http://deb.debian.org/debian buster/main amd64 ruby-dev amd64 1:2.5.1 [10.2 kB] Get: 143 http://deb.debian.org/debian buster/main amd64 unixodbc-dev amd64 2.3.6-0.1 [261 kB] Fetched 150 MB in 7s (21.2 MB/s) E: Failed to fetch http://deb.debian.org/debian/pool/main/libp/libphonenumber/libphonenumber-d…: 502 Gateway Error [IP: 199.232.26.132 80] E: Unable to fetch some packages; try '-o APT::Get::Fix-Missing=true' to continue with missing packages Reading package lists... Building dependency tree... Reading state information... Reading extended state information... Initializing package states... Writing extended state information... Building tag database... E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: new cache content 'libradcli-dev_1.2.6-4_amd64.deb' added I: new cache content 'libjson-c3_0.12.1+ds-2+deb10u1_amd64.deb' added I: new cache content 'libpython2-stdlib_2.7.16-1_amd64.deb' added I: new cache content 'libxslt1.1_1.1.32-2.2~deb10u2_amd64.deb' added I: new cache content 'libpci3_1%3a3.5.2-1_amd64.deb' added I: new cache content 'python2_2.7.16-1_amd64.deb' added I: new cache content 'libsnmp30_5.7.3+dfsg-5+deb10u4_amd64.deb' added I: new cache content 'libmemcachedutil2_1.0.18-4.2_amd64.deb' added I: new cache content 'libradcli4_1.2.6-4_amd64.deb' added I: new cache content 'libboost-serialization1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libsqlite3-dev_3.27.2-3+deb10u2_amd64.deb' added I: new cache content 'libsensors5_1%3a3.5.0-3_amd64.deb' added I: new cache content 'rake_12.3.1-3+deb10u1_all.deb' added I: new cache content 'python_2.7.16-1_amd64.deb' added I: new cache content 'libprotobuf-dev_3.6.1.3-2+deb10u1_amd64.deb' added I: new cache content 'erlang-base_1%3a22.2.7+dfsg-1+deb10u1_amd64.deb' added I: new cache content 'bison_2%3a3.3.2.dfsg-1_amd64.deb' added I: new cache content 'libpython2.7-dev_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'ruby-dev_1%3a2.5.1_amd64.deb' added I: new cache content 'ruby2.5_2.5.5-3+deb10u6_amd64.deb' added I: new cache content 'odbcinst1debian2_2.3.6-0.1_amd64.deb' added I: new cache content 'libboost-atomic1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libmongoc-dev_1.14.0-1_amd64.deb' added I: new cache content 'libpcre2-32-0_10.32-5+deb10u1_amd64.deb' added I: new cache content 'liblua5.1-0_5.1.5-8.1+b2_amd64.deb' added I: new cache content 'libboost-system-dev_1.67.0.1_amd64.deb' added I: new cache content 'libpcre2-posix0_10.32-5+deb10u1_amd64.deb' added I: new cache content 'dh-systemd_12.1.1_all.deb' added I: new cache content 'ruby-net-telnet_0.1.1-2_all.deb' added I: new cache content 'ca-certificates_20200601~deb10u2_all.deb' added I: new cache content 'libdb5.3-dev_5.3.28+dfsg1-0.5_amd64.deb' added I: new cache content 'libpq-dev_11.20-0+deb10u1_amd64.deb' added I: new cache content 'rubygems-integration_1.11+deb10u1_all.deb' added I: new cache content 'libboost-date-time1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libltdl7_2.4.6-9_amd64.deb' added I: new cache content 'libboost1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'python2.7-dev_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'libudev-dev_241-7~deb10u10_amd64.deb' added I: new cache content 'libmonosgen-2.0-dev_5.18.0.240+dfsg-3+deb10u1_amd64.deb' added I: new cache content 'libboost-dev_1.67.0.1_amd64.deb' added I: new cache content 'libwrap0_7.6.q-28_amd64.deb' added I: new cache content 'libpython3-dev_3.7.3-1_amd64.deb' added I: new cache content 'libbson-dev_1.14.0-1_amd64.deb' added I: new cache content 'librabbitmq-dev_0.9.0-0.2_amd64.deb' added I: new cache content 'libboost-thread-dev_1.67.0.1_amd64.deb' added I: new cache content 'openssl_1.1.1n-0+deb10u6_amd64.deb' added I: new cache content 'libboost-system1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libjson-c-dev_0.12.1+ds-2+deb10u1_amd64.deb' added I: new cache content 'xsltproc_1.1.32-2.2~deb10u2_amd64.deb' added I: new cache content 'libpcre2-dev_10.32-5+deb10u1_amd64.deb' added I: new cache content 'sgml-base_1.29_all.deb' added I: new cache content 'libboost-chrono1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'ruby-did-you-mean_1.2.1-1_all.deb' added I: new cache content 'libmonosgen-2.0-1_5.18.0.240+dfsg-3+deb10u1_amd64.deb' added I: new cache content 'libboost-filesystem1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libprocps7_2%3a3.3.15-2_amd64.deb' added I: new cache content 'libmemcached11_1.0.18-4.2_amd64.deb' added I: new cache content 'docbook-xml_4.5-8_all.deb' added I: new cache content 'python3.7-dev_3.7.3-2+deb10u5_amd64.deb' added I: new cache content 'libmono-2.0-dev_5.18.0.240+dfsg-3+deb10u1_amd64.deb' added I: new cache content 'erlang-dev_1%3a22.2.7+dfsg-1+deb10u1_amd64.deb' added I: new cache content 'libsensors4-dev_1%3a3.5.0-3_amd64.deb' added I: new cache content 'liblua5.1-0-dev_5.1.5-8.1+b2_amd64.deb' added I: new cache content 'libsctp-dev_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libboost-chrono1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libhashkit-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'ruby_1%3a2.5.1_amd64.deb' added I: new cache content 'libsasl2-dev_2.1.27+dfsg-1+deb10u2_amd64.deb' added I: new cache content 'xml-core_0.18+nmu1_all.deb' added I: new cache content 'librabbitmq4_0.9.0-0.2_amd64.deb' added I: new cache content 'dh-python_3.20190308_all.deb' added I: new cache content 'libgeocoding7_7.1.0-5+b4_amd64.deb' added I: new cache content 'libpcre2-8-0_10.32-5+deb10u1_amd64.deb' added I: new cache content 'libpq5_11.20-0+deb10u1_amd64.deb' added I: new cache content 'libreadline-dev_7.0-5_amd64.deb' added I: new cache content 'libpci-dev_1%3a3.5.2-1_amd64.deb' added I: new cache content 'libncurses-dev_6.1+20181013-2+deb10u3_amd64.deb' added I: new cache content 'ruby2.5-dev_2.5.5-3+deb10u6_amd64.deb' added I: new cache content 'libicu-dev_63.1-6+deb10u3_amd64.deb' added I: new cache content 'ruby-minitest_5.11.3-1_all.deb' added I: new cache content 'python2-dev_2.7.16-1_amd64.deb' added I: new cache content 'sgml-data_2.0.11_all.deb' added I: new cache content 'libgeoip-dev_1.6.12-1_amd64.deb' added I: new cache content 'python2.7-minimal_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'geoip-bin_1.6.12-1_amd64.deb' added I: new cache content 'python3-dev_3.7.3-1_amd64.deb' added I: new cache content 'libboost-thread1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'python-minimal_2.7.16-1_amd64.deb' added I: new cache content 'libboost-thread1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'lsb-base_10.2019051400_all.deb' added I: new cache content 'libprotobuf17_3.6.1.3-2+deb10u1_amd64.deb' added I: new cache content 'ruby-test-unit_3.2.8-1_all.deb' added I: new cache content 'python2.7_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'libsnmp-base_5.7.3+dfsg-5+deb10u4_all.deb' added I: new cache content 'libsnappy-dev_1.1.7-1_amd64.deb' added I: new cache content 'libbison-dev_2%3a3.3.2.dfsg-1_amd64.deb' added I: new cache content 'python-dev_2.7.16-1_amd64.deb' added I: new cache content 'libboost-date-time1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libdb-dev_5.3.1+nmu1_amd64.deb' added I: new cache content 'python2-minimal_2.7.16-1_amd64.deb' added I: new cache content 'libboost-serialization1.67-dev_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libsctp1_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libperl-dev_5.28.1-6+deb10u1_amd64.deb' added I: new cache content 'libhashkit2_1.0.18-4.2_amd64.deb' added I: new cache content 'libboost-atomic1.67.0_1.67.0-13+deb10u1_amd64.deb' added I: new cache content 'libltdl-dev_2.4.6-9_amd64.deb' added I: new cache content 'libxml2-dev_2.9.4+dfsg1-7+deb10u6_amd64.deb' added I: new cache content 'libmaxminddb0_1.3.2-1+deb10u1_amd64.deb' added I: new cache content 'icu-devtools_63.1-6+deb10u3_amd64.deb' added I: new cache content 'libpython-dev_2.7.16-1_amd64.deb' added I: new cache content 'libsnmp-dev_5.7.3+dfsg-5+deb10u4_amd64.deb' added I: new cache content 'libprotobuf-lite17_3.6.1.3-2+deb10u1_amd64.deb' added I: new cache content 'libpython2.7-minimal_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'libmaxminddb-dev_1.3.2-1+deb10u1_amd64.deb' added I: new cache content 'libmongoc-1.0-0_1.14.0-1_amd64.deb' added I: new cache content 'libwrap0-dev_7.6.q-28_amd64.deb' added I: new cache content 'ruby-xmlrpc_0.3.0-2_all.deb' added I: new cache content 'libjansson-dev_2.12-1_amd64.deb' added I: new cache content 'libmnl0_1.0.4-2_amd64.deb' added I: new cache content 'libodbc1_2.3.6-0.1_amd64.deb' added I: new cache content 'libpython3.7-dev_3.7.3-2+deb10u5_amd64.deb' added I: new cache content 'procps_2%3a3.3.15-2_amd64.deb' added I: new cache content 'libphonenumber7_7.1.0-5+b4_amd64.deb' added I: new cache content 'libpython2.7_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'libunistring-dev_0.9.10-1_amd64.deb' added I: new cache content 'libpython3.7_3.7.3-2+deb10u5_amd64.deb' added I: new cache content 'libbson-1.0-0_1.14.0-1_amd64.deb' added I: new cache content 'libgeoip1_1.6.12-1_amd64.deb' added I: new cache content 'libsensors-config_1%3a3.5.0-3_all.deb' added I: new cache content 'flex_2.6.4-6.2_amd64.deb' added I: new cache content 'odbcinst_2.3.6-0.1_amd64.deb' added I: new cache content 'libpython-stdlib_2.7.16-1_amd64.deb' added I: new cache content 'ruby-power-assert_1.1.1-1_all.deb' added I: new cache content 'libldap2-dev_2.4.47+dfsg-3+deb10u7_amd64.deb' added I: new cache content 'libruby2.5_2.5.5-3+deb10u6_amd64.deb' added I: new cache content 'libmemcached-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'libpython2.7-stdlib_2.7.16-2+deb10u2_amd64.deb' added I: new cache content 'libmnl-dev_1.0.4-2_amd64.deb' added I: new cache content 'unixodbc-dev_2.3.6-0.1_amd64.deb' added I: new cache content 'libexpat1-dev_2.2.6-2+deb10u6_amd64.deb' added I: new cache content 'libpcre2-16-0_10.32-5+deb10u1_amd64.deb' added I: new cache content 'libpython2-dev_2.7.16-1_amd64.deb' added I: new cache content 'libjansson4_2.12-1_amd64.deb' added I: unmounting /tmp/apt-jdg_XKHGfc filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.27292 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/buster-amd64.building.26312 + '[' -r /run/lock/buster-amd64.update.26312 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.9cqAojKJMM ']' + rm -rf /tmp/tmp.9cqAojKJMM + '[' -n /tmp/apt-jdg_XKHGfc ']' + sudo rm -rf /tmp/apt-jdg_XKHGfc + '[' -n 2045 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=20 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Aug 29 00:58:24 UTC 2023 [running 20 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Aug 29 00:58:24 UTC 2023 [running 20 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

[kamailio/kamailio] Kamailio 5.6.4 crashing when using http_connect with libcrypto.so.1.1 on bullseye (Issue #3539)
by AndreasTarp 28 Aug '23

28 Aug '23

### Description Hi, we are experiencing Kamailio 5.6.4 Loadbalancers nodes crashing from time to time (about 10 crashes in last 6 weeks) in our production environment. The nodes are running on Debian Bullseye on virtual machines. The Core Dumps written by Kamailio are always pointing to a curl request (http_connect function) we are performing for each call to retrieve necessary data from external node. The curl request is quite simple, we are sending a requst to something like https://example.com/<SIPusername> and are only interested in the result code (200 or 404) for our next decisions in kamailio configuration. Some month ago after introducing the curl request into our kamailio configuration we were experiencing several crashes per node and day and found the hint to start kamailio with extra startup parameter --atexit=no. This improved situation a lot, but problem still occurs on lower frequency. Maybe interesting for this issue: For historical reasons we are using different kamailio nodes for our customers using SIP via UDP and TCP. Both Kamailios used for UDP and TCP SIP Traffic are running same Kamailio version and nearly identical Kamailio configuration. Only TCP Kamailios are affected. But of course it is not clear if TCP usage in SIP message from customer is the main reason why it chrashes or maybe one / or some users are triggering the problem due to special device behavior? We have seen similar issues for openssl3 being resolved with https://github.com/kamailio/kamailio/pull/3482, but here we are still using openssl version 1.1.1n on Bullseye. Below anonymized output from gdb (IPs, URLs, usernames removed): ### Troubleshooting #### Reproduction #### Debugging Data ``` # gdb /usr/sbin/kamailio /var/cores/core_kamailio_1357620_11_111_1691754786 GNU gdb (Debian 10.1-1.7) 10.1.90.20210103-git Copyright (C) 2021 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio... Reading symbols from /usr/lib/debug/.build-id/2f/4a56865957849818b0f870fc3f29d01216a3e3.debug... warning: Can't open file /dev/zero (deleted) during file-backed mapping note processing [New LWP 1357620] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_sip_lb_tcp_de.pid -f /etc/kama'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f3ccd37903a in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 (gdb) bt full #0 0x00007f3ccd37903a in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #1 0x00007f3ccd37922c in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #2 0x00007f3ccd379b49 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #3 0x00007f3ccd3794d7 in ASN1_item_ex_i2d () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #4 0x00007f3ccd379bb6 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #5 0x00007f3ccd4dd43c in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #6 0x00007f3ccd4dd91d in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #7 0x00007f3ccd4ddef7 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #8 0x00007f3ccd37818c in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #9 0x00007f3ccd378b56 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #10 0x00007f3ccd378dc1 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #11 0x00007f3ccd378468 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #12 0x00007f3ccd378b56 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #13 0x00007f3ccd378dc1 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #14 0x00007f3ccd378468 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #15 0x00007f3ccd378eee in ASN1_item_ex_d2i () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #16 0x00007f3ccd378f6b in ASN1_item_d2i () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #17 0x00007f3ccd46cbac in PEM_X509_INFO_read_bio () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #18 0x00007f3ccd4ce093 in X509_load_cert_crl_file () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #19 0x00007f3ccd4ce1e2 in ?? () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #20 0x00007f3ccd4d0faf in X509_STORE_load_locations () from /lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #21 0x00007f3c4c526893 in ?? () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #22 0x00007f3c4c527ddf in ?? () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #23 0x00007f3c4c528ea1 in ?? () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #24 0x00007f3c4c4e8805 in ?? () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #25 0x00007f3c4c4fe0c9 in ?? () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #26 0x00007f3c4c4ff286 in curl_multi_perform () from /lib/x86_64-linux-gnu/libcurl.so.4 No symbol table info available. #27 0x00007f3c4c4d5a93 in curl_easy_perform () from /lib/x86_64-linux-gnu/libcurl.so.4 --Type <RET> for more, q to quit, c to continue without paging--c No symbol table info available. #28 0x00007f3c4c56ce92 in curL_request_url (_m=0x7f3ccfb31208, _met=0x0, _url=0x7f3ccf9f4c90 "https://<someurl>/<username>", _dst=0x7fff5ab37eb0, params=0x7fff5ab37d50) at functions.c:274 totaltime = 1.657809211691619e-316 connecttime = 5.2824500700663664e-290 curl = 0x5579509e1210 res = CURLE_OK at = 0x0 stream = {buf = 0x0, curr_size = 0, pos = 0, max_size = 0} stat = 0 rval = {s = 0x0, len = 0} download_size = 0 headerlist = 0x0 __func__ = "curL_request_url" #29 0x00007f3c4c577964 in curl_con_query_url_f (_m=0x7f3ccfb31208, connection=0x7fff5ab37fb0, url=0x7fff5ab37fc0, result=0x7fff5ab37eb0, contenttype=0x0, post=0x0, failover=0) at functions.c:601 conn = 0x7f3c4d2c2bc8 pconn = 0x7f3ccf8dafd8 urlbuf = 0x7f3ccf9f4c90 "https://<someurl>/<username>" postdata = 0x0 failovercon = 0x0 query_params = {username = 0x0, secret = 0x0, contenttype = 0x7f3c4c5949cb "text/plain", post = 0x0, clientcert = 0x0, clientkey = 0x0, cacert = 0x0, ciphersuites = 0x0, http_proxy = 0x0, failovercon = 0x0, useragent = 0x7f3ccf8db468 "kamailio (5.6.4 (x86_64/linux))", hdrs = 0x0, netinterface = 0x0, authmethod = 3, http_proxy_port = 0, tlsversion = 0, verify_peer = 1, verify_host = 2, timeout = 4, http_follow_redirect = 0, oneline = 0, maxdatasize = 0, keep_connections = 0, pconn = 0x7f3ccf8dafd8} maxdatasize = 0 res = 32767 __func__ = "curl_con_query_url_f" #30 0x00007f3c4c578291 in curl_con_query_url (_m=0x7f3ccfb31208, connection=0x7fff5ab37fb0, url=0x7fff5ab37fc0, result=0x7fff5ab37eb0, contenttype=0x0, post=0x0) at functions.c:633 No locals. #31 0x00007f3c4c582a6e in ki_curl_connect_helper (_m=0x7f3ccfb31208, con=0x7fff5ab37fb0, url=0x7fff5ab37fc0, dst=0x7f3ccf99c558) at http_client.c:614 result = {s = 0x0, len = 0} val = {rs = {s = 0x7fff5ab38020 "P\200\263Z\377\177", len = 0}, ri = 944, flags = 32572} ret = 0 __func__ = "ki_curl_connect_helper" #32 0x00007f3c4c584257 in w_curl_connect (_m=0x7f3ccfb31208, _con=0x7f3ccf9aa750 "http_endpoint_primary", _url=0x7f3ccf99c410 "\260Ù\317<\177", _result=0x7f3ccf99c558 "\004") at http_client.c:674 con = {s = 0x7f3ccf9aa750 "http_endpoint_primary", len = 12} url = {s = 0x7f3ccf865060 "/routing/<username>", len = 22} dst = 0x7f3ccf99c558 __func__ = "w_curl_connect" #33 0x000055794f7c3522 in do_action (h=0x7fff5ab388c0, a=0x7f3ccf9ad758, msg=0x7f3ccfb31208) at core/action.c:1097 ret = -5 v = 0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000`\206\263Z\377\177\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "`\206\263Z\377\177\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "`\206\263Z\377\177\000\000(\361\232\317<\177\000", __u6_addr16 = {34400, 23219, 32767, 0, 61736, 53146, 32572, 0}, __u6_addr32 = {1521714784, 32767, 3483037992, 32572}}}, sin6_scope_id = 3484619272}, sas = {ss_family = 0, __ss_padding = "\000\000\000\000\000\000`\206\263Z\377\177\000\000(\361\232\317<\177\000\000\b\022\263\317<\177\000\000д\263Z\377\177\000\000\000\000\000\000\n\000\000\000p\365\244\321<\177\000\000(q\247\317<\177\000\000\t\004\000\000\000\000\000\000PN\270`<\177\000\000\t\004\000\000\000\000\000\000\060\067\200[<\177\000\000\000\000\000\000\020\000\000\000\200\207\263Z\377\177\000\000\345;\251OyU\000", __ss_align = 139899159386304}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = 0x55794fabae7c <fm_info+46> "H\213E\370H\213P\bH\213E\340H\211\020H\213E\340H\307@(\b" new_uri = 0x7f3c4c74b3d4 <pkg_proc_update_stats+130> "H\213\r\025s" end = 0x7f3c5b803728 "\310\030\213\317<\177" crt = 0x7fff5ab38210 "p\202\263Z\377\177" cmd = 0x7f3ccf8d0038 len = -811585760 user = 32572 uri = {user = {s = 0x8b900000005 <error: Cannot access memory at address 0x8b900000005>, len = 1338089616}, passwd = {s = 0x55794fc17ec1 "core: core/msg_translator.c", len = 1040}, host = {s = 0x7f3c60b84e08 "@\004", len = 1294704640}, port = {s = 0x400000030 <error: Cannot access memory at address 0x400000030>, len = 1338365855}, params = {s = 0x5ab38400 <error: Cannot access memory at address 0x5ab38400>, len = -1277437696}, sip_params = {s = 0x7fff5ab38400 "", len = 1336626667}, headers = {s = 0x55794fc1786b "core", len = -810346320}, port_no = 41104, proto = 20417, type = 21881, flags = (URI_USER_NORMALIZE | unknown: 0x4fc17ec0), transport = {s = 0x410 <error: Cannot access memory at address 0x410>, len = 1294704640}, ttl = {s = 0x8800000000 <error: Cannot access memory at address 0x8800000000>, len = -1277437696}, user_param = {s = 0x0, len = 1622691336}, maddr = {s = 0x7f3c60b84e08 "@\004", len = 1294704640}, method = {s = 0x0, len = 0}, lr = {s = 0x7f3ccf8b18f8 "耱\317<\177", len = -812967672}, r2 = {s = 0x7f3ccf8b1240 "\300\227\261\317<\177", len = -812969392}, gr = {s = 0x7f3ccf8b18c8 "\006", len = 1336651388}, transport_val = {s = 0x7fff5ab38400 "", len = -813359088}, ttl_val = {s = 0x7fff5ab38400 "", len = -813359088}, user_param_val = {s = 0x7fff5ab38440 "\320/\240\317<\177", len = 1282716628}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x2000000 <error: Cannot access memory at address 0x2000000>, len = 28927392}, lr_val = {s = 0x3fad18 <error: Cannot access memory at address 0x3fad18>, len = 4627040}, r2_val = {s = 0x7f3ccfa03028 "\270", len = -813359088}, gr_val = {s = 0x65 <error: Cannot access memory at address 0x65>, len = -1277437696}} next_hop = {user = {s = 0x7f3ccfa02fd0 "\020\001", len = -813359088}, passwd = {s = 0x7f3ccfa02fd0 "\020\001", len = -813359088}, host = {s = 0x0, len = 1336651388}, port = {s = 0x7fff5ab384b0 "", len = -813359088}, params = {s = 0xb00000018 <error: Cannot access memory at address 0xb00000018>, len = -813359088}, sip_params = {s = 0x7fff5ab384f0 "\340p\247\317<\177", len = 1282716628}, headers = {s = 0x55794fc033a8 <__func__.7> "free_lump", len = 0}, port_no = 0, proto = 512, type = ERROR_URI_T, flags = (unknown: 0x1b969a0), transport = {s = 0x3faac8 <error: Cannot access memory at address 0x3faac8>, len = 4626016}, ttl = {s = 0x7f3ccfa77160 "8", len = -813359088}, user_param = {s = 0x6a <error: Cannot access memory at address 0x6a>, len = -1277437696}, maddr = {s = 0x7f3ccfa770e0 "\270", len = -813359088}, method = {s = 0x7f3ccfa770e0 "\270", len = -813359088}, lr = {s = 0x7f3ccfa75100 "\270", len = 0}, r2 = {s = 0x7fff5ab38620 "`\206\263Z\377\177", len = 1336633822}, gr = {s = 0x0, len = -1277437696}, transport_val = {s = 0x55794fc02ce0 "core", len = -810346320}, ttl_val = {s = 0x55794fc03910 <__func__.1> "free_duped_lump_list", len = 1337994469}, user_param_val = {s = 0x7f3ccfa77128 "", len = -813359088}, maddr_val = {s = 0x7fff5ab38620 "`\206\263Z\377\177", len = 1333836165}, method_val = {s = 0x0, len = -811585168}, lr_val = {s = 0x7f3ccf852010 "\001", len = -811110176}, r2_val = {s = 0x46da90 <error: Cannot access memory at address 0x46da90>, len = -811119128}, gr_val = {s = 0x7fff5ab3861c "", len = 1521714720}} u = 0x7f3ccf852010 port = 0 dst_host = 0x7fff5ab38550 i = -811585760 flags = 0 avp = 0x7fff5ab38220 st = {flags = 0, id = 0, name = {n = 1338365855, s = {s = 0x54fc5d79f <error: Cannot access memory at address 0x54fc5d79f>, len = 1521714064}, re = 0x54fc5d79f}, avp = 0x3e0792b00000000} sct = 0x55794f8cea0d <process_lumps+49737> sjt = 0x7fff5ab38270 rve = 0x7f3ccf852010 mct = 0x7fff5ab38260 rv = 0x2000000 rv1 = 0x55794fabae7c <fm_info+46> c1 = {cache_type = 1521714736, val_type = 32767, c = {avp_val = {n = 1334728331, s = {s = 0x55794f8e568b <branch_builder+358> "\203\370\377u\020\353\a\270", len = 1521714736}, re = 0x55794f8e568b <branch_builder+358>}, pval = {rs = {s = 0x55794f8e568b <branch_builder+358> "\203\370\377u\020\353\a\270", len = 1521714736}, ri = -1277437696, flags = 65042731}}, i2s = "0\030\263\317<\177\000\000\260\030\263\317<\177\000\000\000\000\000\000\000"} s = {s = 0x7fff5ab3848c "<\177", len = 1622691408} srevp = {0x55794f79ac10 <_start>, 0xf000000000000} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #34 0x000055794f7d2391 in run_actions (h=0x7fff5ab388c0, a=0x7f3ccf9ad758, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccf9ad758 ret = -1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = -810346320, tz_dsttime = 32572} tdiff = 3017529600 __func__ = "run_actions" #35 0x000055794f7d2aff in run_actions_safe (h=0x7fff5ab3b4d0, a=0x7f3ccf9ad758, msg=0x7f3ccfb31208) at core/action.c:1648 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {12884901888, -6152238486944205147, 93979512777744, 0, 0, 0, -6152238486866610523, -30698175615977819}, __mask_was_saved = 0, __saved_mask = {__val = {139896960643982, 1, 7779588272, 139899158388928, 140734715104520, 139899157788368, 139899159384584, 140734715103616, 139899159384584, 139897209894648, 139896969507664, 0, 139899158389000, 140734715103808, 93979515819061, 0}}}}} ret = 32572 ign_on_break = 0 #36 0x000055794f8a1329 in lval_pvar_assign (h=0x7fff5ab3b4d0, msg=0x7f3ccfb31208, lv=0x7f3ccf9ad620, rv=0x7f3ccf9af130) at core/lvalue.c:284 pvar = 0x7f3ccf9ad490 pval = {rs = {s = 0x0, len = 0}, ri = 0, flags = 24} r_avp = 0x7f3ccf852010 avp_val = {n = 1521715904, s = {s = 0x7fff5ab38ac0 "\370\355\302OyU", len = -813359088}, re = 0x7fff5ab38ac0} ret = 0 v = 3 destroy_pval = 0 __func__ = "lval_pvar_assign" #37 0x000055794f8a28f9 in lval_assign (h=0x7fff5ab3b4d0, msg=0x7f3ccfb31208, lv=0x7f3ccf9ad620, rve=0x7f3ccf9af128) at core/lvalue.c:400 rv = 0x7f3ccf9af130 ret = -1 __func__ = "lval_assign" #38 0x000055794f7d01e3 in do_action (h=0x7fff5ab3b4d0, a=0x7f3ccf9af838, msg=0x7f3ccfb31208) at core/action.c:1458 ret = -5 v = 0 dst = {send_sock = 0x7fff5ab395a0, to = {s = {sa_family = 46768, sa_data = "\232\317<\177\000\000\210\276\232\317<\177\000"}, sin = {sin_family = 46768, sin_port = 53146, sin_addr = {s_addr = 32572}, sin_zero = "\210\276\232\317<\177\000"}, sin6 = {sin6_family = 46768, sin6_port = 53146, sin6_flowinfo = 32572, sin6_addr = {__in6_u = {__u6_addr8 = "\210\276\232\317<\177\000\000\b\022\263\317<\177\000", __u6_addr16 = {48776, 53146, 32572, 0, 4616, 53171, 32572, 0}, __u6_addr32 = {3483025032, 32572, 3484619272, 32572}}}, sin6_scope_id = 0}, sas = {ss_family = 46768, __ss_padding = "\232\317<\177\000\000\210\276\232\317<\177\000\000\b\022\263\317<\177\000\000\000\000\000\000\r\000\000\000\000\000\000\000\016\000\000\000\016\000\000\000\016\000\000\000\000\331۳+y\340\003໋\317<\177\000\000\000\000\000\000\003\000\000\000\020\254yOyU", '\000' <repeats 18 times>, "\256v\225OyU\000\000\340\222\263Z\377\177\000\000д\263Z\377\177\000", __ss_align = 139899159384584}}, id = -811965496, send_flags = {f = 32572, blst_imask = 0}, proto = 48 '0', proto_pad0 = 18 '\022', proto_pad1 = -12365} tmp = 0x0 new_uri = 0x557950744900 "" end = 0x600000000 <error: Cannot access memory at address 0x600000000> crt = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E" cmd = 0x557950743ba0 len = 0 user = 0 uri = {user = {s = 0x0, len = -813359088}, passwd = {s = 0x7fff5ab38e80 "\360\034\237\317<\177", len = 1282716628}, host = {s = 0x900000009 <error: Cannot access memory at address 0x900000009>, len = 0}, port = {s = 0x2000000 <error: Cannot access memory at address 0x2000000>, len = 28929864}, params = {s = 0x3fa910 <error: Cannot access memory at address 0x3fa910>, len = 4624568}, sip_params = {s = 0x46da90 <error: Cannot access memory at address 0x46da90>, len = 8}, headers = {s = 0x70 <error: Cannot access memory at address 0x70>, len = -1277437696}, port_no = 7408, proto = 53151, type = 32572, flags = (unknown: 0xcf852010), transport = {s = 0x7f3ccf9f1cf0 "\360\005", len = -813359088}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x7fff5ab38fb0 "`\220\263Z\377\177", len = 1336633822}, maddr = {s = 0x7fff5ab38f50 "\200\220\263Z\377\177", len = 0}, method = {s = 0x55794fc2e97b "core", len = 1349794720}, lr = {s = 0x55794fc2ec00 <__func__.27> "rval_destroy_helper", len = 1338173953}, r2 = {s = 0x7f3ccf9f1d38 "\002", len = -813359088}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = -811655880}, ttl_val = {s = 0x7f3ccf852010 "\001", len = -811655952}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x7fff5ab39080 "\340\220\263Z\377\177", len = 1333373968}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = -1277437696}, gr_val = {s = 0x7f3ccf9abe88 "\002", len = 0}} next_hop = {user = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x7fff5ab39060 "\200\220\263Z\377\177", len = 1335338733}, port = {s = 0x1cfb31208 <error: Cannot access memory at address 0x1cfb31208>, len = -811942264}, params = {s = 0x7fff5ab39000 "\220\226\263Z\377\177", len = 0}, sip_params = {s = 0x557900000000 <error: Cannot access memory at address 0x557900000000>, len = 0}, headers = {s = 0x0, len = 0}, port_no = 38544, proto = 23219, type = 32767, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 0x4f7c33f0), transport = {s = 0xd <error: Cannot access memory at address 0xd>, len = -1277437696}, ttl = {s = 0x7fff5ab39150 "", len = -1277437696}, user_param = {s = 0x1cf99b270 <error: Cannot access memory at address 0x1cf99b270>, len = -811942264}, maddr = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x7fff5ab39080 "\340\220\263Z\377\177", len = 1335338805}, r2 = {s = 0x0, len = -811942264}, gr = {s = 0x7fff5ab390e0 "`\222\263Z\377\177", len = 1335370774}, transport_val = {s = 0x0, len = -1277437696}, ttl_val = {s = 0x2000000000 <error: Cannot access memory at address 0x2000000000>, len = 0}, user_param_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x7fff5ab390f0 "`\222\263Z\377\177", len = 1335338805}, lr_val = {s = 0x7fff5ab39260 "Г\263Z\377\177", len = -811942264}, r2_val = {s = 0x7fff5ab39260 "Г\263Z\377\177", len = 1335377740}, gr_val = {s = 0x7fff5ab39120 "\220Ś\317<\177", len = 1286204524}} u = 0x0 port = 53171 dst_host = 0x9 i = 0 flags = 0 avp = 0x7fff5ab38db8 st = {flags = 3483201536, id = 2, name = {n = 0, s = {s = 0x300000000 <error: Cannot access memory at address 0x300000000>, len = 1333373968}, re = 0x300000000}, avp = 0x0} sct = 0x0 sjt = 0x7fff5ab38db4 rve = 0x7f3ccf99c328 mct = 0x7fff5ab38e00 rv = 0x0 rv1 = 0x900000000 c1 = {cache_type = 3483026832, val_type = 32572, c = {avp_val = {n = 1521717948, s = {s = 0x7fff5ab392bc "", len = -810348024}, re = 0x7fff5ab392bc}, pval = {rs = {s = 0x7fff5ab392bc "", len = -810348024}, ri = 1521726672, flags = 32767}}, i2s = "\350k\251\317<\177\000\000\000\000\000\000<\177\000\000\000\000\000\000yU"} s = {s = 0x7f3ccf9f2086 "<username>", len = 1} srevp = {0x7fff5ab395a8, 0x0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #39 0x000055794f7d2391 in run_actions (h=0x7fff5ab3b4d0, a=0x7f3ccf9af838, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccf9af838 ret = -1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 1521726672, tz_dsttime = 32767} tdiff = 1521718304 __func__ = "run_actions" #40 0x000055794f7c32d3 in do_action (h=0x7fff5ab3b4d0, a=0x7f3ccf9c2550, msg=0x7f3ccfb31208) at core/action.c:1070 ret = 1 v = 1 dst = {send_sock = 0x7f3ccfb31208, to = {s = {sa_family = 46288, sa_data = "\263Z\377\177\000\000(\253\252\317<\177\000"}, sin = {sin_family = 46288, sin_port = 23219, sin_addr = {s_addr = 32767}, sin_zero = "(\253\252\317<\177\000"}, sin6 = {sin6_family = 46288, sin6_port = 23219, sin6_flowinfo = 32767, sin6_addr = {__in6_u = {__u6_addr8 = "(\253\252\317<\177\000\000\000\000\000\000\000\000\000", __u6_addr16 = {43816, 53162, 32572, 0, 0, 0, 0, 0}, __u6_addr32 = {3484068648, 32572, 0, 0}}}, sin6_scope_id = 1333373968}, sas = {ss_family = 46288, __ss_padding = "\263Z\377\177\000\000(\253\252\317<\177\000\000\000\000\000\000\000\000\000\000\020\254yOyU\000\000\372Q\221OyU", '\000' <repeats 11 times>, "\331۳+y\340\003໋\317<\177\000\000P1\252\317<\177\000\000\020\254yOyU", '\000' <repeats 26 times>, " \232\263Z\377\177\000\000\065\247\227OyU\000", __ss_align = 0}}, id = -810929840, send_flags = {f = 32572, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = 0x7fff5ab3b4d0 "\005" new_uri = 0x0 end = 0x0 crt = 0x7f3c000003a0 <error: Cannot access memory at address 0x7f3c000003a0> cmd = 0x0 len = 0 user = 0 uri = {user = {s = 0x7fff5ab397b0 " \231\263Z\377\177", len = 0}, passwd = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x7fff5ab397b0 " \231\263Z\377\177", len = 1335349767}, params = {s = 0x0, len = 0}, sip_params = {s = 0x7fff5ab39830 "P\231\263Z\377\177", len = 0}, headers = {s = 0x7f3ccf9a7cf8 "\003", len = 1521719676}, port_no = 4616, proto = 53171, type = 32572, flags = (unknown: 0x5ab3b4d0), transport = {s = 0x7fff5ab397e0 "\360|\232\317<\177", len = 0}, ttl = {s = 0x7f3ccf99b270 "\325\001", len = 1521719408}, user_param = {s = 0x0, len = -1277437696}, maddr = {s = 0x7f3ccf986ff8 "\245\001", len = 0}, method = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x7fff5ab397e0 "\360|\232\317<\177", len = 1335227121}, gr = {s = 0x0, len = -810348024}, transport_val = {s = 0x7f3ccf9a1af8 "\002", len = 1521726672}, ttl_val = {s = 0x0, len = -811655952}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x7f3ccfa3e108 "\336̌PyU", len = -1277437696}, method_val = {s = 0x7fff5ab398b0 "\245\066t\020\261۞\252\245\066(\003,\360\222\377", len = 0}, lr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x7fff5ab39920 "\220\232\263Z\377\177", len = 1335371841}} next_hop = {user = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x7f3ccf9a7cf0 "\001", len = 1521719676}, port = {s = 0x7f3ccfb31208 "\311)\f", len = 1521726672}, params = {s = 0x46da90 <error: Cannot access memory at address 0x46da90>, len = 0}, sip_params = {s = 0x7f3c00000000 <error: Cannot access memory at address 0x7f3c00000000>, len = 1521720044}, headers = {s = 0x7f3ccfb31208 "\311)\f", len = 1521726672}, port_no = 39248, proto = 23219, type = 32767, flags = 0, transport = {s = 0x0, len = -810348024}, ttl = {s = 0x0, len = 1521726672}, user_param = {s = 0x7f3ccf98b048 "\257\001", len = 0}, maddr = {s = 0x0, len = -1}, method = {s = 0x300000000 <error: Cannot access memory at address 0x300000000>, len = 223622821}, lr = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0xaa9edbb1107436a5 <error: Cannot access memory at address 0xaa9edbb1107436a5>, len = 52967077}, transport_val = {s = 0x0, len = -1277437696}, ttl_val = {s = 0x2000000000 <error: Cannot access memory at address 0x2000000000>, len = 0}, user_param_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -1277437696}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x7fff5ab39a90 "", len = 1335373694}, gr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}} u = 0x7f3ccfb31208 port = 0 dst_host = 0x0 i = 0 flags = 21881 avp = 0x7f3ccfab95f8 st = {flags = 0, id = 0, name = {n = -1277437696, s = {s = 0x3e0792bb3dbd900 <error: Cannot access memory at address 0x3e0792bb3dbd900>, len = 1521719840}, re = 0x3e0792bb3dbd900}, avp = 0x300000000} sct = 0x300000000 sjt = 0x55794f79ac10 <_start> rve = 0x7f3ccf9acca0 mct = 0x7fff5ab395b0 rv = 0x7f3ccfb31208 rv1 = 0x7fff5ab39700 c1 = {cache_type = 3483010048, val_type = 32572, c = {avp_val = {n = 1521720040, s = {s = 0x7fff5ab39ae8 "", len = -810348024}, re = 0x7fff5ab39ae8}, pval = {rs = {s = 0x7fff5ab39ae8 "", len = -810348024}, ri = 1521726672, flags = 32767}}, i2s = "\000\000\000\000yU\000\000\000\000\000\000\001\000\000\000\000\000\000\000<\177"} s = {s = 0x7fff5ab39670 "\260\227\263Z\377\177", len = 1335227121} srevp = {0x0, 0x3e0792bb3dbd900} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #41 0x000055794f7d2391 in run_actions (h=0x7fff5ab3b4d0, a=0x7f3ccf9c2550, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccf9c2550 ret = -1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 1521726672, tz_dsttime = 32767} tdiff = 1521720400 __func__ = "run_actions" #42 0x000055794f7c32d3 in do_action (h=0x7fff5ab3b4d0, a=0x7f3ccf9c2680, msg=0x7f3ccfb31208) at core/action.c:1070 ret = 1 v = 1 dst = {send_sock = 0x7f3ccfb31208, to = {s = {sa_family = 46288, sa_data = "\263Z\377\177\000\000\000\000\000\000\000\000\000"}, sin = {sin_family = 46288, sin_port = 23219, sin_addr = {s_addr = 32767}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 46288, sin6_port = 23219, sin6_flowinfo = 32767, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 46288, __ss_padding = "\263Z\377\177", '\000' <repeats 43 times>, "\331۳+y\340\003H>\230\317\001\000\000\000\000\000\000\000\003\000\000\000\020\254yOyU\000\000\372Q\221OyU\000\000\000\000\000\000\004\000\000\000\200\244\263Z\377\177\000\000@\243\263Z\377\177\000\000\341\037\212OyU\000", __ss_align = 139899157634776}}, id = -812099152, send_flags = {f = 32572, blst_imask = 0}, proto = 8 '\b', proto_pad0 = 18 '\022', proto_pad1 = -12365} tmp = 0x5b5ab3a380 <error: Cannot access memory at address 0x5b5ab3a380> new_uri = 0x0 end = 0x0 crt = 0x7f3c000003b0 <error: Cannot access memory at address 0x7f3c000003b0> cmd = 0x7f3ccf8bb7b8 len = 0 user = 0 uri = {user = {s = 0x7f3c00000000 <error: Cannot access memory at address 0x7f3c00000000>, len = 1521726672}, passwd = {s = 0x0, len = -1277437696}, host = {s = 0x7f3ccfa74f8a "someprovider.com", len = 0}, port = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x7fff5ab3a060 "\200\241\263Z\377\177", len = 1333601169}, headers = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x7fff5ab3a010 "P\241\263Z\377\177", len = -810348024}, ttl = {s = 0x7f3ccf98b048 "\257\001", len = 1521721504}, user_param = {s = 0x7f3ccf986ff8 "\245\001", len = 1521726672}, maddr = {s = 0x7f3ccfb31208 "\311)\f", len = 0}, method = {s = 0x0, len = -1}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0xaa9edbb107f436a5 <error: Cannot access memory at address 0xaa9edbb107f436a5>, len = 52967077}, ttl_val = {s = 0x7fff00000000 <error: Cannot access memory at address 0x7fff00000000>, len = 0}, user_param_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x7fff5ab3a230 "@\243\263Z\377\177", len = 1286017678}, lr_val = {s = 0x7fff5ab3a2a0 "\020\254yOyU", len = 1336651388}, r2_val = {s = 0x7f3ccf92b300 "", len = -810348024}, gr_val = {s = 0x7fff00b3a150 <error: Cannot access memory at address 0x7fff00b3a150>, len = -813359088}} next_hop = {user = {s = 0x7fff5ab3a050 "", len = 1282716628}, passwd = {s = 0x0, len = -1277437696}, host = {s = 0x7fff5ab3a150 "\300\242\263Z\377\177", len = 1335349869}, port = {s = 0x3fa358 <error: Cannot access memory at address 0x3fa358>, len = -1277437696}, params = {s = 0x0, len = 0}, sip_params = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, headers = {s = 0x0, len = 0}, port_no = 41344, proto = 23219, type = 32767, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 0x4f7d2afc), transport = {s = 0x0, len = -810348024}, ttl = {s = 0x7f3ccf98b048 "\257\001", len = -1277437696}, user_param = {s = 0x7fff5ab3a380 "\b\022\263\317<\177", len = 0}, maddr = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x7fff5ab3a180 "\300\242\263Z\377\177", len = 1335227121}, r2 = {s = 0x0, len = -810348024}, gr = {s = 0x7f3ccf992270 "\002", len = 1521726672}, transport_val = {s = 0x0, len = -811585240}, ttl_val = {s = 0x55794fd0c098 <_ksr_ipaddr_list+120> "\n", len = 1521722096}, user_param_val = {s = 0x0, len = -1277437696}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, lr_val = {s = 0x0, len = -1277437696}, r2_val = {s = 0x7fff5ab3a2c0 "0\244\263Z\377\177", len = 0}, gr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}} u = 0x7f3ccfb31208 port = 0 dst_host = 0x0 i = 0 flags = 0 avp = 0x7f3ccf986ff8 st = {flags = 0, id = 0, name = {n = 0, s = {s = 0x0, len = 1521721536}, re = 0x0}, avp = 0x55794f95bbbd <eval_elem+1084>} sct = 0x7f3c00000001 sjt = 0x0 rve = 0x7f3ccf9a9930 mct = 0x13c400000023 rv = 0x7fff5ab39ed0 rv1 = 0x7fff5ab39f30 c1 = {cache_type = 1521722048, val_type = 32767, c = {avp_val = {n = 1335349767, s = {s = 0x55794f97d207 <rval_get_int+239> "H\213\225\370\376\377\377\211\002H\213\205\370\376\377\377\213", len = -810348024}, re = 0x55794f97d207 <rval_get_int+239>}, pval = {rs = {s = 0x55794f97d207 <rval_get_int+239> "H\213\225\370\376\377\377\211\002H\213\205\370\376\377\377\213", len = -810348024}, ri = 1521726672, flags = 32767}}, i2s = '\000' <repeats 16 times>, "\360\"\231\317<\177"} s = {s = 0x0, len = 0} srevp = {0x0, 0x0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #43 0x000055794f7d2391 in run_actions (h=0x7fff5ab3b4d0, a=0x7f3ccf9a1718, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccf9c2680 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 1521726672, tz_dsttime = 32767} tdiff = 1521722496 __func__ = "run_actions" #44 0x000055794f7c3329 in do_action (h=0x7fff5ab3b4d0, a=0x7f3ccfa02210, msg=0x7f3ccfb31208) at core/action.c:1074 ret = 1 v = 0 dst = {send_sock = 0x7f3ccfb31208, to = {s = {sa_family = 46288, sa_data = "\263Z\377\177\000\000\370\062\220\317<\177\000"}, sin = {sin_family = 46288, sin_port = 23219, sin_addr = {s_addr = 32767}, sin_zero = "\370\062\220\317<\177\000"}, sin6 = {sin6_family = 46288, sin6_port = 23219, sin6_flowinfo = 32767, sin6_addr = {__in6_u = {__u6_addr8 = "\370\062\220\317<\177\000\000\000\000\000\000\000\000\000", __u6_addr16 = {13048, 53136, 32572, 0, 0, 0, 0, 0}, __u6_addr32 = {3482333944, 32572, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 46288, __ss_padding = "\263Z\377\177\000\000\370\062\220\317<\177", '\000' <repeats 35 times>, "\331۳+y\340\003", '\000' <repeats 12 times>, "\003\000\000\000\020\254yOyU\000\000\000\000\000\000\000\000\000\000\001\000\000\000\004\000\000\000\260\254\263Z\377\177\000\000p\253\263Z\377\177\000\000\242\034\212OyU\000", __ss_align = 139899156965896}}, id = -812767032, send_flags = {f = 32572, blst_imask = 0}, proto = 8 '\b', proto_pad0 = 18 '\022', proto_pad1 = -12365} tmp = 0x7fff5ab3b4d0 "\005" new_uri = 0x0 end = 0x400000000 <error: Cannot access memory at address 0x400000000> crt = 0x7fff5ab3a6d0 "`ܔ\317<\177" cmd = 0x0 len = 0 user = 0 uri = {user = {s = 0x7fff00000000 <error: Cannot access memory at address 0x7fff00000000>, len = 1335371841}, passwd = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -1277437696}, host = {s = 0x0, len = 0}, port = {s = 0x7f3ccf94dc60 "\001", len = 1521723500}, params = {s = 0x7f3ccfb31208 "\311)\f", len = 1521726672}, sip_params = {s = 0x7fff5ab3a890 "\260\251\263Z\377\177", len = 0}, headers = {s = 0x7f3c00000000 <error: Cannot access memory at address 0x7f3c00000000>, len = 1521723864}, port_no = 4616, proto = 53171, type = 32572, flags = (unknown: 0x5ab3b4d0), transport = {s = 0x7f3ccfa03128 "\270\004", len = -810348024}, ttl = {s = 0x7f3ccf9199c0 "\265", len = 1521723600}, user_param = {s = 0x0, len = -1277437696}, maddr = {s = 0x15ab3a780 <error: Cannot access memory at address 0x15ab3a780>, len = 0}, method = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x7fff5ab3a840 "\200\251\263Z\377\177", len = 1335227121}, gr = {s = 0x0, len = -810348024}, transport_val = {s = 0x7f3ccf978600 "\002", len = 1521726672}, ttl_val = {s = 0x1cf852010 <error: Cannot access memory at address 0x1cf852010>, len = -811585240}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -1277437696}, method_val = {s = 0x7fff5ab3a910 "\320r\227\317<\177", len = 0}, lr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, r2_val = {s = 0x0, len = -1277437696}, gr_val = {s = 0x7fff5ab3a980 "\360\252\263Z\377\177", len = 0}} next_hop = {user = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x7fff5ab3a980 "\360\252\263Z\377\177", len = 1335349767}, port = {s = 0x7f3ccfb31208 "\311)\f", len = 1521726672}, params = {s = 0x0, len = 0}, sip_params = {s = 0x7f3ccf978680 "\003", len = 1521724232}, headers = {s = 0x7f3ccfb31208 "\311)\f", len = 1521726672}, port_no = 43440, proto = 23219, type = 32767, flags = 0, transport = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -810348024}, ttl = {s = 0x0, len = -1277437696}, user_param = {s = 0x15ab3a910 <error: Cannot access memory at address 0x15ab3a910>, len = 0}, maddr = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x7fff5ab3a9b0 "x\206\227\317<\177", len = 1335227121}, r2 = {s = 0x0, len = -810348024}, gr = {s = 0x7f3ccf9772d0 "\002", len = 1521726672}, transport_val = {s = 0x0, len = -1277437696}, ttl_val = {s = 0x20cf8e1c38 <error: Cannot access memory at address 0x20cf8e1c38>, len = 0}, user_param_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -1277437696}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x7fff5ab3aaf0 "`\254\263Z\377\177", len = 1335371841}, gr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = 0}} u = 0x0 port = 0 dst_host = 0x7fff5ab3a86c i = 13 flags = 21881 avp = 0x7f3ccf8fef90 st = {flags = 0, id = 0, name = {n = 0, s = {s = 0x0, len = 1521723632}, re = 0x0}, avp = 0x55794f95bbbd <eval_elem+1084>} sct = 0x300000000 sjt = 0x55794f79ac10 <_start> rve = 0x7f3ccf9922e8 mct = 0x0 rv = 0x7f3ccfb31208 rv1 = 0x7f3ccfb31208 c1 = {cache_type = 3482814072, val_type = 32572, c = {avp_val = {n = 1521724232, s = {s = 0x7fff5ab3ab48 "", len = -810348024}, re = 0x7fff5ab3ab48}, pval = {rs = {s = 0x7fff5ab3ab48 "", len = -810348024}, ri = 1521726672, flags = 32767}}, i2s = "\020\061\216\317<\177", '\000' <repeats 14 times>, "<\177"} s = {s = 0x7fff5ab3a6d0 "`ܔ\317<\177", len = 1335227121} srevp = {0x0, 0x0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #45 0x000055794f7d2391 in run_actions (h=0x7fff5ab3b4d0, a=0x7f3ccf983bd8, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccfa02210 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 1521726672, tz_dsttime = 32767} tdiff = 1521724592 __func__ = "run_actions" #46 0x000055794f7c3329 in do_action (h=0x7fff5ab3b4d0, a=0x7f3ccfa04f70, msg=0x7f3ccfb31208) at core/action.c:1074 ret = 1 v = 0 dst = {send_sock = 0x7fff5ab3b250, to = {s = {sa_family = 55552, sa_data = "۳+y\340\003\000\000\000\000\000\000\000"}, sin = {sin_family = 55552, sin_port = 46043, sin_addr = {s_addr = 65042731}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 55552, sin6_port = 46043, sin6_flowinfo = 65042731, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 12 times>, "\003\000\000", __u6_addr16 = {0, 0, 0, 0, 0, 0, 3, 0}, __u6_addr32 = {0, 0, 0, 3}}}, sin6_scope_id = 1333373968}, sas = {ss_family = 55552, __ss_padding = "۳+y\340\003", '\000' <repeats 12 times>, "\003\000\000\000\020\254yOyU\000\000\000\000\000\000\000\000\000\000\b\000\000\000\000\000\000\000\b\022\263\317<\177\000\000@\263\263Z\377\177\000\000\323N\260OyU\000\000\330f\306OyU\000\000\220\374\254\317<\177\000\000\354͌PyU\000\000\235͌PyU\000\000\000\000\000\000\a\000\000\000\250͌PyU\000", __ss_align = 0}}, id = 1351405036, send_flags = {f = 21881, blst_imask = 0}, proto = -93 '\243', proto_pad0 = -51 '\315', proto_pad1 = 20620} tmp = 0x7f3ccd5f2719 "\366\205\331\005" new_uri = 0x14b734 <error: Cannot access memory at address 0x14b734> end = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E" crt = 0xffffffff508ccc94 <error: Cannot access memory at address 0xffffffff508ccc94> cmd = 0x7f3ccf8bdb00 len = 4 user = 0 uri = {user = {s = 0x7fff5ab3af10 "\020\260\263Z\377\177", len = 1336651388}, passwd = {s = 0x7fff5ab3af20 "\200\257\263Z\377\177", len = -813359088}, host = {s = 0x4547dcbf8 <error: Cannot access memory at address 0x4547dcbf8>, len = 1336651388}, port = {s = 0x7fff5ab3af40 "", len = -813359088}, params = {s = 0x7fff5ab3b010 "\310E\237\317<\177", len = -813359088}, sip_params = {s = 0x7fff5ab3af80 "\260\257\263Z\377\177", len = 1282716628}, headers = {s = 0x3f9538 <error: Cannot access memory at address 0x3f9538>, len = 0}, port_no = 0, proto = 512, type = ERROR_URI_T, flags = (unknown: 0x1b97fe8), transport = {s = 0x3f9828 <error: Cannot access memory at address 0x3f9828>, len = 4620312}, ttl = {s = 0x46da90 <error: Cannot access memory at address 0x46da90>, len = 8}, user_param = {s = 0x7c <error: Cannot access memory at address 0x7c>, len = -1277437696}, maddr = {s = 0x7fff5ab3afb0 "\240\260\263Z\377\177", len = 1334098835}, method = {s = 0x0, len = 1338365855}, lr = {s = 0x7fff5ab3b0a0 "", len = 0}, r2 = {s = 0x7fff5ab3b0a0 "", len = 1336627661}, gr = {s = 0x55794fc68dcf "core", len = -813359088}, transport_val = {s = 0x55794fc68dc0 <__func__.3> "parse_to_param", len = 1338413720}, ttl_val = {s = 0x30 <error: Cannot access memory at address 0x30>, len = -813359088}, user_param_val = {s = 0x7cfaf8718 <error: Cannot access memory at address 0x7cfaf8718>, len = 1351404736}, maddr_val = {s = 0x55794f79ac10 <_start> "1\355I\211\321^H\211\342H\203\344\360PTL\215\005\332\\E", len = -811645496}, method_val = {s = 0x7f3ccf9f45c8 "8", len = -813359088}, lr_val = {s = 0x7fff5ab3b170 "", len = 1336092425}, r2_val = {s = 0x7fff5ab3b2a0 "", len = 56896}, gr_val = {s = 0x400000386 <error: Cannot access memory at address 0x400000386>, len = 1521725620}} next_hop = {user = {s = 0x5547dcbf8 <error: Cannot access memory at address 0x5547dcbf8>, len = 1351404666}, passwd = {s = 0x44f79ac10 <error: Cannot access memory at address 0x44f79ac10>, len = -1277437696}, host = {s = 0x5579508ccc7f ";rport;branch=z9hG4bKPjdffcf0f7-8b17-4b9b-971d-6509002eb588;alias\r\nMax-Forwards: 69\r\nFrom: sip:<username>@someprovider.com;tag=bcb22e86-01c0-4163-a7c9-a7435220505c\r\nTo: sip:<phonenumber>@someprovider.com;tag=0c9a7"..., len = 0}, port = {s = 0x44f79ac10 <error: Cannot access memory at address 0x44f79ac10>, len = 1338412495}, params = {s = 0x0, len = -1277437696}, sip_params = {s = 0x7fff5ab3b200 "\220\332F", len = 1336874015}, headers = {s = 0x505b0e0 <error: Cannot access memory at address 0x505b0e0>, len = 0}, port_no = 45344, proto = 23219, type = 32767, flags = (unknown: 0x5ab3b248), transport = {s = 0x0, len = -810581096}, ttl = {s = 0x5579508ccdec "", len = 1351404861}, user_param = {s = 0xd003f9478 <error: Cannot access memory at address 0xd003f9478>, len = 29}, maddr = {s = 0x46da90 <error: Cannot access memory at address 0x46da90>, len = 8}, method = {s = 0x84 <error: Cannot access memory at address 0x84>, len = -1277437696}, lr = {s = 0x7fff5ab3b150 "@\262\263Z\377\177", len = 1334098835}, r2 = {s = 0x0, len = 1338365855}, gr = {s = 0x7fff5ab3b240 "\020\254yOyU", len = 0}, transport_val = {s = 0x7fff5ab3b240 "\020\254yOyU", len = 1336627661}, ttl_val = {s = 0x55794fc6664b "core", len = -811645424}, user_param_val = {s = 0x0, len = 1351404904}, maddr_val = {s = 0xf0 <error: Cannot access memory at address 0xf0>, len = -813359088}, method_val = {s = 0x1f003f8b50 <error: Cannot access memory at address 0x1f003f8b50>, len = 1336651388}, lr_val = {s = 0x7fff5ab3b1e0 "", len = -813359088}, r2_val = {s = 0x7f3ccfad0098 "\001", len = 1337032407}, gr_val = {s = 0x7f3ccfacfcb8 "\004", len = -810746712}} u = 0x0 port = 20404 dst_host = 0x0 i = 7 flags = 0 avp = 0x7fff5ab3af50 st = {flags = 1521725640, id = 32767, name = {n = 1417530360, s = {s = 0x7f3c547dcbf8 "\254\b", len = 1351404691}, re = 0x7f3c547dcbf8}, avp = 0x7f3cd1a4f4a7 <send+119>} sct = 0x3e0792bb3dbd900 sjt = 0x0 rve = 0x7f3ccf978d88 mct = 0x7fff5ab3b020 rv = 0x25ab3adf0 rv1 = 0x3e0792bb3dbd900 c1 = {cache_type = 33554432, val_type = RV_NONE, c = {avp_val = {n = 28933880, s = {s = 0x1b97ef8 <error: Cannot access memory at address 0x1b97ef8>, len = 4167960}, re = 0x1b97ef8}, pval = {rs = {s = 0x1b97ef8 <error: Cannot access memory at address 0x1b97ef8>, len = 4167960}, ri = 4620552, flags = 0}}, i2s = "\220\332F\000\000\000\000\000\b\000\000\000\000\000\000\000y\000\000\000\000"} s = {s = 0x0, len = 0} srevp = {0x7f3ccfacfa30, 0x0} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <error: Cannot access memory at address 0x1>, str = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 14}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #47 0x000055794f7d2391 in run_actions (h=0x7fff5ab3b4d0, a=0x7f3ccf8de910, msg=0x7f3ccfb31208) at core/action.c:1584 t = 0x7f3ccfa04f70 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = -810348024, tz_dsttime = 32572} tdiff = 0 __func__ = "run_actions" #48 0x000055794f7d2c0b in run_top_route (a=0x7f3ccf8de910, msg=0x7f3ccfb31208, c=0x0) at core/action.c:1669 ctx = {rec_lev = 5, run_flags = 0, last_retcode = -1, jmp_env = {{__jmpbuf = {12884901888, -6152238486275213659, 93979512777744, 0, 0, 0, -6152238486155675995, -30698175615977819}, __mask_was_saved = 0, __saved_mask = {__val = {0, 139897030523508, 279356405505054976, 140734715115120, 93979516405432, 140734715114896, 93979513240322, 140734715114896, 140734715115216, 1906965479424, 279356405505054976, 12884901888, 12884901888, 93979512777744, 0, 0}}}}} p = 0x7fff5ab3b4d0 ret = 0 sfbk = 0 #49 0x000055794f9301b2 in receive_msg (buf=0x5579508ccc30 "ACK sip:<phonenumber>@someprovider.com SIP/2.0\r\nVia: SIP/2.0/TLS <customer_IP>:34365;rport;branch=z9hG4bKPjdffcf0f7-8b17-4b9b-971d-6509002eb588;alias\r\nMax-Forwards: 69\r\nFrom: sip:<username>@someprovider.com;tag=b"..., len=444, rcv_info=0x7f3c50cf3530) at core/receive.c:515 msg = 0x7f3ccfb31208 ctx = {rec_lev = 0, run_flags = 2, last_retcode = 0, jmp_env = {{__jmpbuf = {140734715115664, 93979515746255, 139897092295672, 139897092295696, 42949672960, 93979530808368, 1530148517, -30698175615977819}, __mask_was_saved = 1521727504, __saved_mask = {__val = {0, 0, 279356405505054976, 0, 2, 93979512777744, 0, 0, 0, 140734715115856, 93979515723953, 139897092295672, 0, 0, 0, 140734715116428}}}}} bctx = 0x0 ret = 0 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} diff = 0 inb = {s = 0x5579508ccc30 "ACK sip:<phonenumber>@someprovider.com SIP/2.0\r\nVia: SIP/2.0/TLS <customer_IP>:34365;rport;branch=z9hG4bKPjdffcf0f7-8b17-4b9b-971d-6509002eb588;alias\r\nMax-Forwards: 69\r\nFrom: sip:<username>@someprovider.com;tag=b"..., len = 444} netinfo = {data = {s = 0x0, len = 0}, bufsize = 0, rcv = 0x0, dst = 0x0} keng = 0x0 evp = {data = 0x7fff5ab3b6c0, obuf = {s = 0x0, len = 0}, rcv = 0x7f3c50cf3530, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 exectime = 0 __func__ = "receive_msg" #50 0x000055794fa7274b in receive_tcp_msg (tcpbuf=0x7f3c50cf38b8 "ACK sip:<phonenumber>@someprovider.com SIP/2.0\r\nVia: SIP/2.0/TLS <customer_IP>:34365;rport;branch=z9hG4bKPjdffcf0f7-8b17-4b9b-971d-6509002eb588;alias\r\nMax-Forwards: 70\r\nFrom: sip:<username>@someprovider.com;tag=b"..., len=444, rcv_info=0x7f3c50cf3530, con=0x7f3c50cf3518) at core/tcp_read.c:1413 ret = 0 buf = 0x5579508ccc30 "ACK sip:<phonenumber>@someprovider.com SIP/2.0\r\nVia: SIP/2.0/TLS <customer_IP>:34365;rport;branch=z9hG4bKPjdffcf0f7-8b17-4b9b-971d-6509002eb588;alias\r\nMax-Forwards: 69\r\nFrom: sip:<username>@someprovider.com;tag=b"... bsize = 65535 blen = 65535 __func__ = "receive_tcp_msg" #51 0x000055794fa74dac in tcp_read_req (con=0x7f3c50cf3518, bytes_read=0x7fff5ab3bb84, read_flags=0x7fff5ab3bb8c) at core/tcp_read.c:1604 bytes = 444 total_bytes = 444 resp = 1 size = 0 req = 0x7f3c50cf3640 dst = {send_sock = 0x7fff5ab3bb00, to = {s = {sa_family = 56539, sa_data = "\211OyU\000\000\260\272\263Z\377\177\000"}, sin = {sin_family = 56539, sin_port = 20361, sin_addr = {s_addr = 21881}, sin_zero = "\260\272\263Z\377\177\000"}, sin6 = {sin6_family = 56539, sin6_port = 20361, sin6_flowinfo = 21881, sin6_addr = {__in6_u = {__u6_addr8 = "\260\272\263Z\377\177\000\000\030\000\000\000\000\000\000", __u6_addr16 = {47792, 23219, 32767, 0, 24, 0, 0, 0}, __u6_addr32 = {1521728176, 32767, 24, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 56539, __ss_padding = "\211OyU\000\000\260\272\263Z\377\177\000\000\030", '\000' <repeats 15 times>, "m\025\205mP\000\000\000\310Q\263\317<\177\000\000\200\060\325OyU\000\000\031\267\024\000\001 \000\000\310Q\263\317<\177\000\000\260+\232\317<\177\000\000\000\000\000\000,\000\000\000\001\000\000\000\000\000\000\000\300\217\345R<\177\000\000л\263Z\377\177\000\000\b\000\000\000\000\000\000", __ss_align = 20}}, id = 1, send_flags = {f = 1, blst_imask = 0}, proto = 71 'G', proto_pad0 = 0 '\000', proto_pad1 = 0} c = 103 'g' ret = 0 __func__ = "tcp_read_req" #52 0x000055794fa79774 in handle_io (fm=0x7f3ccfb34cb8, events=1, idx=-1) at core/tcp_read.c:1855 ret = 0 n = 10 read_flags = RD_CONN_SHORT_READ con = 0x7f3c50cf3518 s = 71 resp = 1 t = 1837438317 ee = 0x0 __func__ = "handle_io" #53 0x000055794fa63bef in io_wait_loop_epoll (h=0x55794fd52ec0 <io_w>, t=2, repeat=0) at core/io_wait.h:1070 n = 1 r = 0 fm = 0x7f3ccfb34cb8 revents = 1 __func__ = "io_wait_loop_epoll" #54 0x000055794fa7b252 in tcp_receive_loop (unix_sock=44) at core/tcp_read.c:1976 __func__ = "tcp_receive_loop" #55 0x000055794fa57e17 in tcp_init_children (woneinit=0x7fff5ab3bf78) at core/tcp_main.c:5229 r = 2 i = 15 reader_fd_1 = 44 pid = 0 si_desc = "tcp receiver (generic)\000\000͎\236OyU\000\000P\277\263Z\377\177\000\000\212`\250O\000\000\000\000\240\032\213\317\000\000\000\000\273\355\303OyU\000\000\241\000\263Z\377\177\000\000\221\243\272OyU\000\000\020\254yOyU\000\000\070\061,M<\177\000\000\000\000\000\000\000\000\000\000\210\372lM\001\000\000\000@\277\263Z\377\177\000\000\227\245\272OyU\000" si = 0x0 __func__ = "tcp_init_children" #56 0x000055794f7ae63a in main_loop () at main.c:1849 i = 16 pid = 1357613 si = 0x0 si_desc = "udp receiver child=15 sock=<kamailio_IP>:5060\000\000\000\002\000\000\000(\000\000\000\000\331۳+y\340\003\000\000\000\000\000\000\000\000\031\267\024\000\000\000\000\000\020\254yOyU", '\000' <repeats 26 times>, "\020\301\263Z\377\177\000\000s\377\225OyU\000" nrprocs = 16 woneinit = 1 __func__ = "main_loop" #57 0x000055794f7b920c in main (argc=18, argv=0x7fff5ab3c668) at main.c:3078 cfg_stream = 0x5579506392a0 c = -1 r = 0 tmp = 0x7fff5ab3ce4b "" tmp_len = 0 port = 0 proto = 7 ahost = 0x0 aport = 0 options = 0x55794fbf4258 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1093004594 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 22, st_ino = 687, st_nlink = 2, st_mode = 16832, st_uid = 111, st_gid = 301, __pad0 = 0, st_rdev = 0, st_size = 80, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1690436755, tv_nsec = 157127840}, st_mtim = {tv_sec = 1691487362, tv_nsec = 342809961}, st_ctim = {tv_sec = 1691487362, tv_nsec = 342809961}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\000\000\000\000\000\000\000\030R\265Z\377\177\000\000\000\000\000\000 ", '\000' <repeats 27 times>, "\001\000\000\000\000\000\000\000\366u\256\003\001", '\000' <repeats 19 times>, "\002", '\000' <repeats 319 times>... option_index = 12 long_options = {{name = 0x55794fbf66c6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55794fbf150c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55794fbf66cb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55794fbf66d1 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55794fbf66d7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55794fbf66e0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55794fbf66ea "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55794fbf66f4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55794fbf66ff "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55794fbf6708 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55794fbf6713 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55794fbf6719 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55794fbf6723 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` #### Log Messages ``` Aug 11 13:53:11 sip-tcploadbalancer01.live.sipgate.net /usr/sbin/kamailio[1357595]: ALERT: <core> [main.c:774]: handle_sigs(): child process 1357620 exited by a signal 11 Aug 11 13:53:11 sip-tcploadbalancer01.live.sipgate.net /usr/sbin/kamailio[1357595]: ALERT: <core> [main.c:777]: handle_sigs(): core was generated Aug 11 13:53:12 sip-tcploadbalancer01.live.sipgate.net systemd[1]: kamailio_sip_lb_tcp_de.service: Main process exited, code=exited, status=1/FAILURE Aug 11 13:53:12 sip-tcploadbalancer01.live.sipgate.net systemd[1]: kamailio_sip_lb_tcp_de.service: Failed with result 'exit-code'. Aug 11 13:53:12 sip-tcploadbalancer01.live.sipgate.net systemd[1]: kamailio_sip_lb_tcp_de.service: Consumed 13h 18min 12.966s CPU time. Aug 11 13:53:14 sip-tcploadbalancer01.live.sipgate.net systemd[1]: kamailio_sip_lb_tcp_de.service: Scheduled restart job, restart counter is at 4. Aug 11 13:53:14 sip-tcploadbalancer01.live.sipgate.net systemd[1]: Stopped Kamailio - the sipgate SIP Server. Aug 11 13:53:14 sip-tcploadbalancer01.live.sipgate.net systemd[1]: kamailio_sip_lb_tcp_de.service: Consumed 13h 18min 12.966s CPU time.``` #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ sudo kamailio -v [sudo] password for <user>: version: kamailio 5.6.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, 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 10.2.1 ``` * **Operating System**: ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye # uname -a Linux sip-tcploadbalancer01.<domain> 5.10.0-23-amd64 #1 SMP Debian 5.10.179-2 (2023-07-14) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3539 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3539(a)github.com>

3 4

git:master:1435618b: sqlops: number fields kept as long
by Daniel-Constantin Mierla 28 Aug '23

28 Aug '23

Module: kamailio Branch: master Commit: 1435618b71ed749bc33982a00c8caf6b8de7b80a URL: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-28T09:06:41+02:00 sqlops: number fields kept as long --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sql_api.h --- Diff: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… Patch: https://github.com/kamailio/kamailio/commit/1435618b71ed749bc33982a00c8caf6… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 93a9b36528a..b76edbd480e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -357,17 +357,17 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) case DB1_INT: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.int_val; + (long)RES_ROWS(db_res)[i].values[j].val.int_val; break; case DB1_DATETIME: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.time_val; + (long)RES_ROWS(db_res)[i].values[j].val.time_val; break; case DB1_BITMAP: res->vals[i][j].flags = PV_VAL_INT; res->vals[i][j].value.n = - (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; + (long)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; case DB1_BIGINT: res->vals[i][j].flags = PV_VAL_STR; diff --git a/src/modules/sqlops/sql_api.h b/src/modules/sqlops/sql_api.h index b1189561054..0051a61a53c 100644 --- a/src/modules/sqlops/sql_api.h +++ b/src/modules/sqlops/sql_api.h @@ -41,7 +41,7 @@ typedef struct _sql_col typedef struct _sql_val { int flags; - int_str value; + numstr_ut value; } sql_val_t; typedef struct _sql_result

1 0

git:master:1ea23314: pv: updates for helper functions taking now long instead of int
by Daniel-Constantin Mierla 25 Aug '23

25 Aug '23

Module: kamailio Branch: master Commit: 1ea23314d46ce566be97a189569a01bbff5cf477 URL: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-25T11:03:52+02:00 pv: updates for helper functions taking now long instead of int --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b… Patch: https://github.com/kamailio/kamailio/commit/1ea23314d46ce566be97a189569a01b…

1 0

git:master:90356a68: auth_ephemeral: additional cast to avoid storage size warning
by Daniel-Constantin Mierla 24 Aug '23

24 Aug '23

Module: kamailio Branch: master Commit: 90356a685e8861d89057e8cbbe977599ab4a70b1 URL: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T13:31:46+02:00 auth_ephemeral: additional cast to avoid storage size warning --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… Patch: https://github.com/kamailio/kamailio/commit/90356a685e8861d89057e8cbbe97759… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 638d97aa835..92633d0983f 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -156,7 +156,7 @@ static inline int do_auth(struct sip_msg *_m, struct hdr_field *_h, str *_realm, int autheph_verify_timestamp(str *_username) { - int pos = 0, cur_time = (int)time(NULL); + int pos = 0, cur_time = (int)(unsigned long long)time(NULL); unsigned int expires; str time_str = {0, 0};

1 0

git:master:3e6cd549: cplc: casts for proper adjusting on storage size
by Daniel-Constantin Mierla 24 Aug '23

24 Aug '23

Module: kamailio Branch: master Commit: 3e6cd549716ab7ee0b2ff0df3ee52784d9478ee1 URL: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T14:00:01+02:00 cplc: casts for proper adjusting on storage size --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… Patch: https://github.com/kamailio/kamailio/commit/3e6cd549716ab7ee0b2ff0df3ee5278… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index 4120f4ef2bf..b22fe5e8cf9 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -264,7 +264,7 @@ int cpl_ac_print(cpl_ac_tm_p _atp) return -1; } - printf("\nSys time: %d\nTime: %02d:%02d:%02d\n", (int)_atp->time, + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (unsigned long long)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year + 1900, _atp->t.tm_mon + 1, _atp->t.tm_mday); @@ -490,17 +490,17 @@ int cpl_tr_print(cpl_tmrec_p _trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %d\n", (int)_trp->dtstart); + printf("Sys time: %llu\n", (unsigned long long)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year + 1900, _trp->ts.tm_mon + 1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %d\n", (int)_trp->dtend); - printf("Duration: %d\n", (int)_trp->duration); - printf("Until: %d\n", (int)_trp->until); - printf("Freq: %d\n", (int)_trp->freq); - printf("Interval: %d\n", (int)_trp->interval); + printf("End time: %llu\n", (unsigned long long)_trp->dtend); + printf("Duration: %llu\n", (unsigned long long)_trp->duration); + printf("Until: %llu\n", (unsigned long long)_trp->until); + printf("Freq: %d\n", _trp->freq); + printf("Interval: %d\n", _trp->interval); if(_trp->byday) { printf("Byday: "); for(i = 0; i < _trp->byday->nr; i++) @@ -965,7 +965,7 @@ int cpl_check_tmrec(cpl_tmrec_p _trp, cpl_ac_tm_p _atp, cpl_tr_res_p _tsw) int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) { - int _t0, _t1; + unsigned long long _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -983,12 +983,12 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) _tm.tm_year = _trp->ts.tm_year; _tm.tm_mon = _trp->ts.tm_mon; _tm.tm_mday = _trp->ts.tm_mday; - _t0 = (int)mktime(&_tm); + _t0 = (unsigned long long)mktime(&_tm); memset(&_tm, 0, sizeof(struct tm)); _tm.tm_year = _atp->t.tm_year; _tm.tm_mon = _atp->t.tm_mon; _tm.tm_mday = _atp->t.tm_mday; - _t1 = (int)mktime(&_tm); + _t1 = (unsigned long long)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1 - _t0) / (24 * 3600)) % _trp->interval == 0) ? REC_MATCH

1 0

[kamailio/kamailio] smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (PR #3546)
by Supreeth Herle 24 Aug '23

24 Aug '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes the conversion from UCS2 to UTF-8 and viceversa. Previously the code was not handling emojis and certain characters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3546 -- Commit Summary -- * smsops: Fix conversion from UCS-2 to UTF-8 and viceversa -- File Changes -- M src/modules/smsops/smsops_impl.c (219) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3546.patch https://github.com/kamailio/kamailio/pull/3546.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3546 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3546(a)github.com>

4 10

git:master:76de00a4: core: mem - check if fragmet exists before setting function field
by Daniel-Constantin Mierla 24 Aug '23

24 Aug '23

Module: kamailio Branch: master Commit: 76de00a483c7ed0dbfeadde2685d2800bf291cef URL: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-24T10:36:04+02:00 core: mem - check if fragmet exists before setting function field --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… Patch: https://github.com/kamailio/kamailio/commit/76de00a483c7ed0dbfeadde2685d280… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index e1b48ecd63f..1605cba5990 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -807,7 +807,8 @@ void qm_setfunc(void *qmp, void *p, char *func) } f = (struct qm_frag *)((char *)p - sizeof(struct qm_frag)); - f->func = func; + if(f) + f->func = func; #endif }

1 0

git:master:c11fcbbe: msilo: cast to fix storage size warning
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: c11fcbbe9ed19bc54b800100d15d9ae269735f0c URL: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T13:03:02+02:00 msilo: cast to fix storage size warning --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Patch: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index a5d3b74c0c1..00cf593811f 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -741,7 +741,7 @@ static int m_store_addrs(sip_msg_t *msg, str *owner, str *srcaddr, str *dstaddr) } /* current time */ - val = (int)time(NULL); + val = (int)(unsigned long long)time(NULL); /* add expiration time */ db_keys[nr_keys] = &sc_exp_time;

1 0

git:master:027c2b30: db_redis: free db_keys in case of failure
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 027c2b30b39a7596c8630c06995ddc49bb42d789 URL: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:52+02:00 db_redis: free db_keys in case of failure --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Patch: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c53a1593aa6..ff41aa45282 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2584,6 +2584,8 @@ static int db_redis_perform_update(const db1_con_t *_h, km_redis_con_t *con, LM_ERR("failed to perform the update\n"); if(reply) db_redis_free_reply(&reply); + if(db_keys) + pkg_free(db_keys); db_redis_key_free(&query_v); db_redis_key_free(&all_type_keys); db_redis_key_free(&type_keys);

1 0

git:master:5633026f: pv_headers: compare result of pvh_set_xavi() with NULL for error cases
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 5633026f90e46f7d6da8c1a658d425e8926f6949 URL: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:55:35+02:00 pv_headers: compare result of pvh_set_xavi() with NULL for error cases - the function returns a pointer --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Patch: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b772262691d..441a2a664af 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -619,11 +619,11 @@ int pvh_set_header( xavi->name.len, xavi->name.s, hname->len, hname->s); } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, idx, 0) - < 0) + == NULL) goto err; } } else if(val->flags & (PV_VAL_STR | PV_TYPE_INT | PV_VAL_INT)) { @@ -642,7 +642,7 @@ int pvh_set_header( } if(idx == 0 && idxf == PV_IDX_NONE) { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, 1) - < 0) + == NULL) goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { @@ -652,11 +652,11 @@ int pvh_set_header( } if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, hname_cnt ? 0 : 1) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, idx, 0) - < 0) + == NULL) goto err; } if(pv_format) @@ -694,7 +694,7 @@ xavp_c_data_t *pvh_set_parsed( if(pvh_merge_uri(msg, SET_URI_T, cur, val, c_data) < 0) goto err; if(pvh_set_xavi(msg, &xavi_parsed_xname, hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; LM_DBG("c_data from pvh_merge_uri hname:%.*s\n", hname->len, hname->s); @@ -857,12 +857,12 @@ int pvh_set_uri(struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val) /* LM_DBG("xavi:%.*s hname:%.*s value:%.*s\n", xavi_name.len, xavi_name.s, hname.len, hname.s, c_data->value.len, c_data->value.s); */ if(pvh_set_xavi(msg, &xavi_name, &hname, &c_data->value, SR_XTYPE_STR, 0, 0) - < 0) + == NULL) goto err; if(pvh_set_xavi( msg, &xavi_parsed_xname, &hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; if(pv_format) @@ -1127,7 +1127,7 @@ int pvh_set_reply_sr( case 2: // reason if(pvh_set_xavi(msg, &xavi_name, &_hdr_reply_reason, &fval, SR_XTYPE_STR, 0, 0) - < 0) { + == NULL) { LM_ERR("set reply: cannot set reply reason\n"); goto err; }

1 0

git:master:81c1ede6: core: allow space for ending string when creating socket structure at startup
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 81c1ede698f8dd6f2147c71ee6f3bb49ed4a682c URL: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:02+02:00 core: allow space for ending string when creating socket structure at startup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Patch: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 04a2e609323..6786ecaf6cc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,7 +329,7 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); if(si->useinfo.name.s == 0) goto error; strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1);

1 0

[kamailio/kamailio] Module db_postgresql not found (Issue #3196)
by MenschLink 23 Aug '23

23 Aug '23

### Description I loaded module "db_postgres.so". I expected kamilio to start. It didn't ### Troubleshooting #### Reproduction  #### config file ``` #!KAMAILIO #!define WITH_POSTGRESSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_PRESENCE #!define WITH_MSGREBUILD #!define WITH_NAT #!define WITH_NATSIPPING .. . .. #!ifdef WITH_POSTGRESSQL loadmodule "db_postgres.so" #!endif ``` #### Log Messages  ``` Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: <core> [db.c:204]: db_bind_mod(): Module db_postgresql not found. Missing loadmodule? Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: usrloc [usrloc_mod.c:361]: mod_init(): failed to bind database module Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: <core> [core/sr_module.c:942]: init_mod(): Error while initializing module usrloc (/usr/lib/x86_64-linux-gnu/kamailio/modules/usrloc.so) ``` output from ls of modules directory: ``` acc.so call_obj.so dialog.so ipops.so msrp.so presence_conference.so qos.so sipcapture.so statsd.so uid_avp_db.so acc_diameter.so carrierroute.so dialplan.so jsonrpcs.so mtree.so presence_dialoginfo.so ratelimit.so sipdump.so stun.so uid_domain.so alias_db.so cfg_db.so dispatcher.so keepalive.so nat_traversal.so presence_mwi.so regex.so sipjson.so tcpops.so uid_gflags.so app_jsdt.so cfg_rpc.so diversion.so kemix.so nathelper.so presence_profile.so registrar.so sipt.so textops.so uid_uri_db.so app_sqlang.so cfgt.so dmq.so kex.so nosip.so presence_reginfo.so rls.so siptrace.so textopsx.so uri_db.so async.so cfgutils.so dmq_usrloc.so lcr.so outbound.so presence_xml.so rr.so siputils.so timer.so userblocklist.so auth.so corex.so domain.so log_custom.so p_usrloc.so pua.so rtimer.so sl.so tm.so usrloc.so auth_db.so counters.so domainpolicy.so lrkproxy.so path.so pua_bla.so rtjson.so sms.so tmrec.so xcap_client.so auth_diameter.so ctl.so drouting.so mangler.so pdb.so pua_dialoginfo.so rtpengine.so smsops.so tmx.so xcap_server.so auth_xkeys.so db2_ops.so enum.so matrix.so pdt.so pua_reginfo.so rtpproxy.so speeddial.so topoh.so xhttp.so avp.so db_cluster.so evrexec.so maxfwd.so permissions.so pua_rpc.so sanity.so sqlops.so topos.so xhttp_prom.so avpops.so db_flatstore.so exec.so mediaproxy.so pike.so pua_usrloc.so sca.so ss7ops.so tsilo.so xhttp_rpc.so benchmark.so db_postgres.so group.so mohqueue.so pipelimit.so pua_xmpp.so sdpops.so sst.so uac.so xlog.so blst.so db_text.so htable.so mqueue.so prefix_route.so pv.so seas.so statistics.so uac_redirect.so xprint.so call_control.so debugger.so imc.so msilo.so presence.so pv_headers.so secfilter.so statsc.so uid_auth_db.so ``` ### Possible Solutions  tried renaming db_postgres.so to db_postgresql.so, but that didn't work, so I reversed it ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.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, 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 10.2.1 ``` * **Operating System**:  ``` Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux opensips 5.10.0-16-amd64 #1 SMP Debian 5.10.127-1 (2022-06-30) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3196 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3196(a)github.com>

3 4

git:master:4d58141a: rabbitmq: proper check for allocated pointer
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 4d58141ab84cf248e8c44a96181642ad0f187e80 URL: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T17:09:37+02:00 rabbitmq: proper check for allocated pointer --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… Patch: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 50d143723e6..aa986ca9952 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -571,7 +571,7 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) // establish a new connection to RabbitMQ server *conn = amqp_new_connection(); - if(!conn) { + if(!*conn) { LM_ERR("FAIL: create AMQP connection\n"); return RABBITMQ_ERR_CREATE; }

1 0

[kamailio/kamailio] uac_reg tries A record resolve for auth_proxy on SRV only records (Issue #3547)
by 53c70r 22 Aug '23

22 Aug '23

I noticed that sometimes the trunk registration just fails after TTL expiry and the kamailio tries to resolve an A record for next_hop=<sip:reg.sip-trunk.telekom.de:5060;transport=tcp> where actually no A record exists resulting in an unregistered trunk for one register period. After the one failed period the SRV will result in correct CNAME resolving again and the trunk will be registered for one full hour (baes on TTL expiry of SRV record). ``` Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: uac [uac_reg.c:1138]: uac_reg_send(): using custom socket tcp:10.124.2.2:5060 to send request Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/socket_info.c:702]: grep_sock_info(): checking if host==us: 10==10 && [10.124.2.2] == [10.124.2.2] Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/socket_info.c:709]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 5060 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:580]: tm_xdata_replace(): replace existing list in backup xd from new xd Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:413]: build_cell(): created new cell 0x7fc7766aa400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:568]: tm_xdata_replace(): restore X/AVP msg context from backup data Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [uac.c:468]: t_uac_prepare(): next_hop=<sip:reg.sip-trunk.telekom.de:5060;transport=tcp> Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:534]: _dns_hash_find(): (_sip._tcp.reg.sip-trunk.telekom.de(34), 33), h=666 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:999]: get_record(): skipping 0 NS (p=0x560cf3e135dc, end=0x560cf3e135dc) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:1012]: get_record(): parsing 0 ARs (p=0x560cf3e135dc, end=0x560cf3e135dc) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:1640]: dns_get_related(): (0x7fc7766f9ab8 (_sip._tcp.reg.sip-trunk.telekom.de, 33), 33, *(nil)) (0) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:746]: dns_cache_add_unsafe(): adding _sip._tcp.reg.sip-trunk.telekom.de(34) 33 (flags=0) at 666 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:534]: _dns_hash_find(): (reg.sip-trunk.telekom.de(24), 1), h=400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:784]: get_record(): lookup(reg.sip-trunk.telekom.de, 1) failed Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:768]: dns_cache_mk_bad_entry(): (reg.sip-trunk.telekom.de, 1, 60, 1) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:708]: dns_cache_add(): adding reg.sip-trunk.telekom.de(24) 1 (flags=1) at 400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: <core> [core/resolve.c:1730]: sip_hostport2su(): could not resolve hostname: "reg.sip-trunk.telekom.de" Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "reg.sip-trunk.telekom.de" Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: tm [uac.c:491]: t_uac_prepare(): no socket found Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:132]: free_cell_helper(): freeing transaction 0x7fc7766aa400 from uac.c:632 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: uac [uac_reg.c:1178]: uac_reg_send(): failed to send request for [siptrunk] ``` At this point it should not try to resolve reg.sip-trunk.telekom.de but instead one of the SRV CNAMES. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3547 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3547(a)github.com>

2 3

[kamailio/kamailio] cannot build with -DTLS_MALLOC_DBG=1 (Issue #3532)
by sergey-safarov 22 Aug '23

22 Aug '23

### Description I want debug memory usage by TLS module. To do this used command ``` make -C src/modules/tls CFLAGS="-DTLS_MALLOC_DBG=1" ``` And this output ``` [root@sbc-stage-a0 kamailio]# make -C src/modules/tls CFLAGS="-DTLS_MALLOC_DBG=1" make: Entering directory '/root/bak/kamailio/src/modules/tls' CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_rand.o CC (gcc) [M tls.so] tls_map.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o tls_init.c:137:2: warning: #warning "tls module compiled with malloc debugging info (extra overhead)" [-Wcpp] #warning "tls module compiled with malloc debugging info (extra overhead)" ^~~~~~~ tls_init.c: In function ‘ser_malloc’: tls_init.c:218:5: warning: implicit declaration of function ‘_shm_malloc’; did you mean ‘shm_malloc’? [-Wimplicit-function-declaration] p=_shm_malloc(size+s, file, "via ser_malloc", line); ^~~~~~~~~~~ shm_malloc tls_init.c:218:4: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] p=_shm_malloc(size+s, file, "via ser_malloc", line); ^ tls_init.c:224:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct qm_frag’ ((struct qm_frag*)((char*)p-sizeof(struct qm_frag)))->func= ^~~~~~ tls_init.c: In function ‘ser_realloc’: tls_init.c:253:5: warning: implicit declaration of function ‘_shm_realloc’; did you mean ‘shm_realloc’? [-Wimplicit-function-declaration] p=_shm_realloc(ptr, size+s, file, "via ser_realloc", line); ^~~~~~~~~~~~ shm_realloc tls_init.c:253:4: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] p=_shm_realloc(ptr, size+s, file, "via ser_realloc", line); ^ tls_init.c:259:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct qm_frag’ ((struct qm_frag*)((char*)p-sizeof(struct qm_frag)))->func= ^~~~~~ tls_init.c: In function ‘tls_pre_init’: tls_init.c:684:7: warning: implicit declaration of function ‘CRYPTO_set_mem_ex_functions’; did you mean ‘CRYPTO_set_mem_functions’? [-Wimplicit-function-declaration] if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~ CRYPTO_set_mem_functions tls_init.c:684:60: error: ‘ser_free’ undeclared (first use in this function); did you mean ‘sk_free’? if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { ^~~~~~~~ sk_free tls_init.c:684:60: note: each undeclared identifier is reported only once for each function it appears in make: *** [../../Makefile.rules:100: tls_init.o] Error 1 make: Leaving directory '/root/bak/kamailio/src/modules/tls' ``` ### Additional Information kamailio 5.6.4 with some customisation -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3532 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3532(a)github.com>

4 7

git:master:a92de0df: core: mem - wrapper macros to specify position params for shm allocation
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: a92de0dfc809f9257eb230093c93081606ee107e URL: https://github.com/kamailio/kamailio/commit/a92de0dfc809f9257eb230093c93081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 core: mem - wrapper macros to specify position params for shm allocation --- Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/a92de0dfc809f9257eb230093c93081… Patch: https://github.com/kamailio/kamailio/commit/a92de0dfc809f9257eb230093c93081… --- diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 3813d984012..4db3a0e0101 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -53,6 +53,9 @@ extern sr_shm_api_t _shm_root; #define shm_mallocxz(s) \ _shm_root.xmallocxz(_shm_root.mem_block, (s), _SRC_LOC_, _SRC_FUNCTION_, \ _SRC_LINE_, _SRC_MODULE_) +#define shm_mallocxp(s, loc, fname, nline, mname) \ + _shm_root.xmalloc(_shm_root.mem_block, (s), loc, fname, \ + nline, mname) #define shm_malloc_unsafe(s) \ _shm_root.xmalloc_unsafe(_shm_root.mem_block, (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -62,6 +65,9 @@ extern sr_shm_api_t _shm_root; #define shm_reallocxf(p, s) \ _shm_root.xreallocxf(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) +#define shm_reallocxp(p, s, loc, fname, nline, mname) \ + _shm_root.xrealloc(_shm_root.mem_block, (p), (s), loc, \ + fname, nline, mname) #define shm_resize(p, s) \ _shm_root.xresize(_shm_root.mem_block, (p), (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_)

1 0

git:master:13976820: core: mem - shm api extended to enable setting func field of the chunk
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 1397682006dd7fc7df0cb95d92ff6424f7ad506f URL: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 core: mem - shm api extended to enable setting func field of the chunk - implemented for q_malloc(), being needed for reviving tls extra debug mode --- Modified: src/core/mem/memapi.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… Patch: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… --- diff --git a/src/core/mem/memapi.h b/src/core/mem/memapi.h index b9448b4ace7..8b3b0c1e5a2 100644 --- a/src/core/mem/memapi.h +++ b/src/core/mem/memapi.h @@ -60,6 +60,8 @@ typedef void (*sr_mem_destroy_f)(void); typedef void (*sr_mem_mod_get_stats_f)(void *mbp, void **p); typedef void (*sr_mem_mod_free_stats_f)(void *mbp); +typedef void (*sr_setfunc_f)(void *mbp, void *p, char *func); + /*private memory api*/ typedef struct sr_pkg_api { @@ -142,6 +144,8 @@ typedef struct sr_shm_api sr_shm_glock_f xglock; /*memory managing global unlock*/ sr_shm_gunlock_f xgunlock; + /*memory chunk set func pointer*/ + sr_setfunc_f xsetfunc; } sr_shm_api_t; #endif diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index a3b9161ca3b..e1b48ecd63f 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -788,6 +788,29 @@ void *qm_reallocxf(void *qmp, void *p, size_t size) } +void qm_setfunc(void *qmp, void *p, char *func) +{ +#ifndef DBG_QM_MALLOC + LM_ERR("used with invalid compile options\n"); + return; +#else + struct qm_block *qm; + struct qm_frag *f; + + qm = (struct qm_block *)qmp; + + if((p) && (p > (void *)qm->last_frag_end || p < (void *)qm->first_frag)) { + LM_CRIT("BUG: bad pointer %p (out of memory block!) - " + "aborting\n", + p); + abort(); + } + f = (struct qm_frag *)((char *)p - sizeof(struct qm_frag)); + + f->func = func; +#endif +} + void qm_check(struct qm_block *qm) { struct qm_frag *f; @@ -1507,6 +1530,7 @@ int qm_malloc_init_shm_manager(void) ma.xfmodstats = qm_shm_mod_free_stats; ma.xglock = qm_shm_glock; ma.xgunlock = qm_shm_gunlock; + ma.xsetfunc = qm_setfunc; if(shm_init_api(&ma) < 0) { LM_ERR("cannot initialize the core shm api\n"); diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 4db3a0e0101..c83c9dd48a6 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -99,6 +99,7 @@ extern sr_shm_api_t _shm_root; #define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) #define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) +#define shm_setfunc(p, f) _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)) void *shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

git:master:efd94f90: tls: updates to revive TLS_MALLOC_DBG
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: efd94f90069d146d8133d7afd6276ce1c188556f URL: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 tls: updates to revive TLS_MALLOC_DBG - it still requires q_malloc to be used - GH #3532 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Patch: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index d7399e8c792..e4a19d6ddad 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -260,14 +260,13 @@ static void *ser_malloc(size_t size, const char *file, int line) #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); /* ugly hack: keep the bt inside the alloc'ed fragment */ - p = _shm_malloc(size + s, file, "via ser_malloc", line); + p = shm_mallocxp(size + s, file, "ser_malloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_malloc(%d)[%s:%d]==null, bt: %s\n", size, file, + LM_CRIT("tls - ser_malloc(%lu)[%s:%d]==null, bt: %s\n", size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -304,14 +303,13 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) || (random() % RAND_NULL_MALLOC)) { #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); - p = _shm_realloc(ptr, size + s, file, "via ser_realloc", line); + p = shm_reallocxp(ptr, size + s, file, "ser_realloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_realloc(%p, %d)[%s:%d]==null, bt: %s\n", ptr, + LM_CRIT("tls - ser_realloc(%p, %lu)[%s:%d]==null, bt: %s\n", ptr, size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -328,6 +326,18 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) return p; } + +static void ser_free(void *ptr, const char *fname, int fline) +{ + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_lock(&ksr_tls_lock_shm); + if(ptr) { + shm_free(ptr); + } + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_unlock(&ksr_tls_lock_shm); +} + #endif /* LIBRESSL_VERSION_NUMBER */ #else /*TLS_MALLOC_DBG */ @@ -710,7 +720,11 @@ int tls_pre_init(void) rf = NULL; ff = NULL; #ifdef TLS_MALLOC_DBG +#if OPENSSL_VERSION_NUMBER < 0x010100000L if(!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { +#else + if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { +#endif #else if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { #endif

1 0

git:master:4d8811f5: smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (#3546)
by GitHub 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 4d8811f562013297c7d9380e392e31bae19a260f URL: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2023-08-22T10:12:47+02:00 smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (#3546) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b… Patch: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b…

1 0

[kamailio/kamailio] I need to test ISUP to SIP-I conversion Kamailio softswtich..I am sending (Issue #3542)
by vivekkirsh 21 Aug '23

21 Aug '23

Hi All, I need to test ISUP to SIP-I conversion at Kamailio Softswitch .this SIP-I conversion need to verify SIpp-SIP end point. **my architecure flow as below as:-** isup sipi-i/sip-t MTG 200 Trunk Gatway -----------> Kamailio Softswitch ----------------> SIPP. How to make it happend in via Kamailio Softswitch .and what are the configurations need to make in Kamailio Softswitch -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3542 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3542(a)github.com>

2 3

[kamailio/kamailio] regex: migration to pcre2 (PR #3535)
by Victor Seva 21 Aug '23

21 Aug '23

#### 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 modules to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3535 -- Commit Summary -- * regex: migration to pcre2 -- File Changes -- M src/modules/regex/Makefile (11) M src/modules/regex/regex_mod.c (121) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3535.patch https://github.com/kamailio/kamailio/pull/3535.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3535 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3535(a)github.com>

4 10

git:master:325c7a34: regex: migration to pcre2
by Victor Seva 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 325c7a34fca74770a4351e00e27fcae75d57852e URL: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-21T13:01:59+02:00 regex: migration to pcre2 --- Modified: src/modules/regex/Makefile Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae… Patch: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae…

1 0

git:master:b1031c1a: tm: docs - note that t_relay() creates transaction if it does not exist
by Daniel-Constantin Mierla 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: b1031c1ad38bd40a9b6fe8849ced58608f1c30ef URL: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-21T12:49:12+02:00 tm: docs - note that t_relay() creates transaction if it does not exist - removed trailing spaces --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586… Patch: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586…

1 0

git:master:4bcf0649: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 4bcf0649a86965fc2e5c8ea5f3c6519e2918ba52 URL: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-21T12:46:29+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519… Patch: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519…

1 0

[kamailio/kamailio] tm: clarify t_relay() can create a transaction (PR #3538)
by Дилян Палаузов 21 Aug '23

21 Aug '23

I removed the word atomic before transaction, since it implies that there are in addition non-atomic ways to create a transaction. Per https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… t_relay() creates a transaction. - typos You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3538 -- Commit Summary -- * tm: clarify which functions can create a transaction -- File Changes -- M src/modules/tm/config.h (2) M src/modules/tm/dlg.c (2) M src/modules/tm/doc/event_routes.xml (2) M src/modules/tm/doc/functions.xml (24) M src/modules/tm/doc/params.xml (21) M src/modules/tm/doc/tm.xml (4) M src/modules/tm/h_table.c (4) M src/modules/tm/h_table.h (2) M src/modules/tm/select.c (4) M src/modules/tm/sip_msg.c (2) M src/modules/tm/sip_msg.h (2) M src/modules/tm/t_fifo.c (4) M src/modules/tm/t_funcs.c (2) M src/modules/tm/t_funcs.h (2) M src/modules/tm/t_fwd.c (16) M src/modules/tm/t_hooks.c (4) M src/modules/tm/t_hooks.h (6) M src/modules/tm/t_lookup.c (10) M src/modules/tm/t_msgbuilder.c (8) M src/modules/tm/t_msgbuilder.h (2) M src/modules/tm/t_reply.c (24) M src/modules/tm/t_stats.h (10) M src/modules/tm/t_suspend.c (2) M src/modules/tm/timer.c (2) M src/modules/tm/timer.h (2) M src/modules/tm/tm.c (8) M src/modules/tm/uac.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3538.patch https://github.com/kamailio/kamailio/pull/3538.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3538 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3538(a)github.com>

2 1

git:master:8ca1fec1: tm: clarify which functions can create a transaction
by Daniel-Constantin Mierla 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 8ca1fec1c00a19e3386bedf5ccfe8f9983184905 URL: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-21T12:43:09+02:00 tm: clarify which functions can create a transaction I removed the word atomic before transaction, since it implies that there are in addition non-atomic ways to create a transaction. Per https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… t_relay() creates a transaction. - typos --- Modified: src/modules/tm/config.h Modified: src/modules/tm/dlg.c Modified: src/modules/tm/doc/event_routes.xml Modified: src/modules/tm/doc/functions.xml Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/doc/tm.xml Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/select.c Modified: src/modules/tm/sip_msg.c Modified: src/modules/tm/sip_msg.h Modified: src/modules/tm/t_fifo.c Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_stats.h Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9… Patch: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9…

1 0

git:master:1599dd82: rtpengine: set MIME Content-Length
by Richard Fuchs 18 Aug '23

18 Aug '23

Module: kamailio Branch: master Commit: 1599dd829e98cb610ca54903e8564d00fe9e07a0 URL: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2023-08-18T08:12:18-04:00 rtpengine: set MIME Content-Length For MIME multipart SDPs, the embedded MIME section can contain a Content-Length header. Update this field if preset after rewriting the SDP. --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c Modified: src/modules/rtpengine/rtpengine_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0… Patch: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0…

1 0

git:master:52196f95: pkg/kamailio/deb: add pcre2
by Victor Seva 18 Aug '23

18 Aug '23

Module: kamailio Branch: master Commit: 52196f955d9b023d1d1340fadd44dcd09a0e6e67 URL: https://github.com/kamailio/kamailio/commit/52196f955d9b023d1d1340fadd44dcd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-18T13:15:46+02:00 pkg/kamailio/deb: add pcre2 * first step for migration to pcre2 until all modules are migrated --- 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/52196f955d9b023d1d1340fadd44dcd… Patch: https://github.com/kamailio/kamailio/commit/52196f955d9b023d1d1340fadd44dcd…

1 0

[kamailio/kamailio] 关于acc_cdr的问题，请教一下 (Issue #3541)
by kqbi 17 Aug '23

17 Aug '23

目前进行一同呼叫后，在acc表中可以看到Invite、ack及bye的记录详情并带有时间，acc_cdr表中只有start_time及end_time,是对应invite和bye的。现在我想在acc_cdr中增加ack的时间我该如何去做呢？有没有大佬能解答一下？万分感谢！！！ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3541 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3541(a)github.com>

2 2

git:master:fcdeedb5: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 17 Aug '23

17 Aug '23

Module: kamailio Branch: master Commit: fcdeedb5e84ff31f25daa7ba8ffdb355f909afa9 URL: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-17T18:46:23+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… Patch: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 238c4e86bef..ff0686ef14c 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -94,6 +94,7 @@ Ovidiu Sas 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 7. Event routes @@ -214,6 +215,7 @@ Chapter 1. Admin Guide 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 7. Event routes @@ -1126,6 +1128,7 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 6.1. htable.get htable key @@ -1385,6 +1388,21 @@ kamcmd htable.stats Example: ... kamcmd htable.dmqsync +kamcmd htable.dmqsync ipban +... + +6.15. htable.dmqresync htable + + Perform a resync action (flush and dmq sync). + + Name: htable.dmqresync + + Parameters: + * htable: name of the hash table to perform resync for. + + Example: +... +kamcmd htable.dmqresync ipban ... 7. Event routes

1 0

git:master:2c9a135d: htable: docs for htable.dmqresync
by Daniel-Constantin Mierla 17 Aug '23

17 Aug '23

Module: kamailio Branch: master Commit: 2c9a135d4272ace414b7b4dd148cdf955f79b614 URL: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-17T18:40:44+02:00 htable: docs for htable.dmqresync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… Patch: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 2e4b377999a..0dd01bea5a0 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1802,10 +1802,34 @@ kamcmd htable.stats <programlisting format="linespecific"> ... kamcmd htable.dmqsync +kamcmd htable.dmqsync ipban +... +</programlisting> + </section> + <section id="htable.rpc.dmqresync"> + <title> + <function moreinfo="none">htable.dmqresync htable</function> + </title> + <para> + Perform a resync action (flush and dmq sync). + </para> + <para> + Name: <emphasis>htable.dmqresync</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable: name of the hash table to perform resync for. + </para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.dmqresync ipban ... </programlisting> </section> - </section> <section>

1 0

git:master:f9dcffc4: htable: added rpc htable.dmqresync command
by Daniel-Constantin Mierla 17 Aug '23

17 Aug '23

Module: kamailio Branch: master Commit: f9dcffc42f10caa638ba3e2cbbe6ffb6206373b7 URL: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-17T18:40:44+02:00 htable: added rpc htable.dmqresync command - reset and dmq sync for a specific hash table --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… Patch: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index b12d44f0927..5c682972f0c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1516,6 +1516,10 @@ static const char *htable_dmqsync_doc[2] = { "Perform DMQ sync action.", 0 }; +static const char *htable_dmqresync_doc[2] = { + "Perform DMQ resync action (flush and sync).", + 0 +}; /* clang-format on */ static void htable_rpc_delete(rpc_t *rpc, void *c) @@ -2119,6 +2123,32 @@ static void htable_rpc_dmqsync(rpc_t *rpc, void *c) rpc->rpl_printf(c, "Ok"); } +/*! \brief RPC htable.dmgresync command to empty a hash table and sync via dmq */ +static void htable_rpc_dmqresync(rpc_t *rpc, void *c) +{ + str htname; + ht_t *ht; + + if(rpc->scan(c, "S", &htname) < 1) { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht == NULL) { + rpc->fault(c, 500, "No such htable"); + return; + } + if(ht_reset_content(ht) < 0) { + rpc->fault(c, 500, "Htable flush failed."); + return; + } + if(ht_dmq_request_sync(&htname) < 0) { + rpc->fault(c, 500, "HTable DMQ Sync Failed"); + return; + } + rpc->rpl_printf(c, "Ok"); +} + /* clang-format off */ rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, RET_ARRAY}, @@ -2135,6 +2165,7 @@ rpc_export_t htable_rpc[] = { {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {"htable.dmqsync", htable_rpc_dmqsync, htable_dmqsync_doc, 0}, + {"htable.dmqresync", htable_rpc_dmqresync, htable_dmqresync_doc, 0}, {0, 0, 0, 0} }; /* clang-format on */

1 0

[kamailio/kamailio] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
by Charles Chance 17 Aug '23

17 Aug '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added new module param to enable retention of call stats for existing destinations when reloading the list from file or database. Also updated to retain stats for other destinations when adding/removing individual ones via RPC. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3534 -- Commit Summary -- * dispatcher: add option to retain existing latency stats when reloading destinations -- File Changes -- M src/modules/dispatcher/dispatch.c (63) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (2) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3534.patch https://github.com/kamailio/kamailio/pull/3534.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3534 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3534(a)github.com>

4 11

git:master:b612f079: htable: docs for rpc htable.dmqsync
by Daniel-Constantin Mierla 16 Aug '23

16 Aug '23

Module: kamailio Branch: master Commit: b612f07918212ae872c092562a9e0527a89f7f9e URL: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T14:57:15+02:00 htable: docs for rpc htable.dmqsync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… Patch: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 84f20e7b328..c7d68847f04 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1778,6 +1778,25 @@ kamcmd htable.listTables ... kamcmd htable.stats ... +</programlisting> + </section> + <section id="htable.rpc.dmqsync"> + <title> + <function moreinfo="none">htable.dmqsync</function> + </title> + <para> + Perform a MdQ sync action. + </para> + <para> + Name: <emphasis>htable.dmqsync</emphasis> + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.dmqsync +... </programlisting> </section>

4 9

[kamailio/kamailio] ims_qos: doc update and warn logs (PR #3521)
by Stefan Mititelu 16 Aug '23

16 Aug '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Primary goal is to update doc, for Rx_AAR() function, to mention is used only for replies. I've also changed some LM_DBG to LM_WARN but I can revert that on request (don't want to overflow noone with warnings) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3521 -- Commit Summary -- * ims_qos: doc update and warn logs -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (6) M src/modules/ims_qos/ims_qos_mod.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3521.patch https://github.com/kamailio/kamailio/pull/3521.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3521 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3521(a)github.com>

4 8

git:master:722a79a9: core: cfg.y typo in parsing XAVPVIAFIELDS
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 722a79a9ba8ca2608e699ec14684ce004ae10d60 URL: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T23:06:20+02:00 core: cfg.y typo in parsing XAVPVIAFIELDS In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS. --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… Patch: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index b93638eaa40..eef8e6acd28 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -886,7 +886,7 @@ assign_stm: _ksr_xavp_via_params.len=strlen($3); } | XAVPVIAPARAMS EQUAL error { yyerror("string value expected"); } - | XAVPVIAFIELDS EQUAL STRING { _ksr_xavp_via_params.s=$3; + | XAVPVIAFIELDS EQUAL STRING { _ksr_xavp_via_fields.s=$3; _ksr_xavp_via_fields.len=strlen($3); } | XAVPVIAFIELDS EQUAL error { yyerror("string value expected"); }

1 0

git:master:440bab64: htable: docs for htable parameter of rpc htable.dmqsync
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 440bab64af7428891527cedfadb20a3e9df2b461 URL: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T22:54:14+02:00 htable: docs for htable parameter of rpc htable.dmqsync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… Patch: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 85b29d9b604..2e4b377999a 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1782,7 +1782,7 @@ kamcmd htable.stats </section> <section id="htable.rpc.dmqsync"> <title> - <function moreinfo="none">htable.dmqsync</function> + <function moreinfo="none">htable.dmqsync [htable]</function> </title> <para> Perform a DMQ sync action. @@ -1790,6 +1790,12 @@ kamcmd htable.stats <para> Name: <emphasis>htable.dmqsync</emphasis> </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable: name of the hash table to perform dmq sync for. + If not provided, sync is performed for all hash tables that have + dmq sync enabled.</para></listitem> + </itemizedlist> <para> Example: </para>

1 0

git:master:49adf6b6: htable: option to dmq sync a single htable via rpc
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 49adf6b697c87c1e0426390511048eeacfe4c826 URL: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T22:50:15+02:00 htable: option to dmq sync a single htable via rpc --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee… Patch: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee…

1 0

[kamailio/kamailio] core: cfg.y typo in parsing XAVPVIAFIELDS (PR #3540)
by Rick Barenthin 15 Aug '23

15 Aug '23

In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS.   #### 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  `via_use_xavp_fields("1");` and probably `via_add_xavp_params("1");` are broken because of a typo in parsing the xavp names. The values of xavp_via_params global parameter and xavp_via_fields global parameter are not stored correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3540 -- Commit Summary -- * core: cfg.y typo in parsing XAVPVIAFIELDS -- File Changes -- M src/core/cfg.y (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3540.patch https://github.com/kamailio/kamailio/pull/3540.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3540 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3540(a)github.com>

2 2

git:master:e8591696: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: e859169628ed4c3dc1c5a9230e29046c9cb8fc46 URL: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T23:01:16+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… Patch: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 350e9fab41d..238c4e86bef 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -93,7 +93,7 @@ Ovidiu Sas 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 7. Event routes @@ -213,7 +213,7 @@ Chapter 1. Admin Guide 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 7. Event routes @@ -1125,7 +1125,7 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 6.1. htable.get htable key @@ -1371,12 +1371,17 @@ kamcmd htable.listTables kamcmd htable.stats ... -6.14. htable.dmqsync +6.14. htable.dmqsync [htable] Perform a DMQ sync action. Name: htable.dmqsync + Parameters: + * htable: name of the hash table to perform dmq sync for. If not + provided, sync is performed for all hash tables that have dmq sync + enabled. + Example: ... kamcmd htable.dmqsync

1 0

[kamailio/kamailio] ims_ipsec_pcscf: typo in spi_add function definition (Issue #3513)
by jbipre2 15 Aug '23

15 Aug '23

### Description  Migrating from Kamailio 5.6.4 IMS to Kamailio 5.7.1 IMS; using Open5GS CN, Amarisoft CallBox eNB, and Huawei UE to implement VoLTE infrastructure for lab testing. VoLTE works in Kamailio 5.6.4 IMS with IPSEC and non-IPSEC UE's; but Kamailio 5.7.1 IMS not working yet with IPSEC UE. Client and server port settings in P-CSCF kamailio.cfg: ... modparam("ims_ipsec_pcscf", "ipsec_client_port", 5100) modparam("ims_ipsec_pcscf", "ipsec_server_port", 6100) ... Debug log shows ports are exchanged (server port used as client port and vice-versa): ... Jul 18 12:15:30 corsa03 p-cscf[58287]: DEBUG: ims_ipsec_pcscf [cmd.c:460]: create_ipsec_tunnel(): Creating security associations: Local IP: 10.169.138.17 **port_pc: 6100 port_ps: 5100**; UE IP: 10.46.0.6; port_uc 31409 port_us 31894; spi_pc 4096, spi_ps 4097, spi_uc 48734730, spi_us 96335982, alg hmac-md5-96, ealg null ... ### Troubleshooting spi_add function definition and declaration differ: From src/modules/ims_ipsec_pcscf/spi_list.h: int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, **uint16_t cport, uint16_t sport**); But in spi_list.c: int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, **uint16_t sport, uint16_t cport**) #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  Applied following patch: --- a/src/modules/ims_ipsec_pcscf/spi_list.c 2023-06-28 09:40:45.000000000 +0200 +++ b/src/modules/ims_ipsec_pcscf/spi_list.c 2023-07-18 16:12:11.166476076 +0200 @@ -51,7 +51,7 @@ } int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, - uint16_t sport, uint16_t cport) + uint16_t cport, uint16_t sport) { if(!list) { return 1; Log now shows expected client and server port: ... Jul 18 17:45:22 corsa03 p-cscf[82076]: DEBUG: ims_ipsec_pcscf [cmd.c:460]: create_ipsec_tunnel(): Creating security associations: Local IP: 10.169.138.17 **port_pc: 5100 port_ps: 6100**; UE IP: 10.46.0.6; port_uc 31411 port_us 31896; spi_pc 4096, spi_ps 4097, spi_uc 48734732, spi_us 96335984, alg hmac-md5-96, ealg null ... ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.1 (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 on 16:22:26 Jul 18 2023 with x86_64-pc-linux-gnu-gcc 13.1.1 ``` * **Operating System**:  ``` Linux corsa03 6.4.2-gentoo-x86_64 #2 SMP PREEMPT_DYNAMIC Tue Jul 11 14:35:45 CEST 2023 x86_64 AMD EPYC 7513 32-Core Processor AuthenticAMD GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3513 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3513(a)github.com>

2 3

git:master:a053bcc3: ims_ipsec_pcscf: typo in spi_add function definition, GH #3513
by Henning Westerholt 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: a053bcc391f0680ecd5f458d2512e57f69499d39 URL: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-15T14:17:38Z ims_ipsec_pcscf: typo in spi_add function definition, GH #3513 - fix typo in spi_add function definition - patch from jbipre2, GH #3513 --- Modified: src/modules/ims_ipsec_pcscf/spi_list.c --- Diff: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… Patch: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… --- diff --git a/src/modules/ims_ipsec_pcscf/spi_list.c b/src/modules/ims_ipsec_pcscf/spi_list.c index 37a76cba79c..f56952f8111 100644 --- a/src/modules/ims_ipsec_pcscf/spi_list.c +++ b/src/modules/ims_ipsec_pcscf/spi_list.c @@ -51,7 +51,7 @@ void destroy_list(spi_list_t *lst) } int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, - uint16_t sport, uint16_t cport) + uint16_t cport, uint16_t sport) { if(!list) { return 1;

1 0

git:master:9becbcb1: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 9becbcb11005377b9925386e5c0de89d20e39b26 URL: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T16:01:18+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… Patch: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 9b205fc6825..350e9fab41d 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1373,7 +1373,7 @@ kamcmd htable.stats 6.14. htable.dmqsync - Perform a MdQ sync action. + Perform a DMQ sync action. Name: htable.dmqsync

1 0

git:master:4d285806: htable: spelling fix related to commit b612f0791821
by Henning Westerholt 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 4d285806b4bb9197c58e0d6e1d4fb33a65865138 URL: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-15T13:49:56Z htable: spelling fix related to commit b612f0791821 --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… Patch: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c7d68847f04..85b29d9b604 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1785,7 +1785,7 @@ kamcmd htable.stats <function moreinfo="none">htable.dmqsync</function> </title> <para> - Perform a MdQ sync action. + Perform a DMQ sync action. </para> <para> Name: <emphasis>htable.dmqsync</emphasis>

1 0

git:master:0e11b4e8: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 0e11b4e8f3b1380043034ea9e66f7643e4623960 URL: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T15:01:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… Patch: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 0252b62e030..9b205fc6825 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -93,6 +93,7 @@ Ovidiu Sas 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats + 6.14. htable.dmqsync 7. Event routes @@ -212,6 +213,7 @@ Chapter 1. Admin Guide 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats + 6.14. htable.dmqsync 7. Event routes @@ -1123,6 +1125,7 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats + 6.14. htable.dmqsync 6.1. htable.get htable key @@ -1368,6 +1371,17 @@ kamcmd htable.listTables kamcmd htable.stats ... +6.14. htable.dmqsync + + Perform a MdQ sync action. + + Name: htable.dmqsync + + Example: +... +kamcmd htable.dmqsync +... + 7. Event routes 7.1. htable:mod-init

1 0

git:master:a50aa868: htable: rpc command to permorm a dmq sync action
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: a50aa8688afdca9e3c4e34e8d3929e96e6f5b3fa URL: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T14:52:56+02:00 htable: rpc command to permorm a dmq sync action --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… Patch: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 22bb221a57f..5b73e4fafb6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1512,6 +1512,10 @@ static const char *htable_store_doc[2] = { "Store hash table to database.", 0 }; +static const char *htable_dmqsync_doc[2] = { + "Perform DMQ sync action.", + 0 +}; /* clang-format on */ static void htable_rpc_delete(rpc_t *rpc, void *c) @@ -2098,6 +2102,17 @@ static void htable_rpc_store(rpc_t *rpc, void *c) return; } +/*! \brief RPC htable.dmqsync command to sync a hash table via dmq */ +static void htable_rpc_dmqsync(rpc_t *rpc, void *c) +{ + + if(ht_dmq_request_sync() < 0) { + rpc->fault(c, 500, "HTable DMQ Sync Failed"); + return; + } + rpc->rpl_printf(c, "Ok"); +} + /* clang-format off */ rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, RET_ARRAY}, @@ -2113,6 +2128,7 @@ rpc_export_t htable_rpc[] = { {"htable.store", htable_rpc_store, htable_store_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, + {"htable.dmqsync", htable_rpc_dmqsync, htable_dmqsync_doc, 0}, {0, 0, 0, 0} }; /* clang-format on */

1 0

git:master:8bdc40e0: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 8bdc40e085edddf1e58d8946e06983707fb15770 URL: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-14T17:16:24+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837… Patch: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837…

1 0

git:master:20634fcc: ims_qos: doc and logs update
by Henning Westerholt 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 20634fccc59c82a35b45a3da0b8e6a0e64acb37e URL: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-14T17:08:35+02:00 ims_qos: doc and logs update --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… Patch: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index b8a36c7b136..7755a963abd 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -29,7 +29,7 @@ <itemizedlist> <listitem> - <para>Dialog</para> + <para>IMS Dialog</para> </listitem> <listitem> @@ -625,8 +625,8 @@ route[REG_AAR_REPLY] </listitem> </itemizedlist> - <para>This function can be used from REQUEST_ROUTE or - ONREPLY_ROUTE.</para> + <para>This function can be used only from ONREPLY_ROUTE, only for replies to INVITE, UPDATE, PRACK. + The reply and request must have SDP, for this function to work properly.</para> <para>p.s. this is executed asynchronously. See example on how to retrieve return value</para> diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index d2502020450..9ff174f03eb 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -205,8 +205,8 @@ static int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst) } -static cmd_export_t cmds[] = {{"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar, - 0, REQUEST_ROUTE | ONREPLY_ROUTE}, +static cmd_export_t cmds[] = { + {"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar, 0, ONREPLY_ROUTE}, {"Rx_AAR_Register", (cmd_function)w_rx_aar_register, 2, fixup_aar_register, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -801,7 +801,7 @@ static int w_rx_aar( } if(t->uas.status >= 200) { - LM_DBG("transaction sent out a final response already - %d\n", + LM_WARN("transaction sent out a final response already - %d\n", t->uas.status); return result; } @@ -864,13 +864,13 @@ static int w_rx_aar( || memcmp(t->method.s, "UPDATE", 6) == 0))) { if(cscf_get_content_length(msg) == 0 || cscf_get_content_length(orig_sip_request_msg) == 0) { - LM_DBG("No SDP offer answer -> therefore we can not do Rx AAR"); + LM_WARN("No SDP offer answer -> therefore we can not do Rx AAR"); //goto aarna; //AAR na if we don't have offer/answer pair return result; } } else { - LM_DBG("Message is not response to INVITE, PRACK or UPDATE -> " - "therefore we do not Rx AAR"); + LM_WARN("Message is not response to INVITE, PRACK or UPDATE -> " + "therefore we do not Rx AAR"); return result; } @@ -1162,7 +1162,7 @@ static int w_rx_aar( int ret = create_new_callsessiondata(&callid, &ftag, &ttag, &identifier, identifier_type, &ip, ip_version, &rx_authdata_p); if(!ret) { - LM_DBG("Unable to create new media session data parcel\n"); + LM_ERR("Unable to create new media session data parcel\n"); goto error; }

1 0

git:master:2a1a65db: dispatcher: add option to retain existing latency stats when reloading destinations
by Henning Westerholt 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 2a1a65dba78665b9d663e2e8335cff11a1116ec2 URL: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-14T17:06:36+02:00 dispatcher: add option to retain existing latency stats when reloading destinations - also retain when adding/removing individual destinations via RPC --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1… Patch: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1…

1 0

git:master:2fd5d881: modules: readme files regenerated - rabbitmq ... [skip ci]
by Kamailio Dev 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 2fd5d881563126f7425730f798afcbfc2feeac65 URL: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-12T13:46:24+02:00 modules: readme files regenerated - rabbitmq ... [skip ci] --- Modified: src/modules/rabbitmq/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… Patch: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… --- diff --git a/src/modules/rabbitmq/README b/src/modules/rabbitmq/README index 942afffa83f..889512b6a48 100644 --- a/src/modules/rabbitmq/README +++ b/src/modules/rabbitmq/README @@ -176,7 +176,7 @@ modparam("rabbitmq", "direct_reply_to", 1) * content_type - the content_type of the messagebody. * messagebody - the messagebody to be published. - This function can be used from REQUEST_ROUTE. + This function can be used from any route. Example 1.5. rabbitmq_publish usage rabbitmq_publish("exchange", "routing_key", "application/json", "$avp(json_reque diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 9a59c839aa1..ec009bacafb 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -83,8 +83,8 @@ Chapter 1. Admin Guide SIP parser can easily handle HTTP requests just by adding a fake Via header. - The <module>xmlrpc</module> module uses the same concept. The xHTTP - module offers a generic way of handling the HTTP protocol, by calling + The xmlrpc module uses the same concept. The xHTTP module offers a + generic way of handling the HTTP protocol, by calling event_route[xhttp:request] in your config. You can check the HTTP URL via the config variable $hu. Note that use of $ru will raise errors since the structure of an HTTP URL is not compatible with that of a SIP @@ -222,7 +222,10 @@ event_route[xhttp:request] { 6.1. xhttp:request - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) - + body of header X, $rm - request method, $rb - request body, ...). ... tcp_accept_no_cl=yes ...

1 0

[kamailio/kamailio] rabbitmq: Enabling rabbitmq_publish for any route and disabling peer verfication (PR #3537)
by joelbax 12 Aug '23

12 Aug '23

Enabling rabbitmq_publish function on any route so we can send events on reply reception. Also disabling peer verification on the TLS handshake if no CA file is configured.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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/3537 -- Commit Summary -- * rabbitmq: Enabling rabbitmq_publish for any route and disabling peer -- File Changes -- M src/modules/rabbitmq/doc/rabbitmq_admin.xml (2) M src/modules/rabbitmq/rabbitmq.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3537.patch https://github.com/kamailio/kamailio/pull/3537.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3537 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3537(a)github.com>

2 3

git:master:2475dfa2: rabbitmq: Enabling rabbitmq_publish for any route and disabling peer
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 2475dfa2564346b7c0790012e72cd17a5d9ca7f6 URL: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:39:24+02:00 rabbitmq: Enabling rabbitmq_publish for any route and disabling peer verification Enabling rabbitmq_publish function on any route so we can send events on reply reception. Also disabling peer verification on the TLS handshake if no CA file is configured. --- Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Patch: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… --- diff --git a/src/modules/rabbitmq/doc/rabbitmq_admin.xml b/src/modules/rabbitmq/doc/rabbitmq_admin.xml index 18bd4676021..8ed436a6bfa 100644 --- a/src/modules/rabbitmq/doc/rabbitmq_admin.xml +++ b/src/modules/rabbitmq/doc/rabbitmq_admin.xml @@ -204,7 +204,7 @@ modparam("rabbitmq", "direct_reply_to", 1) </itemizedlist> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from any route. </para> <example> diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 94341070508..50d143723e6 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -120,7 +120,7 @@ static int rbmq_fixup_free_params(void **param, int param_no) /* module commands */ static cmd_export_t cmds[] = { {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE}, + fixup_free_spve_all, ANY_ROUTE}, {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -597,10 +597,10 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) } #if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 - amqp_ssl_socket_set_verify(amqp_sock, 1); + amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #else - amqp_ssl_socket_set_verify_peer(amqp_sock, 1); - amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); + amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_hostname(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #endif ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port);

1 0

git:master:170067e6: xhttp: note about available variables during http request processing
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 170067e633ef32ea7b17adad46fdfe2c85fadda0 URL: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:31:15+02:00 xhttp: note about available variables during http request processing --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Patch: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index f0e6d3fdeb8..1c7d29a051a 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -22,7 +22,7 @@ Via header. </para> <para> - The <module>xmlrpc</module> module uses the same concept. + The xmlrpc module uses the same concept. The xHTTP module offers a generic way of handling the <acronym>HTTP</acronym> protocol, by calling <emphasis>event_route[xhttp:request]</emphasis> in your config. You can check the HTTP URL via the config variable @@ -228,7 +228,10 @@ event_route[xhttp:request] { <function moreinfo="none">xhttp:request</function> </title> <para> - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) + - body of header X, $rm - request method, $rb - request body, ...). </para> <programlisting format="linespecific"> ...

1 0

git:master:e60ce488: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: e60ce488db239f717803b0f4f83180646ee47200 URL: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-12T12:31:22+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Patch: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 57eff8a890f..0caa3d4631f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -146,7 +146,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libcurl libev + * libcurl - https://curl.se/libcurl/ + * libevent - https://libevent.org/ 3. Parameters

1 0

git:master:f16d2658: http_async_client: docs - dependency on libevent
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c URL: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T12:16:37+02:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Patch: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index f514986725d..e03b0208915 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -48,8 +48,12 @@ <itemizedlist> <listitem> <para> - <emphasis>libcurl</emphasis> - <emphasis>libev</emphasis> + <emphasis>libcurl</emphasis> - https://curl.se/libcurl/ + </para> + </listitem> + <listitem> + <para> + <emphasis>libevent</emphasis> - https://libevent.org/ </para> </listitem> </itemizedlist>

1 0

git:master:18ae7720: pkg/kamailio/deb: rule to print excluded modules [skip ci]
by Victor Seva 10 Aug '23

10 Aug '23

Module: kamailio Branch: master Commit: 18ae77207409b816d6dffb13b41e3be9c251d62c URL: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-10T09:56:30+02:00 pkg/kamailio/deb: rule to print excluded modules [skip ci] --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Patch: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be…

1 0

git:master:5c7de00b: regex: convert to memory error logging helper
by Victor Seva 09 Aug '23

09 Aug '23

Module: kamailio Branch: master Commit: 5c7de00bc0826cf739577010ba7b4882e83819cc URL: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:21:05+02:00 regex: convert to memory error logging helper --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Patch: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e9943dc57e0..2860e11a413 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -198,13 +198,13 @@ static int mod_init(void) /* Pointer to pcres */ if((pcres_addr = shm_malloc(sizeof(pcre **))) == 0) { - LM_ERR("no memory for pcres_addr\n"); + SHM_MEM_ERROR; goto err; } /* Integer containing the number of pcres */ if((num_pcres = shm_malloc(sizeof(int))) == 0) { - LM_ERR("no memory for num_pcres\n"); + SHM_MEM_ERROR; goto err; } @@ -425,14 +425,14 @@ static int load_pcres(int action) shm_free(pcres); } if((pcres = shm_malloc(sizeof(pcre *) * num_pcres_tmp)) == 0) { - LM_ERR("no more memory for pcres\n"); + SHM_MEM_ERROR; goto err; } memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for(i = 0; i < num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if((pcres[i] = shm_malloc(pcre_size)) == 0) { - LM_ERR("no more memory for pcres[%i]\n", i); + SHM_MEM_ERROR; goto err; } memcpy(pcres[i], pcres_tmp[i], pcre_size);

1 0

[kamailio/kamailio] fix warnings detected via codeql (PR #3497)
by Victor Seva 09 Aug '23

09 Aug '23

#### 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 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3497 -- Commit Summary -- * sipcapture: use memcpy instead of strncpy for coherence * rtpproxy: use memcpy instead of strcpy for coherence -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (40) M src/modules/sipcapture/sipcapture.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3497.patch https://github.com/kamailio/kamailio/pull/3497.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3497 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3497(a)github.com>

2 7

git:master:11b24eb3: ctl: use snprintf() to set boundaries
by Victor Seva 09 Aug '23

09 Aug '23

Module: kamailio Branch: master Commit: 11b24eb35f4bb1e9825b3191d8f6e0fc9c0a3e28 URL: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:20:52+02:00 ctl: use snprintf() to set boundaries > https://github.com/kamailio/kamailio/security/code-scanning/1839 --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Patch: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 87654c8534c..5e289cfa8d9 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -212,6 +212,7 @@ static int mod_init(void) { struct id_list *l; char ctl_socket_path[CTL_SOCKET_PATH_SIZE]; + int len; binrpc_callbacks_init(); @@ -226,17 +227,14 @@ static int mod_init(void) if(strcmp(runtime_dir, RUN_DIR) == 0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } else { - if(sizeof(DEFAULT_CTL_SOCKET_PROTO) - + sizeof(DEFAULT_CTL_SOCKET_NAME) - + strlen(runtime_dir) + 4 - > CTL_SOCKET_PATH_SIZE) { + len = sizeof(DEFAULT_CTL_SOCKET_PROTO) + + sizeof(DEFAULT_CTL_SOCKET_NAME) + strlen(runtime_dir) + 4; + if(len > CTL_SOCKET_PATH_SIZE) { LM_ERR("ctl socket path is too big\n"); return -1; } - strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); - strcat(ctl_socket_path, runtime_dir); - strcat(ctl_socket_path, "/"); - strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME); + snprintf(ctl_socket_path, len, "%s%s/%s", DEFAULT_CTL_SOCKET_PROTO, + runtime_dir, DEFAULT_CTL_SOCKET_NAME); add_binrpc_socket(PARAM_STRING, ctl_socket_path); } }

1 0

[kamailio/kamailio] Halo Experts, really appreciated if I can get some assistance on the start failure issue when doing patching from kamailio 5.5.4 to 5.5.6 with the error, 'terminating due to SIGCHLD' . Thanks a lot! (Issue #3533)
by Louis Liu 09 Aug '23

09 Aug '23

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3533 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3533(a)github.com>

2 5

Question for not_empty() config function
by Stefan-Cristian Mititelu 09 Aug '23

09 Aug '23

Hello, I have a question for [1] config function. Can I extend it to work with INTs too? e.g. if pv not NULL and INT flag, return 1. This would help, because one won't need to know the type of the pvar beforehand, for using this function. Or is it meant to be used only with string pv only? [1] https://www.kamailio.org/docs/modules/devel/modules/pv.html#pv.f.not_empty Thank you, Stefan

2 2

git:master:d893f3af: core: Add TCP_USER_TIMEOUT socket option on listening socket.
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: d893f3af1444c8c4c5db6cd53fb577703007c90c URL: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Author: Walter Schober <walter.schober(a)neotel.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T19:32:53+02:00 core: Add TCP_USER_TIMEOUT socket option on listening socket. Use tcp_send_timeout config option also on listening socket to timeout outbound messages sent on passive inbound connections. --- Modified: src/core/tcp_main.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Patch: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e96d68c40b2..7f07d724108 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3172,6 +3172,18 @@ int tcp_init(struct socket_info *sock_info) } #endif init_sock_keepalive(sock_info->socket); +#ifdef HAVE_TCP_USER_TIMEOUT + if((optval = TICKS_TO_S(cfg_get(tcp, tcp_cfg, send_timeout)))) { + optval *= 1000; + if(setsockopt(sock_info->socket, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, + sizeof(optval)) + < 0) { + LM_WARN("failed to set TCP_USER_TIMEOUT: %s\n", strerror(errno)); + } else { + LM_INFO("Set TCP_USER_TIMEOUT=%d ms\n", optval); + } + } +#endif if(bind(sock_info->socket, &addr->s, sockaddru_len(*addr)) == -1) { LM_ERR("bind(%x, %p, %d) on %s:%d : %s\n", sock_info->socket, &addr->s, (unsigned)sockaddru_len(*addr), sock_info->address_str.s, diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index d5a628a1128..84c551e2a3b 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -68,6 +68,13 @@ #endif /* __OS_ */ #endif /* NO_TCP_LINGER2 */ +/* tcp user_timeout */ +#ifndef NO_TCP_USER_TIMEOUT +#ifdef __OS_linux +#define HAVE_TCP_USER_TIMEOUT +#endif /* __OS_ */ +#endif /* NO_TCP_LINGER2 */ + /* keepalive */ #ifndef NO_TCP_KEEPALIVE #define HAVE_SO_KEEPALIVE

1 0

git:master:63445544: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 63445544d994d7876ff76eb66203400c5a3a4b91 URL: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-07T15:49:07+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Patch: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400…

1 0

[kamailio/kamailio] Typos (PR #3520)
by Дилян Палаузов 07 Aug '23

07 Aug '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3520 -- Commit Summary -- * docs/ : typos * etc/ typos -- File Changes -- M INSTALL (2) M doc/docbook/catalog.xml (2) M doc/docbook/dep.xsl (4) M doc/docbook/entities.xml (10) M doc/docbook/html.chunked.xsl (2) M doc/doxygen/main.dox (2) M doc/man/kamailio.cfg.5 (2) M doc/misc/HISTORY (10) M doc/misc/NEWS (58) M doc/misc/TODO (10) M doc/misc/cvs-commit-rules.txt (6) M doc/stylesheets/dbschema_k/catalog.xml (2) M doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl (4) M doc/stylesheets/dbschema_k/xsl/db_redis.xsl (4) M doc/stylesheets/dbschema_k/xsl/dbtext.xsl (4) M doc/stylesheets/dbschema_k/xsl/mysql.xsl (2) M doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl (2) M doc/tutorials/presence/cfg/ps.cfg (2) M doc/tutorials/presence/install.xml (2) M doc/tutorials/presence/intro.xml (4) M doc/tutorials/serdev/routing_engine.xml (2) M doc/tutorials/seruser/otherapps.xml (2) M etc/kamailio.cfg (4) M etc/sip-router.cfg (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3520.patch https://github.com/kamailio/kamailio/pull/3520.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3520 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3520(a)github.com>

2 1

git:master:9fba6779: docs/ : typos
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 9fba67792382b53ccd4851764505ee3b119531b1 URL: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T15:32:56+02:00 docs/ : typos --- Modified: INSTALL Modified: doc/docbook/catalog.xml Modified: doc/docbook/dep.xsl Modified: doc/docbook/entities.xml Modified: doc/docbook/html.chunked.xsl Modified: doc/doxygen/main.dox Modified: doc/man/kamailio.cfg.5 Modified: doc/misc/HISTORY Modified: doc/misc/NEWS Modified: doc/misc/TODO Modified: doc/misc/cvs-commit-rules.txt Modified: doc/stylesheets/dbschema_k/catalog.xml Modified: doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl Modified: doc/stylesheets/dbschema_k/xsl/db_redis.xsl Modified: doc/stylesheets/dbschema_k/xsl/dbtext.xsl Modified: doc/stylesheets/dbschema_k/xsl/mysql.xsl Modified: doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl Modified: doc/tutorials/presence/cfg/ps.cfg Modified: doc/tutorials/presence/install.xml Modified: doc/tutorials/presence/intro.xml Modified: doc/tutorials/serdev/routing_engine.xml Modified: doc/tutorials/seruser/otherapps.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3… Patch: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3…

1 0

git:master:6e9335ff: etc/ typos
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 6e9335ff2245596b74bc1c749d1e7805bf186f02 URL: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T15:32:56+02:00 etc/ typos --- Modified: etc/kamailio.cfg Modified: etc/sip-router.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Patch: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 68493736d41..715c289af1e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -227,7 +227,7 @@ enable_sctp=no ####### Custom Parameters ######### -/* These parameters can be modified runtime via RPC interface +/* These parameters can be modified at runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description @@ -389,7 +389,7 @@ modparam("registrar", "path_mode", 0) modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) -/* by default ww do not adjust the direct of the sequential requests. +/* by default we do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg index 0390ef7ec57..8669ea63d79 100644 --- a/etc/sip-router.cfg +++ b/etc/sip-router.cfg @@ -1,7 +1,7 @@ # # $Id$ # -# Example configuration file (simpler then ser-oob.cfg, but more +# Example configuration file (simpler than ser-oob.cfg, but more # complex then ser-basic.cfg). # # First start SER sample config script with: @@ -73,7 +73,7 @@ rev_dns=no # (cmd. line: -R) #group=ser #disable_core=yes #disables core dumping #open_fd_limit=1024 # sets the open file descriptors limit -#mhomed=yes # usefull for multihomed hosts, small performance penalty +#mhomed=yes # useful for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) sip_warning=yes @@ -172,7 +172,7 @@ modparam("ctl", "binrpc", "tcp:127.0.0.1:2046") # failed transactions (=negative responses) should be logged to modparam("acc_db", "failed_transactions", 1) -# comment the next line if you dont want to have accounting to DB +# comment the next line if you don't want to have accounting to DB modparam("acc_db", "log_flag", "FLAG_ACC") # -- tm params -- @@ -197,7 +197,7 @@ modparam("tls", "private_key", "ser-selfsigned.key") # -- xmlrpc params -- -# using a sub-route from the module is a lot safer then relying on the +# using a sub-route from the module is a lot safer than relying on the # request method to distinguish HTTP from SIP modparam("xmlrpc", "route", "RPC"); @@ -358,8 +358,8 @@ route[RR] # particularly good if upstream and downstream entities # use different transport protocol - # if the inital INVITE got the ACC flag store this in - # an RR AVP cookie. this is more for demonstration purpose + # if the initial INVITE got the ACC flag store this in + # an RR AVP cookie. This is more for demonstration purpose if (isflagset(FLAG_ACC)) { $account = "yes"; setavpflag($account, "dialog_cookie"); @@ -377,7 +377,7 @@ route[DOMAIN] # check if the callee is at a local domain lookup_domain("$td", "@ruri.host"); - # we dont know the domain of the caller and also not + # we don't know the domain of the caller and also not # the domain of the callee -> somone uses our proxy as # a relay if (strempty($t.did) && strempty($f.did)) { @@ -528,7 +528,7 @@ route[INBOUND] if (lookup_contacts("location")) { append_hf("P-hint: usrloc applied\r\n"); - # we set the TM module timers according to the prefences + # we set the TM module timers according to the preferences # of the callee (avoid too long ringing of his phones) # Note1: timer values have to be in ms now! # Note2: this makes even more sense if you switch to a voicemail

1 0

Re: Performances issue when freeing shared memory in custom module (Kamailio 5.5.2)
by Henning Westerholt 04 Aug '23

04 Aug '23

Hello, (Adding sr-dev to CC) This looks indeed a bit strange. Do you get any error messages in the log? In which process you are freeing the memory, one of the worker processes or the RPC process? You could also try to use another memory manager to see if you get better performance. There is a command line parameter to choose one during startup. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/> From: Chaigneau, Nicolas <nicolas.chaigneau(a)capgemini.com> Sent: Wednesday, January 18, 2023 6:49 PM To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] Performances issue when freeing shared memory in custom module (Kamailio 5.5.2) Hello, I'm encountering performance issues with Kamailio (5.5.2). I'm using a custom Kamailio module that loads routing data in memory, using Kamailio shared memory. This routing data is very large. It can be fully reloaded through a Kamailio RPC command (which is done once each day). When reloading, two sets of data are maintained, one "loading" and another "current" (the latter being used to handle SIP requests). When loading of the new data is finished, it is swapped to "current". Then, memory of the old (now unused) data is freed. I've noticed that when Kamailio is freeing the old data, there is a very significant performance impact on SIP requests. This is surprising to me, because the SIP requests do not use this old data. This is not a CPU issue, idle CPU% is at about 99% at that moment. I'm using the following functions : - shm_mallocxz - shm_free From what I understand, shm_free is actually "qm_shm_free" defined in "src\core\mem\q_malloc.c" (the default shared memory manager being "qm"). I've noticed that there is also a variant shm_free_unsafe ("qm_free"), which does not perform locking. I'm wondering if the lock could be the cause of my performances issues ? (But I'm not sure how this could be possible, because although the SIP requests need to access the shared memory allocated, they do not use directly the functions from the share memory manager.) If the performances issues are causes by the lock, could I use the unsafe version "safely" ? (considering that it is guaranteed that the old data cannot be used by anyone else) Thanks for your help. Regards, Nicolas. This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.

3 13

[kamailio/kamailio] Kamailio sending CCR TERMINATE request without waiting for the CCR INITIAL request response (#2143)
by harishyadav1465 03 Aug '23

03 Aug '23

**Description** We are using ims_charging module and Freediameter as diameter server for billing process....recently we faced one issue...For Initial **INVITEs** kamailio sending **CCR request (INITIAL_REQUEST)** to **diameter server** but if we receive Immediate **CANCLE** for the **INVITE**, kamailio sending **CCR request ( TERMINATE_REQUEST )** without waiting for the **CCR request (INITIAL_REQUEST) response** from the **Diameter server.**.. **Expected behavior** Kamailio has to send **CCR request ( TERMINATE_REQUEST )** after getting the **response** from the **INITIAL_REQUEST.** **Additional Info** kamailio server : 4.2 platform : linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2143

3 6

[kamailio/kamailio] acc_cdrs表是空的 (Issue #3527)
by kqbi 31 Jul '23

31 Jul '23

软电话注册到kamailio上打电话，数据库acc表有invite记录，但是acc_cdrs表示空的这是为什么，是我哪里配的不对吗，配置文件如下： ``` #!KAMAILIO # # Kamailio SIP Server v5.6 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at https://www.kamailio.org/wikidocs/ # for an explanation of possible statements, functions and parameters. # # Note: the comments can be: # - lines starting with #, but not the pre-processor directives, # which start with #!, like #!define, #!ifdef, #!endif, #!else, #!trydef, # #!subst, #!substdef, ... # - lines starting with // # - blocks enclosed in between /* */ # Note: the config performs symmetric SIP signaling # - it sends the reply to the source address of the request # - remove the use of force_rport() for asymmetric SIP signaling # # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog # - debugger module loaded with cfgtrace enabled # # *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: # - enable mysql # - define WITH_AUTH # - add users using 'kamctl' or 'kamcli' # # *** To enable IP authentication execute: # - enable mysql # - enable authentication # - define WITH_IPAUTH # - add IP addresses with group id '1' to 'address' table # # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB # # *** To enable presence server execute: # - enable mysql # - define WITH_PRESENCE # - if modified headers or body in config must be used by presence handling: # - define WITH_MSGREBUILD # # *** To enable nat traversal execute: # - define WITH_NAT # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # # *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: # - define WITH_RTPENGINE # - install RTPEngine: https://github.com/sipwise/rtpengine # - start RTPEngine: # rtpengine --listen-ng=127.0.0.1:2223 ... # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # # *** To enable database aliases lookup execute: # - enable mysql # - define WITH_ALIASDB # # *** To enable speed dial lookup execute: # - enable mysql # - define WITH_SPEEDDIAL # # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN # # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # # *** To enable JSONRPC over HTTP(S) support execute: # - define WITH_JSONRPC # - adjust event_route[xhttp:request] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # # *** To load htable module execute: # - define WITH_HTABLE # # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # # *** To block 401 and 407 authentication replies execute: # - define WITH_BLOCK401407 # # *** To enable VoiceMail routing execute: # - define WITH_VOICEMAIL # - set the value of voicemail.srv_ip # - adjust the value of voicemail.srv_port # # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB # - add following columns to database #!define WITH_DEBUG #!define WITH_MYSQL #!define WITH_NAT #!define WITH_RTPENGINE #!define WITH_ACCDB #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" server_header="Server: My Super SIP Server" ####### Defined Values ######### # *** Value defines - IDs used later in config #!ifdef WITH_DEBUG #!define DBGLEVEL 3 #!else #!define DBGLEVEL 3 #!endif #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://root:!Flytek@2022@172.30.91.47:3306/kamailio" #!endif #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif #!ifdef WITH_ANTIFLOOD # - hash table 'ipban' used to store blocked IP addresses #!trydef WITH_HTABLE #!endif # - flags # FLT_ - per transaction (message) flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 # FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=DBGLEVEL /* set to 'yes' to print log messages to terminal or use '-E' cli option */ log_stderror=no memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes for each UDP socket * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no /* add local domain aliases - it can be set many times */ alias="172.31.223.87" /* listen sockets - if none set, Kamailio binds to all local IP addresses * - basic prototype (full prototype can be found in Wiki - Core Cookbook): * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ listen=udp:0.0.0.0:5090 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif #!ifdef WITH_TLS enable_tls=yes /* upper limit for TLS connections */ tls_max_connections=2048 #!endif /* set it to yes to enable sctp and load sctp.so module */ enable_sctp=no ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "" desc "PSTN GW Address" pstn.gw_port = "" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "" desc "VoiceMail IP Address" voicemail.srv_port = "5060" desc "VoiceMail Port" #!endif ####### Modules Section ######## /* set paths to location of modules */ # mpath="/mnt/vdd/kqbi2/install/kamailio/lib64/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif #!ifdef WITH_JSONRPC loadmodule "xhttp.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "textopsx.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" loadmodule "dialog.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" #!ifdef WITH_RTPENGINE loadmodule "rtpengine.so" #!else loadmodule "rtpproxy.so" #!endif #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_HTABLE loadmodule "htable.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") #!ifdef WITH_JSONRPC modparam("jsonrpcs", "transport", 7) #!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) /* set it to 0 to disable Path handling */ modparam("registrar", "use_path", 1) /* save Path even if not listed in Supported header */ modparam("registrar", "path_mode", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_level", 2) modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "cdr_enable", 1) modparam("acc", "db_insert_mode", 1) modparam("acc", "cdr_start_id", "start") modparam("acc", "cdr_end_id", "end") modparam("acc", "cdr_duration_id", "d") modparam("acc", "cdr_log_enable", 1) #modparam("acc", "time_mode", 1) #modparam("acc", "time_attr", "seconds") modparam("acc", "cdrs_table", "acc_cdrs") modparam("dialog", "db_mode", 0) modparam("dialog", "hash_size", 1024) modparam("dialog", "enable_stats", 1) modparam("dialog", "profiles_with_value", "caller") modparam("dialog", "track_cseq_updates", 1) #!endif # ----- usrloc params ----- modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 1) modparam("usrloc", "use_domain", MULTIDOMAIN) /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "load_backends", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- #modparam("rtpengine", "rtpengine_sock", "udp:172.30.91.47:5090") modparam("rtpengine", "db_url", DBURL) modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") modparam("rtpengine", "setid_avp", "$avp(setid)") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") #!endif # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/mnt/vdd/kqbi2/install/kamailio/etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) #!endif #!ifdef WITH_HTABLE # ----- htable params ----- #!ifdef WITH_ANTIFLOOD /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif ####### Routing Logic ######## // 定义开关负载均衡dispatcher 模块 #!define WITH_LOADBALANCE // 加载模块，注意放置到所有loadmodule的最后 #!ifdef WITH_LOADBALANCE loadmodule "dispatcher.so" #!endif #modparam("tm", "reparse_invite", 0) #modparam("dispatcher", "list_file", "/mnt/vdd/kqbi2/install/kamailio/etc/kamailio/dispatcher.list") modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE|BYE")) { record_route(); } # account only INVITEs if (is_method("INVITE|BYE")) { setflag(FLT_ACC); # do accounting setflag(FLT_ACCFAILED); # do accounting } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU==$null) { # request with no Username in RURI sl_send_reply("484", "Address Incomplete"); exit; } # dispatch destinations to PSTN route(PSTN); # dispatch destinations route(DISPATCH); # user location service route(LOCATION); if (is_method("INVITE")) { if (has_body("application/sdp")) { if (rtpengine_offer("replace-origin replace-session-connection direction=pub direction=priv")) t_on_reply("1"); } else { t_on_reply("2"); } } if (is_method("ACK") && has_body("application/sdp")) { rtpengine_answer(); } if (is_method("BYE")) { rtpengine_delete(); } return; } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT", "ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483", "Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200", "Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request within a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404", "Not here"); exit; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403", "Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403", "Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTP relaying management and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); } else { rtpengine_manage("replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); return; } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } return; } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } return; } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404", "Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404", "Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif return; } # Dispatch requests route[DISPATCH] { # round robin dispatching on gateways group '1' if(!ds_select_dst("1", "4")) { send_reply("404", "No destination"); exit; } xdbg("--- SCRIPT: going to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; } # Try next destionations in failure route failure_route[RTF_DISPATCH] { if (t_is_canceled()) { exit; } # next DST - only for 500 or local timeout if (t_check_status("500") or (t_branch_timeout() and !t_branch_replied())) { if(ds_next_dst()) { xdbg("--- SCRIPT: retrying to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; } } } onreply_route[1] { if (has_body("application/sdp")) rtpengine_answer("replace-origin replace-session-connection direction=priv direction=pub"); } onreply_route[2] { if (has_body("application/sdp")) rtpengine_offer(); } ``` ![i讯飞图片_1690774069088](https://github.com/kamailio/kamailio/assets/40823194/0d55e36f-ce10-42ec-9941-b6110de2f60a) ![i讯飞图片_1690774076035](https://github.com/kamailio/kamailio/assets/40823194/0dd92965-7d96-442b-bb7a-9c16e48a7f4e) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3527 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3527(a)github.com>

2 1

[kamailio/kamailio] siptrace: frong IPv4 address value (#2092)
by sergey-safarov 30 Jul '23

30 Jul '23

### Description Please check attached pcap. [siptrace.pcap.gz](https://github.com/kamailio/kamailio/files/3688791/siptra… Kamailio send INVITE (packet 1) from port `TCP/42394`. SIP trace encapsulate INVITE (packet 2) and encodes Kamailio source port `TCP/5060` #### Debugging Data HEP header parsed by lua [disector](https://github.com/sipcapture/hep-wireshark) ``` HEP3 Protocol HEP ID: HEP3 Length (Bytes): 1574 Protocol family: IPv4 Protocol ID: TCP Source IPv4 address: 172.21.0.131 Destination IPv4 address: 192.168.57.11 Source port: 5060 Destination port: 5060 Timestamp: 1570150645 Timestamp us: 740165 Protocol Type: SIP Capture ID: 1 Payload [truncated]: INVITE sip:911@192.168.57.11;transport=tcp SIP/2.0\r\nRecord-Route: <sip:172.21.0.131;transport=tcp;lr=on;ftag=KvNj7jXrmK89p>\r\nVia: SIP/2.0/TCP 172.21.0.131;branch=z9hG4bK7c2d.2d8104273b7063309f5694ac963c9ad8.0;i=21 ``` [HEP format description located here](https://github.com/sipcapture/HEP/blob/master/docs/HEP3_Network_Proto…. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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 on 11:01:40 Oct 4 2018 with gcc 6.4.0 ``` * **Operating System**: Docker container Userland ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.1 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` Kernel Amazon Linux 2 ``` / # uname -a Linux proxy-dc0-0 4.14.128-112.105.amzn2.x86_64 #1 SMP Wed Jun 19 16:53:40 UTC 2019 x86_64 Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2092

2 7

[kamailio/kamailio] crypto: SHA1_Init deprecated at openssl 3.0 (PR #3518)
by Victor Seva 27 Jul '23

27 Jul '23

#### 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 - [x] Related to issue #3502 #### Description From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3518 -- Commit Summary -- * crypto: SHA1_Init deprecated at openssl 3.0 -- File Changes -- M src/modules/crypto/crypto_uuid.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3518.patch https://github.com/kamailio/kamailio/pull/3518.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3518 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3518(a)github.com>

2 4

git:master:e55a6ed0: crypto: SHA1_Init deprecated at openssl 3.0
by Victor Seva 27 Jul '23

27 Jul '23

Module: kamailio Branch: master Commit: e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483 URL: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-27T10:02:55+02:00 crypto: SHA1_Init deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). related to #3502 --- Modified: src/modules/crypto/crypto_uuid.c --- Diff: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Patch: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… --- diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index ffe208fb85f..fbc0a3c670d 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -177,14 +177,33 @@ static inline int crypto_format_rfc4122_uuid( */ void crypto_generate_callid(str *callid) { +#if OPENSSL_VERSION_NUMBER > 0x030000000L + EVP_MD_CTX *crypto_ctx = NULL; +#else static SHA_CTX crypto_ctx = {0}; +#endif static unsigned char crypto_buf[SHA_DIGEST_LENGTH] = {0}; static char crypto_sbuf[UUID_LEN] = {0}; crypto_inc_counter(crypto_callid_counter, CTR_LEN); + +#if OPENSSL_VERSION_NUMBER > 0x030000000L + if((crypto_ctx = EVP_MD_CTX_new()) == NULL) { + LM_ERR("can't get new context\n"); + callid->s = NULL; + callid->len = 0; + return; + } + EVP_DigestInit_ex(crypto_ctx, EVP_sha1(), NULL); + EVP_DigestUpdate(crypto_ctx, crypto_callid_seed, SEED_LEN); + EVP_DigestUpdate(crypto_ctx, crypto_callid_counter, CTR_LEN); + EVP_DigestFinal_ex(crypto_ctx, crypto_buf, NULL); + EVP_MD_CTX_free(crypto_ctx); +#else SHA1_Init(&crypto_ctx); SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN); SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN); SHA1_Final(crypto_buf, &crypto_ctx); +#endif crypto_format_rfc4122_uuid( crypto_sbuf, sizeof(crypto_sbuf), crypto_buf, sizeof(crypto_buf)); callid->s = crypto_sbuf;

1 0

[kamailio/kamailio] failed to find command radius_www_authorize (params 1) (Issue #3525)
by Kachallah Abagana Mahamat 27 Jul '23

27 Jul '23

Hello everyone, I'm trying to authenticate kamailio users using freeradius but I get the following error message when I try to start kamailio: ERROR: <core> [core/cfg.y:3762]: yyparse(): cfg. parser: failed to find command radius_www_authorize (params 1). Thanks for your help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3525 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3525(a)github.com>

2 2

[kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)
by Maksym Sobolyev 26 Jul '23

26 Jul '23

#### 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  The module has been broken in d00ceda2c04. The code to replace strcpy() did not terminate the target sting with \0. Discovered by our voiptests rig: https://github.com/sippy/voiptests/actions/workflows/kamailio.yml Results in a broken SDP (note garbage around o= attribute: ``` 1681 00:00:08.271/GLOBAL/alice_ua: RECEIVED message from [::1]:5060: 1682 SIP/2.0 183 Session Progress 1683 Via: SIP/2.0/UDP [::1]:5061;received=::1;rport=5061;branch=z9hG4bK20a1169c6781e4bfe26554e84d3b4925 1684 Record-Route: <sip:[::1];ftag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q;lr> 1685 From: "Alice Smith" <sip:alice_2_ipv6@[::1]>;tag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q 1686 To: <sip:bob_2@[::1]>;tag=c77c4b2c8430cf6c18566bc3d9212ed3 1687 Call-ID: O%CciL!Yf0-SQn]G46v4J(SPddRr<MtH(a))<0.ev}(]q.\%X[> 1688 CSeq: 200 INVITE 1689 Content-Type: application/sdp 1690 Content-Length: 296 1691 1692 v=0 1693 o=- 577651195072 577651195072 IN IP6 ::1\x86zU 1694 s=BOBSDP Session 1695 c=IN IP6 ::1\x86zU 1696 t=0 0 1697 m=image 13424 udptl t38 1698 a=T38FaxVersion:0 1699 a=T38MaxBitRate:14400 1700 a=T38FaxRateManagement:transferredTCF 1701 a=T38FaxMaxBuffer:262 1702 a=T38FaxMaxDatagram:176 1703 a=T38FaxUdpEC:t38UDPRedundancy 1704 a=nortpproxy:yes 1740 00:00:08.322/GLOBAL/alice_ua: RECEIVED message from 127.0.0.1:5060: 1741 SIP/2.0 183 Session Progress 1742 v: SIP/2.0/UDP 127.0.0.1:5061;received=127.0.0.1;rport=5061;branch=z9hG4bK8e357573055f35a768af0c9be78c836d 1743 Record-Route: <sip:127.0.0.1;ftag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf;lr> 1744 f: "Alice Smith" <sip:alice_7_ipv4@127.0.0.1>;tag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf 1745 t: <sip:bob_7@127.0.0.1>;tag=8ee80e5205ef358c3cb868fb5e5614f8 1746 i: m6!(QAFQlv}vTlycDH[rpMjW}mVV1phG@z/c{KI:L*n'[`%15 1747 CSeq: 200 INVITE 1748 c: application/sdp 1749 l: 328 1750 1751 v=0 1752 o=- 577651195078 577651195078 IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1753 s=BOBSDP Session 1754 c=IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1755 t=0 0 1756 m=image 13696 udptl t38 1757 a=T38FaxVersion:0 1758 a=T38MaxBitRate:14400 1759 a=T38FaxRateManagement:transferredTCF 1760 a=T38FaxMaxBuffer:262 1761 a=T38FaxMaxDatagram:176 1762 a=T38FaxUdpEC:t38UDPRedundancy 1763 a=nortpproxy:yes ``` Looks like there were multiple changes of the same nature. All of them probably needs to be re-evaluated to make sure this pattern is not propagated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3524 -- Commit Summary -- * rtpproxy: make sure we null terminate the copy of the string. -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3524.patch https://github.com/kamailio/kamailio/pull/3524.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3524(a)github.com>

2 3

git:master:c2f12479: .clang-format: add json settings [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: c2f12479debe7bd5f5819f3c3b332929dd5fe703 URL: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .clang-format: add json settings [skip ci] --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Patch: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… --- diff --git a/.clang-format b/.clang-format index d805149083d..6f7a705477f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,7 @@ --- +Language: Json +BasedOnStyle: llvm +--- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -4 @@ -87,4 +90,3 @@ Standard: Cpp11 TabWidth: 4 UseTab: Always ... -

1 0

git:master:bad420e9: .devcontainer: Initial support for devcontainers [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: bad420e9f72c237bbd608a9ff06ae3b63bce9625 URL: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .devcontainer: Initial support for devcontainers [skip ci] Allows to develop inside a container using vscode > https://code.visualstudio.com/docs/devcontainers/containers --- Added: .devcontainer/Dockerfile Added: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Patch: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… --- diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..50a901b764a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,17 @@ +FROM mcr.microsoft.com/devcontainers/base:bookworm +# utils packages +RUN apt-get update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get -y install --no-install-recommends \ + apt-utils dialog clang-format clang pbuilder + +# bookworm packaging +RUN mkdir -p /usr/local/src/pkg +COPY bookworm /usr/local/src/pkg/debian + +# get build dependences +RUN cd /usr/local/src/pkg/ && \ + /usr/lib/pbuilder/pbuilder-satisfydepends-experimental + +# clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..98d103801ea --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +{ + /* For format details, see https://aka.ms/devcontainer.json. For config options, see the + * README at: https://github.com/devcontainers/templates/tree/main/src/debian + */ + "name": "Debian", + "build": { + "context": "../pkg/kamailio/deb", + "dockerfile": "Dockerfile" + }, + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {} + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [ + 5060 + ], + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "settings": {}, + "extensions": [ + "ms-vscode.cpptools-extension-pack", + "xaver.clang-format" + ] + } + }, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + "remoteUser": "root" +}

1 0

[kamailio/kamailio] Initial support for devcontainers (PR #3516)
by Victor Seva 26 Jul '23

26 Jul '23

#### Description Initial support of [devcontainers](https://containers.dev/) Allows to develop inside a container using [vscode](https://code.visualstudio.com/docs/devcontainers/containers) Next steps: * configure github actions to build and publish the image in our github repository https://github.com/devcontainers/ci/blob/main/docs/github-action.md * include configurations for vscode to build and run kamailio * investigate how to debug inside vscode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3516 -- Commit Summary -- * .clang-format: add json settings * .devcontainer: Initial support for devcontainers -- File Changes -- M .clang-format (4) A .devcontainer/Dockerfile (17) A .devcontainer/devcontainer.json (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3516.patch https://github.com/kamailio/kamailio/pull/3516.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3516 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3516(a)github.com>

1 1

git:master:192b681c: sipcapture: make sure we null terminate the copy of the string
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 192b681ce7fcd868a4a47a7c26863c733321b8d4 URL: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:00:38+02:00 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Patch: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index de0a15174cc..5efb1898036 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2252,7 +2252,8 @@ static int sip_capture( ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; @@ -2839,7 +2840,8 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) /* IP source and destination */ ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port;

1 0

git:master:3c1700fb: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 3c1700fb7693c05025be1058e856fe610f4be031 URL: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:55:17+02:00 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Patch: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 9d7190cabc3..bc252982e1c 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1834,7 +1834,8 @@ static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 0

git:master:2750e48b: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 2750e48b5445e9334cb7a062d7d53a1fb9a0a411 URL: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:46:45+02:00 rtpproxy: make sure we null terminate the copy of the string. Broken in d00ceda2c04. --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Patch: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8103fef4edd..9d7190cabc3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1698,7 +1698,8 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(ip == NULL) { cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); } if(msg->msg_flags & FL_SDP_BODY)

1 0

[kamailio/kamailio] rtpengine: increase buf size to print mos llint range (PR #3517)
by Stefan Mititelu 20 Jul '23

20 Jul '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  CDR avp() mos values gets trimmed at the first larger mos value received. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3517 -- Commit Summary -- * rtpengine: increase buf size to print mos llint range -- File Changes -- M src/modules/rtpengine/rtpengine.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3517.patch https://github.com/kamailio/kamailio/pull/3517.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3517 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3517(a)github.com>

2 3

git:master:8b113985: rtpengine: increase buf size to print mos llint range
by Stefan Mititelu 20 Jul '23

20 Jul '23

Module: kamailio Branch: master Commit: 8b1139851d9f88add1fd7da0dbc0b2b56933cdd3 URL: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-07-20T15:25:37+03:00 rtpengine: increase buf size to print mos llint range --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Patch: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 59bcfb47795..68003908268 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -180,14 +180,15 @@ struct minmax_mos_label_stats }; struct minmax_stats_vals { - long long mos; - long long at; - long long packetloss; - long long jitter; - long long roundtrip; - long long roundtrip_leg; - long long samples; - long long avg_samples; /* our own running count to average the averages */ + long long int mos; + long long int at; + long long int packetloss; + long long int jitter; + long long int roundtrip; + long long int roundtrip_leg; + long long int samples; + long long int + avg_samples; /* our own running count to average the averages */ }; #define RTPE_LIST_VERSION_DELAY 10 @@ -3879,12 +3880,13 @@ static void avp_print_decimal(pv_elem_t *pv, int num, struct sip_msg *msg) len = snprintf(buf, sizeof(buf), "%i.%i", num / 10, abs(num % 10)); avp_print_s(pv, buf, len, msg); } -static void avp_print_int(pv_elem_t *pv, int num, struct sip_msg *msg) +static void avp_print_llint( + pv_elem_t *pv, long long int num, struct sip_msg *msg) { int len; - char buf[8]; + char buf[20]; - len = snprintf(buf, sizeof(buf), "%i", num); + len = snprintf(buf, sizeof(buf), "%lld", num); avp_print_s(pv, buf, len, msg); } static void avp_print_time(pv_elem_t *pv, int num, struct sip_msg *msg) @@ -3904,12 +3906,13 @@ static void avp_print_mos(struct minmax_mos_stats *s, avp_print_decimal(s->mos_pv, vals->mos / vals->avg_samples, msg); avp_print_time(s->at_pv, vals->at - created, msg); - avp_print_int(s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); - avp_print_int(s->jitter_pv, vals->jitter / vals->avg_samples, msg); - avp_print_int(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); - avp_print_int( + avp_print_llint( + s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); + avp_print_llint(s->jitter_pv, vals->jitter / vals->avg_samples, msg); + avp_print_llint(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); + avp_print_llint( s->roundtrip_leg_pv, vals->roundtrip_leg / vals->avg_samples, msg); - avp_print_int(s->samples_pv, vals->samples / vals->avg_samples, msg); + avp_print_llint(s->samples_pv, vals->samples / vals->avg_samples, msg); } static int decode_mos_vals_dict(

1 0

git:5.6:d4d28c09: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.6 Commit: d4d28c098ddc07ab1b956a13878cd8e6f180fe3d URL: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:38:17+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) (cherry picked from commit 20be29ab3638d803341ec376b02edd7c14a9174a) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Patch: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

git:5.7:20be29ab: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.7 Commit: 20be29ab3638d803341ec376b02edd7c14a9174a URL: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:37:12+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Patch: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

[kamailio/kamailio] dialog: set cbs list to NULL after destroying (PR #3514)
by Stefan Mititelu 19 Jul '23

19 Jul '23

#### 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  Make sure dialog cbs list is NULL after is destroyed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3514 -- Commit Summary -- * dialog: set cbs list to NULL after destroying -- File Changes -- M src/modules/dialog/dlg_hash.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3514.patch https://github.com/kamailio/kamailio/pull/3514.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3514 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3514(a)github.com>

2 1

git:master:6881faad: dialog: set cbs list to NULL after destroying
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 6881faadec45dd16dd896b13db44862e7df70422 URL: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T15:04:25+02:00 dialog: set cbs list to NULL after destroying --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Patch: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 2454940fee3..8e740003c24 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -365,8 +365,11 @@ void destroy_dlg(struct dlg_cell *dlg) if(dlg_db_mode) remove_dialog_from_db(dlg); - if(dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if(dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

Kamailio v5.5.7 Released
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, Kamailio SIP Server v5.5.7 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.7. Note that 5.5 is now the third last stable branch, v5.5.7 being the last planned released in 5.5.x series. The latest two stable branch are 5.6 and 5.7, with v5.7.1 being released a while ago. For more details about version 5.5.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/07/kamailio-v5-5-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

git:master:8a61b460: geoip: reformat static export structures
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 8a61b4607d6d079131bdbfff86c3e28167a12605 URL: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T11:06:11+02:00 geoip: reformat static export structures --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Patch: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index f95ee001d33..9c953d06d74 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -45,31 +45,38 @@ static void mod_destroy(void); static int w_geoip_match(struct sip_msg *msg, char *str1, char *str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, + {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, pv_parse_geoip_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"geoip_match", (cmd_function)w_geoip_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"geoip_match", (cmd_function)w_geoip_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"path", PARAM_STRING, &geoip_path}, {0, 0, 0}}; + {"path", PARAM_STRING, &geoip_path}, + {0, 0, 0} +}; struct module_exports exports = { - "geoip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:5.5:43eb1344: ChangeLog: content updated for v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 43eb13442166e1293b2188aa410173de9f9837fb URL: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T10:01:54+02:00 ChangeLog: content updated for v5.5.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Patch: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d…

1 0

git:5.5:1339a180: pkg: version set to 5.5.7 for rpm and alpine specs
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 1339a180f6d386dfcba655a09d327ba528987acd URL: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:56:40+02:00 pkg: version set to 5.5.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Patch: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 462dd82cf14..c3d3e3995b0 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.6 +pkgver=5.5.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 27e32dc2bfc..9a19366678c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.6 +%define ver 5.5.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:c8b995c0: Makefile.defs: version set to 5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: c8b995c036fe5d15e43138435d3bc68a83747a55 URL: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:57:21+02:00 Makefile.defs: version set to 5.5.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Patch: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5ec3536ea34..d8458f6bfe1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:b9fd39ea: pkg/kamailio/deb: version set 5.5.7
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: b9fd39ea259b32fd950080045e0edd0969a9a29d URL: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T09:09:41+02:00 pkg/kamailio/deb: version set 5.5.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Patch: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0…

1 0

Releasing Kamailio v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, I am planning to release v5.5.7 our of branch 5.5 this week, most likely on Wednesday, July 19, 2023. It will mark the end of official packaging for release series 5.5.x, currently the latest two stable branches are 5.6 and 5.7. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 1

git:master:c35088bf: geoip2: docs - section ids and formatting
by Daniel-Constantin Mierla 18 Jul '23

18 Jul '23

Module: kamailio Branch: master Commit: c35088bf31b3e3e828433bf03b6ce647a75ef8e2 URL: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-18T16:38:20+02:00 geoip2: docs - section ids and formatting --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Patch: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 50a7d855fa8..cbc6ccb1493 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -11,26 +11,25 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module allows real-time queries against the Max Mind GeoIP2 - database to be performed from the config script. + This module allows real-time queries against the Max Mind GeoIP2 + database to be performed from the config script. </para> <para> - The Max Mind GeoIP2 database is a map of IP network address assignments + The Max Mind GeoIP2 database is a map of IP network address assignments to geographical locales that can be useful -- though approximate -- in identifying the physical location with which an IP host address is associated on a relatively granular level. </para> <para> - This database itself can be obtained on a free or commercial basis + This database itself can be obtained on a free or commercial basis from <ulink url="http://dev.maxmind.com/geoip/"> - http://dev.maxmind.com/geoip/</ulink>. The - library libmaxminddb + http://dev.maxmind.com/geoip/</ulink>. The library libmaxminddb that interfaces with the Max Mind API, as well as scripts to automate downloading of the on-disk version are available at <ulink url="http://dev.maxmind.com/geoip/geoip2/downloadable/"> @@ -126,10 +125,10 @@ if(geoip2_match("$si", "src")) { </example> </section> </section> - + <section> <title>Functions</title> - <section> + <section id="geoip.f.geoip2_match"> <title> <function moreinfo="none">geoip2_match(ipaddr, pvc)</function> </title> @@ -149,7 +148,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - <section> + <section id="geoip.f.geoip2_distance"> <title> <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> @@ -172,7 +171,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - + </section> <section> @@ -195,13 +194,13 @@ if(geoip2_match("$si", "src")) </example> </section> </section> - - <section> + + <section id="geoip.pvs"> <title>Exported pseudo-variables</title> <itemizedlist> <listitem><para> - <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an - identifier for this query result; it is designated by the second + <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an + identifier for this query result; it is designated by the second parameter of geoip2_match(). The <emphasis>key</emphasis> can be one of the following: </para>

1 0

[kamailio/kamailio] Add 2 new options to dispatcher management in kamctl (PR #3512)
by Nir Simionovich 17 Jul '23

17 Jul '23

kamctl: added new options to dispatcher interface - added a new `rmip` option to delete a specific gateway `ip` in a predefined `setid` - added a new `rmset` option to delete a specific `setid` completely You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3512 -- Commit Summary -- * Add support for deleting a gateway or full setid in dispatcher. * Small style fix to help screen -- File Changes -- M utils/kamctl/kamctl (34) M utils/kamctl/kamctl.base (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3512.patch https://github.com/kamailio/kamailio/pull/3512.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3512 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3512(a)github.com>

2 2

git:master:f68a1e9c: kamctl: add 2 new options to dispatcher management (#3512)
by GitHub 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: f68a1e9c9f249faee38d29776d5831cbf9e3cce7 URL: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Author: Nir Simionovich <nir.simionovich(a)greenfieldtech.net> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:26:18+02:00 kamctl: add 2 new options to dispatcher management (#3512) *kamctl: add support for deleting a gateway or full setid in dispatcher. * kamctl: small style fix to help screen after previous change --------- Co-authored-by: Nir Simionovich <nirs(a)cloudonix.io> --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Patch: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 34f6183dfb7..dd09ffb7daf 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1756,6 +1756,40 @@ dispatcher() { fi ;; + rmip) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway ip address and/or setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$2' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; + rmset) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$1'' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%'';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; reload) require_ctlengine ctl_cmd_run dispatcher.reload diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 9e37f5551fc..a265c479c04 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -512,6 +512,8 @@ cat <<EOF dispatcher add <setid> <destination> [flags] [priority] [attrs] [description] .......................... add gateway dispatcher rm <id> .................. delete gateway + dispatcher rmip <ip> <setid>......... delete gateway <ip> in <setid> + dispatcher rmset <setid> ............. delete all gateways in <setid> EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_dispatcher"

1 0

[kamailio/kamailio] rabbitmq: Adding amqps support (PR #3511)
by joelbax 17 Jul '23

17 Jul '23

Adding support for secure AMQP connections over TLS (amqps).   #### 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) - [ ] 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/3511 -- Commit Summary -- * rabbitmq: Adding amqps support -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3511.patch https://github.com/kamailio/kamailio/pull/3511.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3511 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3511(a)github.com>

4 11

git:master:78c0275b: rabbitmq: Adding amqps support (#3511)
by GitHub 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: 78c0275b9081d4ee18a89f702f3931e3c3f83489 URL: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Author: joelbax <98022231+joelbax(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:21:36+02:00 rabbitmq: Adding amqps support (#3511) * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Format fixes Some style format fixes * rabbitmq: Format fixes Fixing some missing spaces * rabbitmq: Typo fix Fixing inilialized by initialized --- Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Patch: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index f1c44ff113b..94341070508 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -52,6 +52,7 @@ #include <stdint.h> #include <amqp_tcp_socket.h> +#include <amqp_ssl_socket.h> #include <amqp.h> #include <amqp_framing.h> @@ -73,10 +74,12 @@ static amqp_connection_state_t amqp_conn = NULL; /* module parameters */ static struct amqp_connection_info amqp_info; static char *amqp_url = RABBITMQ_DEFAULT_AMQP_URL; +static char *rmq_amqps_ca_file = NULL; static int max_reconnect_attempts = 1; static int timeout_sec = 1; static int timeout_usec = 0; static int direct_reply_to = 0; +static int amqp_ssl_init_called = 0; /* module helper functions */ static int rabbitmq_connect(amqp_connection_state_t *conn); @@ -124,6 +127,7 @@ static cmd_export_t cmds[] = { /* module parameters */ static param_export_t params[] = {{"url", PARAM_STRING, &amqp_url}, + {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, {"timeout_sec", PARAM_INT, &timeout_sec}, {"timeout_usec", PARAM_INT, &timeout_usec}, {"direct_reply_to", PARAM_INT, &direct_reply_to}, {0, 0, 0}}; @@ -557,25 +561,52 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) int ret; int log_ret; // amqp_rpc_reply_t reply; + + // amqp_ssl_init_called should only be called once + if(amqp_info.ssl && !amqp_ssl_init_called) { + amqp_set_initialize_ssl_library(1); + amqp_ssl_init_called = 1; + LM_DBG("AMQP SSL library initialized\n"); + } // establish a new connection to RabbitMQ server *conn = amqp_new_connection(); + if(!conn) { + LM_ERR("FAIL: create AMQP connection\n"); + return RABBITMQ_ERR_CREATE; + } log_ret = log_on_amqp_error( amqp_get_rpc_reply(*conn), "amqp_new_connection()"); if(log_ret != AMQP_RESPONSE_NORMAL && log_ret != AMQP_RESPONSE_NONE) { return RABBITMQ_ERR_CONNECT; } - amqp_sock = amqp_tcp_socket_new(*conn); + amqp_sock = (amqp_info.ssl) ? amqp_ssl_socket_new(*conn) + : amqp_tcp_socket_new(*conn); if(!amqp_sock) { LM_ERR("FAIL: create TCP amqp_sock"); amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } + if(rmq_amqps_ca_file) { + if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { + LM_ERR("Failed to set CA certificate for amqps connection\n"); + return RABBITMQ_ERR_SSL_CACERT; + } + } + +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 + amqp_ssl_socket_set_verify(amqp_sock, 1); +#else + amqp_ssl_socket_set_verify_peer(amqp_sock, 1); + amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); +#endif + ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port); if(ret != AMQP_STATUS_OK) { - LM_ERR("FAIL: open TCP sock, amqp_status=%d", ret); + LM_ERR("FAIL: open %s sock, amqp_status=%d", + (amqp_info.ssl) ? "SSL" : "TCP", ret); // amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..b37c84674f9 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,8 +49,10 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, + RABBITMQ_ERR_SSL_CACERT, RABBITMQ_ERR_NULL, } RABBITMQ_ENUM;

1 0

git:5.5:aa022e9d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: aa022e9d35f0ce9040d396288f69995d2a7399ac URL: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:47:06+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Patch: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995…

1 0

git:5.5:063bceef: ipops: create container items if not found for srv and naptr functions
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 063bceefc411e2841b7507d9f366a45d62cfbe00 URL: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:02+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) (cherry picked from commit 771fcd42e315376c9d3c16bb63983a72e508be18) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Patch: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 6e9d86b5a6a..5151dfd39dc 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -633,7 +633,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1022,9 +1022,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1185,7 +1185,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1491,9 +1491,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 0

git:5.5:edfbecd0: sst: fix condition on sst_min_se for sst_check_min()
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: edfbecd0ed515dab637a03a793c6c2d565dfdaee URL: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:12+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) (cherry picked from commit 5fc4cca395e057714376b681bbad4935a9570d0d) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Patch: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 0

git:5.5:2555e1b1: tm: enhance documentation for on_sl_reply param
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 2555e1b1a02af8d96504c43953ab395097c86adb URL: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:44+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) (cherry picked from commit 2f86215a704ff10a58cb3f5e57497918c381a048) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Patch: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 247d6ad5e6d..d8f8251818d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 0

git:5.5:a5c798a2: htable: set dbload filed on empty db result
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: a5c798a2292323e235df5423cdc27eea46bddbbf URL: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:53+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) (cherry picked from commit 249f476403f987917ed7d5c7f6d7ea70e1f43e63) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Patch: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index cbce085f6c5..f76ea463201 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 0

git:5.5:b1953700: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: b1953700ae03bde4c4b4d0c549d09c2f66e8ec09 URL: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:23+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) (cherry picked from commit ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Patch: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2…

1 0

git:5.5:23470fcc: app_lua: fix crash on exausted memory scenario
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 23470fccf6e54d7f853e6df4ab519feb30272721 URL: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:35+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) (cherry picked from commit b524321a4871c349e6ebb464ea018e138bc6d5ed) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Patch: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index f736bea98b9..c3d16c98129 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -852,6 +852,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -891,6 +895,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.5:2a5c590a: sqlops: do not allow empty name component in URL
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 2a5c590ae8e3fb435670d0bd97deda35d22a33ad URL: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:10+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) (cherry picked from commit 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Patch: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

git:5.6:7ee2bfb3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 7ee2bfb30f1119bc8c5b2eddf8f81be77f4804da URL: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:18:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Patch: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be…

1 0

git:5.6:771fcd42: ipops: create container items if not found for srv and naptr functions
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 771fcd42e315376c9d3c16bb63983a72e508be18 URL: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:34+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Patch: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 9ee6f5879a5..444fb084d9e 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -640,7 +640,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1029,9 +1029,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1192,7 +1192,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1498,9 +1498,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 0

git:5.6:5fc4cca3: sst: fix condition on sst_min_se for sst_check_min()
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 5fc4cca395e057714376b681bbad4935a9570d0d URL: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:58+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Patch: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 0

git:5.6:249f4764: htable: set dbload filed on empty db result
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 249f476403f987917ed7d5c7f6d7ea70e1f43e63 URL: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:43:12+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Patch: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index bbcba99913b..b091113b637 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 0

git:5.6:2f86215a: tm: enhance documentation for on_sl_reply param
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 2f86215a704ff10a58cb3f5e57497918c381a048 URL: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:38:18+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Patch: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3f67ae3f4d9..8c01ab78d0c 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 0

git:5.6:ca13a338: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb URL: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:33+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Patch: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2…

1 0

git:5.6:b524321a: app_lua: fix crash on exausted memory scenario
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: b524321a4871c349e6ebb464ea018e138bc6d5ed URL: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:35:40+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Patch: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 0a1d13532cc..1010fc5b005 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -912,6 +912,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -951,6 +955,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.6:9daacc36: sqlops: do not allow empty name component in URL
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803 URL: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:11+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Patch: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

git:master:9f3356de: htable: reformat initialized static structures
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: 9f3356de1c769c610112df9dbcfdf6461de9f959 URL: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T08:37:04+02:00 htable: reformat initialized static structures --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Patch: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64…

1 0

git:master:15711980: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 157119809f7ce08d568677342d1833ca64a78b01 URL: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-14T17:32:04+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Patch: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 256689b5782..70319467ca5 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -35,7 +35,7 @@ Henning Westerholt 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -48,7 +48,7 @@ Henning Westerholt 1.1. Set path parameter 1.2. Set resid parameter 1.3. geoip2_match usage - 1.4. distance usage + 1.4. geoip2_distance usage 1.5. geoip2.reload usage Chapter 1. Admin Guide @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -154,7 +154,7 @@ if(geoip2_match("$si", "src")) { 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 4.1. geoip2_match(ipaddr, pvc) @@ -169,19 +169,20 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -4.2. distance(ip_addr, latitude, longitude) +4.2. geoip2_distance(ip_addr, latitude, longitude) The function calculates the distance in miles between the geocoordinates of the IP address passed as parameter (the coordinates are calculated inside the function) and the geocoordinates latitude and longitude - Example 1.4. distance usage + Example 1.4. geoip2_distance usage ... $var(client_ip) = "109.184.18.64"; $var(lat_pos) = "53.200660"; $var(lon_pos) = "45.004640"; - $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + $var(dist) = geoip2_distance($var(client_ip), $var(lat_pos), $var(lon_po +s)); xlog("distance is $var(dist)\n"); ...

1 0

[kamailio/kamailio] geoip2: added distance function (PR #3506)
by sergey-safarov 14 Jul '23

14 Jul '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. Functions can be used to evaluate the RTPengine server closest to a user. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3506 -- Commit Summary -- * geoip2: added distance function -- File Changes -- M src/modules/geoip2/doc/geoip2_admin.xml (23) M src/modules/geoip2/geoip2_mod.c (154) M src/modules/geoip2/geoip2_pv.c (8) M src/modules/geoip2/geoip2_pv.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3506.patch https://github.com/kamailio/kamailio/pull/3506.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3506 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3506(a)github.com>

2 4

git:master:956cb12f: geoip2: docs - updated name from distance to geoip2_distance()
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 956cb12f47befe860de87864c943c21347bf906f URL: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:21:41+02:00 geoip2: docs - updated name from distance to geoip2_distance() --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… Patch: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 196c87a0cef..50a7d855fa8 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -151,7 +151,7 @@ if(geoip2_match("$si", "src")) </section> <section> <title> - <function moreinfo="none">distance(ip_addr, latitude, longitude)</function> + <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> <para> The function calculates the distance in miles between the geocoordinates of @@ -159,13 +159,13 @@ if(geoip2_match("$si", "src")) and the geocoordinates <emphasis>latitude</emphasis> and <emphasis>longitude</emphasis> </para> <example> - <title><function>distance</function> usage</title> + <title><function>geoip2_distance</function> usage</title> <programlisting format="linespecific"> ... $var(client_ip) = "109.184.18.64"; $var(lat_pos) = "53.200660"; $var(lon_pos) = "45.004640"; - $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + $var(dist) = geoip2_distance($var(client_ip), $var(lat_pos), $var(lon_pos)); xlog("distance is $var(dist)\n"); ...

1 0

git:master:fcfa9413: geoip2: implemented distance fucntion for kemi
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: fcfa941320d4553545e5c8522d9668f309a1c10b URL: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:19:43+02:00 geoip2: implemented distance fucntion for kemi --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f… Patch: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f…

1 0

git:master:87be8a59: geoip2: prefix distance with geoip2_ to reflect the module
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 87be8a593ba32bd2205d14304c7084bc5788297a URL: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:10:17+02:00 geoip2: prefix distance with geoip2_ to reflect the module --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… Patch: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index e0a9dd1530e..208288eb007 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -51,8 +51,8 @@ static int w_geoip2_match(struct sip_msg *msg, char *str1, char *str2); static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass); static int geoip2_resid_param(modparam_t type, void *val); -static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); -static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); +static int w_geoip2_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); +static int ki_geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); /* clang-format off */ static pv_export_t mod_pvs[] = { @@ -65,7 +65,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, + {"geoip2_distance", (cmd_function)w_geoip2_distance, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -166,7 +166,7 @@ static int w_geoip2_match(sip_msg_t *msg, char *target, char *pvname) return geoip2_match(msg, &tomatch, &pvclass); } -static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) +static int ki_geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) { char ip_addr[MAX_GEO_STR_SIZE] = {0}; double lat1, lon1, lat2, lon2, orig_lat2, orig_lon2; @@ -255,7 +255,7 @@ static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) return dist; } -static int w_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, +static int w_geoip2_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, char *lon_param) { str ip_addr_str = STR_NULL; @@ -295,7 +295,7 @@ static int w_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, return -1; } - return distance(msg, &ip_addr_str, lat, lon); + return ki_geoip2_distance(msg, &ip_addr_str, lat, lon); } static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) @@ -306,12 +306,17 @@ static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) } } +/* clang-format off */ static const char *geoip2_rpc_reload_doc[2] = { - "Reload GeoIP2 database file.", 0}; + "Reload GeoIP2 database file.", + 0 +}; rpc_export_t ubl_rpc[] = { - {"geoip2.reload", geoip2_rpc_reload, geoip2_rpc_reload_doc, 0}, - {0, 0, 0, 0}}; + {"geoip2.reload", geoip2_rpc_reload, geoip2_rpc_reload_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int geoip2_rpc_init(void) {

1 0

git:master:7a459481: geoip2: reformat module exports structures
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 7a459481ebacf9aec4e7c61aa5a08de934a2edc5 URL: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:06:21+02:00 geoip2: reformat module exports structures --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… Patch: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 779db6b68e6..e0a9dd1530e 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -54,32 +54,41 @@ static int geoip2_resid_param(modparam_t type, void *val); static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, - pv_parse_geoip2_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, + pv_parse_geoip2_name, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"geoip2_match", (cmd_function)w_geoip2_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"geoip2_match", (cmd_function)w_geoip2_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {"distance", (cmd_function)w_distance, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static param_export_t params[] = {{"path", PARAM_STRING, &geoip2_path}, - {"resid", PARAM_STR | PARAM_USE_FUNC, &geoip2_resid_param}, {0, 0, 0}}; +static param_export_t params[] = { + {"path", PARAM_STRING, &geoip2_path}, + {"resid", PARAM_STR | PARAM_USE_FUNC, &geoip2_resid_param}, + {0, 0, 0} +}; struct module_exports exports = { - "geoip2", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip2", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:40225a82: geoip2: use generic spve fixup functions
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 40225a82ebbba4dd6fbdfb2f0d152b6178b4dafd URL: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:01:09+02:00 geoip2: use generic spve fixup functions --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… Patch: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index e3f51b45819..779db6b68e6 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -54,26 +54,6 @@ static int geoip2_resid_param(modparam_t type, void *val); static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); -static int fixup_distance_param(void **param, int param_no) -{ - if(param_no >= 1 && param_no <= 3) { - return fixup_spve_null(param, 1); - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -static int fixup_free_distance_param(void **param, int param_no) -{ - if(param_no >= 1 && param_no <= 3) { - return fixup_free_spve_null(param, 1); - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - static pv_export_t mod_pvs[] = { {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, pv_parse_geoip2_name, 0, 0, 0}, @@ -81,8 +61,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = {{"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, fixup_distance_param, - fixup_free_distance_param, ANY_ROUTE}, + {"distance", (cmd_function)w_distance, 3, fixup_spve_all, + fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = {{"path", PARAM_STRING, &geoip2_path},

1 0

git:master:2b152b09: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 2b152b09adb9bbfefe24826e075f3f6dd525a23f URL: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-14T15:02:09+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… Patch: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index d89372c48b3..256689b5782 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -35,6 +35,7 @@ Henning Westerholt 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -47,7 +48,8 @@ Henning Westerholt 1.1. Set path parameter 1.2. Set resid parameter 1.3. geoip2_match usage - 1.4. geoip2.reload usage + 1.4. distance usage + 1.5. geoip2.reload usage Chapter 1. Admin Guide @@ -67,6 +69,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -151,6 +154,7 @@ if(geoip2_match("$si", "src")) { 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 4.1. geoip2_match(ipaddr, pvc) @@ -165,6 +169,23 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... +4.2. distance(ip_addr, latitude, longitude) + + The function calculates the distance in miles between the + geocoordinates of the IP address passed as parameter (the coordinates + are calculated inside the function) and the geocoordinates latitude and + longitude + + Example 1.4. distance usage +... + $var(client_ip) = "109.184.18.64"; + $var(lat_pos) = "53.200660"; + $var(lon_pos) = "45.004640"; + $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + + xlog("distance is $var(dist)\n"); +... + 5. RPC Commands 5.1. geoip2.reload @@ -174,7 +195,7 @@ if(geoip2_match("$si", "src")) Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk. - Example 1.4. geoip2.reload usage + Example 1.5. geoip2.reload usage ... kamcmd geoip2.reload ...

1 0

git:master:84591b66: modules: readme files regenerated - mohqueue ... [skip ci]
by The Root 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 84591b667e06ac8794d9f1050796a6273ce4532c URL: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-07-14T15:01:17+02:00 modules: readme files regenerated - mohqueue ... [skip ci] --- Modified: src/modules/mohqueue/README Modified: src/modules/osp/README Modified: src/modules/pike/README Modified: src/modules/qos/README Modified: src/modules/ratelimit/README Modified: src/modules/registrar/README Modified: src/modules/rr/README Modified: src/modules/rtimer/README Modified: src/modules/rtp_media_server/README Modified: src/modules/ruxc/README Modified: src/modules/statsd/README Modified: src/modules/tcpops/README Modified: src/modules/textops/README Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Patch: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62…

1 0

git:master:60abf767: geoip2: added distance function
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 60abf767988dba052d7e08c386a589c1aeb711ef URL: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T14:47:12+02:00 geoip2: added distance function Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c… Patch: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c…

1 0

[kamailio/kamailio] Typos (PR #3491)
by Дилян Палаузов 14 Jul '23

14 Jul '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3491 -- Commit Summary -- * mohqueue: typo * osp: typos * p_usrloc: typo * permissions: typos * pike: typo * presence: typo * qos: typos * ratelimit: typo * regex: typos * registrar: typos and formatting * rls: typos * rr: typo * rtimer: typo * rtp_media_server: typos * ruxc: typos * sca: typos * seas: typo * snmpstats: typos * statsd: typo * tcpops: typos * textops: typos -- File Changes -- M src/modules/mohqueue/doc/mohqueue_admin.xml (2) M src/modules/osp/destination.c (2) M src/modules/osp/doc/osp_admin.xml (4) M src/modules/osp/orig_transaction.c (2) M src/modules/osp/osp_mod.c (2) M src/modules/osp/osptoolkit.h (2) M src/modules/p_usrloc/udomain.c (2) M src/modules/permissions/trusted.c (4) M src/modules/permissions/trusted.h (2) M src/modules/pike/doc/pike_devel.xml (2) M src/modules/presence/doc/presence_admin.xml (2) M src/modules/qos/doc/qos_devel.xml (6) M src/modules/qos/qos.c (2) M src/modules/qos/qos_cb.c (4) M src/modules/qos/qos_handlers.c (2) M src/modules/ratelimit/doc/ratelimit_admin.xml (2) M src/modules/regex/regex_mod.c (6) M src/modules/registrar/doc/registrar_admin.xml (21) M src/modules/registrar/lookup.c (4) M src/modules/registrar/save.c (2) M src/modules/registrar/save.h (2) M src/modules/rls/notify.c (2) M src/modules/rls/resource_notify.c (6) M src/modules/rls/rls.c (4) M src/modules/rls/subscribe.c (2) M src/modules/rr/doc/rr_devel.xml (2) M src/modules/rtimer/doc/rtimer_admin.xml (2) M src/modules/rtp_media_server/doc/rtp_media_server_admin.xml (4) M src/modules/rtp_media_server/rms_sdp.c (2) M src/modules/rtp_media_server/rtp_media_server.c (6) M src/modules/ruxc/doc/ruxc_admin.xml (8) M src/modules/sca/sca_call_info.c (2) M src/modules/sca/sca_subscribe.c (4) M src/modules/sca/sca_util.c (2) M src/modules/seas/event_dispatcher.c (2) M src/modules/snmpstats/snmpObjects.c (2) M src/modules/snmpstats/snmpstats.c (2) M src/modules/statsd/doc/statsd_admin.xml (2) M src/modules/tcpops/doc/params.xml (2) M src/modules/tcpops/doc/tcpops.xml (2) M src/modules/textops/api.h (2) M src/modules/textops/doc/textops_admin.xml (2) M src/modules/textopsx/api.h (2) M src/modules/textopsx/doc/functions.xml (12) M src/modules/textopsx/textopsx.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3491.patch https://github.com/kamailio/kamailio/pull/3491.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3491 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3491(a)github.com>

2 1

git: new commits in branch master
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

- URL: https://github.com/kamailio/kamailio/commit/0dcaaed5148cba775cebfd88d8e4a59… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 mohqueue: typo - URL: https://github.com/kamailio/kamailio/commit/c663fac898f6976ed96480bc924cc7e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 osp: typos - URL: https://github.com/kamailio/kamailio/commit/dfbc9aba5bf9a11545cbaee74393225… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 p_usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/26caea49d9d1834a3bf9ebe208a5b3e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 permissions: typos - URL: https://github.com/kamailio/kamailio/commit/194cc306c445c8050da5dcd5ecc64b5… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 pike: typo - URL: https://github.com/kamailio/kamailio/commit/2d26aa4193f2bf8c6598ca00fb8b03b… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 presence: typo - URL: https://github.com/kamailio/kamailio/commit/73a766a99a859f41ad796cb4282ac3f… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 qos: typos - URL: https://github.com/kamailio/kamailio/commit/fcbde898093f3316e238baa19af5099… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ratelimit: typo - URL: https://github.com/kamailio/kamailio/commit/650b109dbcfe2c3083e09c987bae7ca… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 regex: typos - URL: https://github.com/kamailio/kamailio/commit/44bbc54018375c6717adb78f8bffdd1… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 registrar: typos and formatting - URL: https://github.com/kamailio/kamailio/commit/373fb98ef5e4f9a403d0e93080906ce… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rls: typos - URL: https://github.com/kamailio/kamailio/commit/86f0fd45e420874cef4f23f0a1c350e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rr: typo - URL: https://github.com/kamailio/kamailio/commit/c741e8c7a04d77dec08d0b4953de812… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtimer: typo - URL: https://github.com/kamailio/kamailio/commit/f6c5638e3ef5c5ff195fdf179e2cdae… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtp_media_server: typos - URL: https://github.com/kamailio/kamailio/commit/286f0c764bcc4856ee3195119f929cb… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ruxc: typos - URL: https://github.com/kamailio/kamailio/commit/ad81a4a258c0e70ce04bfef36dfbd52… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 sca: typos - URL: https://github.com/kamailio/kamailio/commit/b6f84b7e5985bdd12122cc51f5a07cc… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 seas: typo - URL: https://github.com/kamailio/kamailio/commit/2ac0cf8c3e73af59480e54aaa483d19… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 snmpstats: typos - URL: https://github.com/kamailio/kamailio/commit/b582e77086f9b8a93223979fa5bdcb4… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 statsd: typo - URL: https://github.com/kamailio/kamailio/commit/267a7ac1056979af800bb0818b87390… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 tcpops: typos - URL: https://github.com/kamailio/kamailio/commit/1f1926f1e2feb4cd2eccc2ec5e21606… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 textops: typos

1 0

git:master:1335e93a: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 1335e93a76d051cb724bc696ac857aa7c3a3f43e URL: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-13T17:46:27+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Patch: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index 6fa83d72aa6..a62f56d429f 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -46,6 +46,7 @@ Joey Golan 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -73,7 +74,8 @@ Joey Golan 1.10. Set check_on_create parameter 1.11. Usage of imc_manager() function 1.12. Usage of imc_room_active() function - 1.13. List of commands + 1.13. Usage of imc_room_member() function + 1.14. List of commands Chapter 1. Admin Guide @@ -102,6 +104,7 @@ Chapter 1. Admin Guide 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -289,6 +292,7 @@ modparam("imc", "check_on_create", 1) 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 4.1. imc_manager() @@ -329,6 +333,21 @@ if(is_method("MESSAGE) } ... +4.3. imc_room_member(room, user) + + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. Usage of imc_room_member() function +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... + 5. RPC Commands 5.1. imc.list_rooms @@ -377,7 +396,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.13. List of commands + Example 1.14. List of commands ... 1.create

1 0

git:master:27a4fc54: imc: docs for imc_room_member()
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 27a4fc543cb60636308e587523236b1ac4d56754 URL: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: docs for imc_room_member() --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Patch: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 1b485ac77ca..d77c3028b9b 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -332,6 +332,29 @@ if(is_method("MESSAGE) ... } ... +</programlisting> + </example> + </section> + <section> + <title id="imc.p.imc_room_member"> + <function moreinfo="none">imc_room_member(room, user)</function> + </title> + <para> + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>Usage of <varname>imc_room_member()</varname> function</title> + <programlisting format="linespecific"> +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... </programlisting> </example> </section>

1 0

git:master:04bb88f9: imc: added function to check if a user is member of a chat room
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 04bb88f988d4e99625efef3f3b575b5a2dc652c1 URL: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: added function to check if a user is member of a chat room --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Patch: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index c5b65cb95d7..14b36c62300 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -91,6 +91,7 @@ static int child_init(int); static int w_imc_manager(struct sip_msg *, char *, char *); static int w_imc_room_active(sip_msg_t *, char *, char *); +static int w_imc_room_member(sip_msg_t *, char *, char *); static int imc_rpc_init(void); @@ -107,6 +108,8 @@ static cmd_export_t cmds[] = { {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, {"imc_room_active", (cmd_function)w_imc_room_active, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"imc_room_member", (cmd_function)w_imc_room_member, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -471,7 +474,7 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) { str room = STR_NULL; - if(fixup_get_svalue(msg, (gparam_t*)proom, &room) != 0) { + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { LM_ERR("invalid room parameter"); return -1; } @@ -479,6 +482,57 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) return ki_imc_room_active(msg, &room); } +/** + * + */ +static int ki_imc_room_member(sip_msg_t *msg, str *room, str *member) +{ + sip_uri_t puri; + imc_room_t *rm; + imc_member_t *mb; + + if(parse_uri(room->s, room->len, &puri) != 0) { + LM_ERR("failed to parse room uri [%.*s]\n", room->len, room->s); + return -1; + } + + rm = imc_get_room(&puri.user, &puri.host); + + if(rm == NULL) { + return -1; + } + + if(parse_uri(member->s, member->len, &puri) != 0) { + imc_release_room(rm); + LM_ERR("failed to parse member uri [%.*s]\n", member->len, member->s); + return -1; + } + mb = imc_get_member(rm, &puri.user, &puri.host); + imc_release_room(rm); + + return (mb != NULL) ? 1 : -1; +} + +/** + * + */ +static int w_imc_room_member(sip_msg_t *msg, char *proom, char *pmember) +{ + str room = STR_NULL; + str member = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { + LM_ERR("invalid room parameter"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pmember, &member) != 0) { + LM_ERR("invalid member parameter"); + return -1; + } + + return ki_imc_room_member(msg, &room, &member); +} + /** * destroy module */

1 0

git:master:daa88d8b: imc: exported imc_room_member() to kemi
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: daa88d8b287de5b40a478fd8291a45311fe738b2 URL: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: exported imc_room_member() to kemi --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Patch: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 14b36c62300..1251b993b63 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -739,6 +739,11 @@ static sr_kemi_t sr_kemi_imc_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("imc"), str_init("imc_room_member"), + SR_KEMIP_INT, ki_imc_room_member, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] siptrace: fix pseudo var direction attribute length (PR #3489)
by Mvondo Eric 13 Jul '23

13 Jul '23

#### 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 - [ ] 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/3489 -- Commit Summary -- * siptrace: fix pseudo var direction attribute length -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3489.patch https://github.com/kamailio/kamailio/pull/3489.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3489 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3489(a)github.com>

2 3

git:master:508886c3: siptrace: fix pseudo var direction attribute length
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 508886c3054a8470fe4469e78e63aa37ae93922d URL: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T08:47:33+02:00 siptrace: fix pseudo var direction attribute length --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Patch: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1c129762314..b37d860ca3f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2795,6 +2795,8 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "dst_proto", 9)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "direction", 9)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; case 10: @@ -2802,8 +2804,6 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "dst_hostip", 10)==0) sp->pvp.pvn.u.isname.name.n = 9; - else if(strncmp(in->s, "direction", 10)==0) - sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default:

1 0

git:master:7e8a70e9: jsonrcps: use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 7e8a70e9bf3d0b52eae1b7933633095686f234b2 URL: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 jsonrcps: use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/2381 > https://github.com/kamailio/kamailio/security/code-scanning/2380 > https://github.com/kamailio/kamailio/security/code-scanning/1843 > https://github.com/kamailio/kamailio/security/code-scanning/1841 --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Patch: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index f6ff7049890..906deb03334 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -560,10 +560,10 @@ int jsonrpc_fifo_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_fifo); + strncat(p, jsonrpc_fifo, len - strlen(runtime_dir) - sep); jsonrpc_fifo = p; LM_DBG("fifo path is [%s]\n", jsonrpc_fifo); } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4c6eb028a69..c73687a8239 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -205,10 +205,10 @@ int jsonrpc_dgram_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_dgram_socket); + strncat(p, jsonrpc_dgram_socket, len - strlen(runtime_dir) - sep); jsonrpc_dgram_socket = p; LM_DBG("unix socket path is [%s]\n", jsonrpc_dgram_socket); }

1 0

git:master:675f6c02: core: modparam use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 675f6c0224897544d30f5f863c503499b2e5f2fe URL: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: modparam use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/1836 > https://github.com/kamailio/kamailio/security/code-scanning/1834 --- Modified: src/core/modparam.c Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Patch: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index cf7957a16a9..46ea0169e53 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -72,7 +72,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) { struct sr_module *t; regex_t preg; - int mod_found, len; + int mod_found, len, len_param; char *reg; void *ptr, *val2; modparam_t param_type; @@ -143,15 +143,15 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) } else { switch(PARAM_TYPE_MASK(param_type)) { case PARAM_STRING: - *((char **)ptr) = - pkg_malloc(strlen((char *)val2) + 1); + len_param = strlen((char *)val2); + *((char **)ptr) = pkg_malloc(len_param + 1); if(!*((char **)ptr)) { PKG_MEM_ERROR; regfree(&preg); pkg_free(reg); return -1; } - strcpy(*((char **)ptr), (char *)val2); + strncpy(*((char **)ptr), (char *)val2, len_param); break; case PARAM_STR: diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2c5b4f1852f..1b7ea7332d2 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -503,7 +503,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strcat(path, mod_path); + strncat(path, mod_path, strlen(mod_path)); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

git:master:dd04bceb: path: use snprintf() instead of sprintf()
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 URL: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 path: use snprintf() instead of sprintf() > https://github.com/kamailio/kamailio/security/code-scanning/2612 > https://github.com/kamailio/kamailio/security/code-scanning/2613 > https://github.com/kamailio/kamailio/security/code-scanning/2614 > https://github.com/kamailio/kamailio/security/code-scanning/2615 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Patch: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 23309c33fe9..2431a985553 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -105,7 +105,8 @@ static int prepend_path( sip_msg_t *_m, str *user, path_param_t param, str *add_params) { struct lump *l; - char *prefix, *suffix, *cp, *dp; + char *prefix, *suffix, *dp; + str cp = STR_NULL; const char *proto_str; int prefix_len, suffix_len; struct hdr_field *hf; @@ -115,13 +116,13 @@ static int prepend_path( + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + path_received_name.len + 1; - cp = suffix = pkg_malloc(suffix_len); + cp.s = suffix = pkg_malloc(suffix_len); if(!suffix) { PKG_MEM_ERROR_FMT("for suffix\n"); goto out1; } - cp += sprintf(cp, ";lr"); + cp.len = sprintf(cp.s, ";lr"); if(param & PATH_PARAM_RECEIVED) { if(path_received_format == 0) { @@ -132,21 +133,25 @@ static int prepend_path( proto_str = NULL; } if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=sip:[%s]:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:[%s]:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } else { - cp += sprintf(cp, ";%s=sip:%s:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:%s:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } } else { if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=[%s]~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=[%s]~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } else { - cp += sprintf(cp, ";%s=%s~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=%s~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } @@ -154,17 +159,18 @@ static int prepend_path( } if(param & PATH_PARAM_OB) { - cp += sprintf(cp, ";ob"); + cp.len += sprintf(cp.s + cp.len, ";ob"); } if(add_params && add_params->len) { - cp += sprintf(cp, ";%.*s", add_params->len, add_params->s); + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, ";%.*s", + add_params->len, add_params->s); } if(path_enable_r2 == 0) { - cp += sprintf(cp, ">\r\n"); + cp.len += sprintf(cp.s + cp.len, ">\r\n"); } else { - cp += sprintf(cp, ";r2=on>\r\n"); + cp.len += sprintf(cp.s + cp.len, ";r2=on>\r\n"); } prefix_len = PATH_PREFIX_LEN + (user ? user->len : 0) + 2; @@ -174,7 +180,8 @@ static int prepend_path( goto out2; } if(user && user->len) - prefix_len = sprintf(prefix, PATH_PREFIX "%.*s@", user->len, user->s); + prefix_len = snprintf( + prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else prefix_len = sprintf(prefix, PATH_PREFIX); @@ -201,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); if(!l) goto out2; @@ -216,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp - suffix); + dp = path_strzdup(suffix, cp.s - suffix); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp.s - suffix, 0); if(!l) goto out1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev