sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
246 discussions

git:master:761e963c: dispatcher: refine documentation
by Daniel-Constantin Mierla 13 Mar '24

13 Mar '24

Module: kamailio Branch: master Commit: 761e963c0f7d9bf1b66c1ef18a409756b919ae2c URL: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-13T10:08:05+01:00 dispatcher: refine documentation - more clear documentation for the new ds_is_from_list flags --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… Patch: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 4708ca06c92..83ef06285a0 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1805,9 +1805,12 @@ if(ds_list_exists("10")) { If bit two is set, then protocol is ignored. If bit three is set, then state must be active. If bit four is set, then socket/sockname be matched. - If bit five is set, then try to find the most complete - "address/protocol/port/local socket" combination for all dispatcher targets. The parameter - can be an integer or a variable holding an integer value. + If bit five is set, then try to find the most closest target from all + dispatcher targets with the mandatory ip and combination of local socket, protocol, port, + the weighted search result is combined from bit flags of matched components: + ip - 1, port - 2, protocol - 4, local socket - 8, + the target with the maximum value of flags combination will be selected. + The parameter can be an integer or a variable holding an integer value. It must be provided if the uri parameter is provided. </para> </listitem>

1 0

git:master:0054b875: Avoid 'qm_strnstr' defined but not used warning
by Juha Heinanen 12 Mar '24

12 Mar '24

Module: kamailio Branch: master Commit: 0054b875045b4badfedd3e8424bf4772d6a9bc6b URL: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T22:18:20+02:00 Avoid 'qm_strnstr' defined but not used warning --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… Patch: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index aa68debdf30..5850c07a018 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -993,6 +993,7 @@ void qm_status(void *qmp) } +#ifdef DBG_QM_MALLOC static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) { char *sp = (char *)b1; @@ -1012,6 +1013,7 @@ static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) return NULL; } +#endif void qm_status_filter(void *qmp, str *fmatch, FILE *fp) {

1 0

git:5.8:2122afae: Avoid 'qm_strnstr' defined but not used warning
by Juha Heinanen 12 Mar '24

12 Mar '24

Module: kamailio Branch: 5.8 Commit: 2122afae2a6604c0bc44a43ab37ee274a15a700a URL: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T22:16:23+02:00 Avoid 'qm_strnstr' defined but not used warning --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… Patch: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index aa68debdf30..5850c07a018 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -993,6 +993,7 @@ void qm_status(void *qmp) } +#ifdef DBG_QM_MALLOC static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) { char *sp = (char *)b1; @@ -1012,6 +1013,7 @@ static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) return NULL; } +#endif void qm_status_filter(void *qmp, str *fmatch, FILE *fp) {

1 0

git:5.8:1928af8f: core: set null-terminated char for modparam (backport from master)
by Juha Heinanen 12 Mar '24

12 Mar '24

Module: kamailio Branch: 5.8 Commit: 1928af8f90ebf02f610c0904bc3d24a00aaedb81 URL: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T07:54:50+02:00 core: set null-terminated char for modparam (backport from master) --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… Patch: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 46ea0169e53..b48d9e82442 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -152,6 +152,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) return -1; } strncpy(*((char **)ptr), (char *)val2, len_param); + (*((char **)ptr))[len_param] = '\0'; break; case PARAM_STR:

1 0

git:5.8:c229e11b: pkg/kamailio/obs: packaged README.file_out
by Sergey Safarov 12 Mar '24

12 Mar '24

Module: kamailio Branch: 5.8 Commit: c229e11ba39da40cadaecd1b6aa3ae153e014bb1 URL: https://github.com/kamailio/kamailio/commit/c229e11ba39da40cadaecd1b6aa3ae1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-03-12T04:22:53+02:00 pkg/kamailio/obs: packaged README.file_out (cherry picked from commit 20edb64247a20a5d6b4b8bfb264b6e31d283b039) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c229e11ba39da40cadaecd1b6aa3ae1… Patch: https://github.com/kamailio/kamailio/commit/c229e11ba39da40cadaecd1b6aa3ae1… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 74df5cb4066..3d83430e9dc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1535,6 +1535,7 @@ fi %doc %{_docdir}/kamailio/modules/README.drouting %doc %{_docdir}/kamailio/modules/README.enum %doc %{_docdir}/kamailio/modules/README.exec +%doc %{_docdir}/kamailio/modules/README.file_out %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc

1 0

git:master:4dc37aee: core: set null-terminated char for modparam
by Daniel-Constantin Mierla 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: 4dc37aee853bbcf9d7fdb96245b76aaa8dfa2930 URL: https://github.com/kamailio/kamailio/commit/4dc37aee853bbcf9d7fdb96245b76aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-11T20:56:37+01:00 core: set null-terminated char for modparam --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/4dc37aee853bbcf9d7fdb96245b76aa… Patch: https://github.com/kamailio/kamailio/commit/4dc37aee853bbcf9d7fdb96245b76aa… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 46ea0169e53..b48d9e82442 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -152,6 +152,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) return -1; } strncpy(*((char **)ptr), (char *)val2, len_param); + (*((char **)ptr))[len_param] = '\0'; break; case PARAM_STR:

1 0

[kamailio/kamailio] Dispatcher: added two new flags to mode parameter of ds_is_from_list function for more strictly matching (PR #3699)
by Dennis 11 Mar '24

11 Mar '24

#### 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 This PR adds 2 new flags to the mode parameter of the ds_is_from_list function. Some times the dispatcher configuration can look like this (route attribute is just for exampe, sockname is important here): 70 sip:192.168.1.1:5060;transport=udp 0 1 route=route1;sockname=udp_5060 71 sip:192.168.1.1:5060;transport=udp 0 1 route=route2;sockname=udp_5061 72 sip:192.168.1.1:5060;transport=udp 0 1 route=route3;sockname=udp_5062 73 sip:192.168.1.1:5060;transport=udp 0 1 route=route4;sockname=udp_5063 Here we have one host/port/protocol on the remote side and different ports that we are listening on, In stock dispatcher version ds_is_from_list(-1,0) will always match first available - 70, but this is not right for dst ports 5061-5063 (sockets in realality, because we can have different local ip on same port also). The new mode flag DS_MATCH_SOCKET (8) allow match for dispatcher socket also. Second flag is DS_MATCH_STRICTEST (16), it allow to match more strictness target in "address/protocol/port/socket" key, for example: 70 sip:192.168.1.1;transport=udp 0 1 route=route1 71 sip:192.168.1.1:5061;transport=udp 0 1 route=route2 72 sip:192.168.1.1:5062;transport=udp 0 1 route=route3 73 sip:192.168.1.1;transport=udp 0 1 route=route4;socket=udp:192.168.10.10:5063 if packet come from from any port of sip:192.168.1.1;transport=udp except 5061-5062 ds_is_from list will return 70, if received port also is 5063 the result will be 73, packets from ports 5061-5062 will be matched at 71-72 respectively. In stock version of ds_is_from_list the result will always be 70. Note, the DS_MATCH_STRICTEST method can be more compute intensive, because we can potentially traverse all the dispatcher tree. The behavior of existing flags are not changed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3699 -- Commit Summary -- * dispatcher: added two new flags to mode parameter of ds_is_from_list function for more strictly matching -- File Changes -- M src/modules/dispatcher/dispatch.c (112) M src/modules/dispatcher/dispatch.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3699.patch https://github.com/kamailio/kamailio/pull/3699.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3699 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3699(a)github.com>

4 21

git:master:eb3de9f0: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: eb3de9f046e845d34137e757508116279eb38637 URL: https://github.com/kamailio/kamailio/commit/eb3de9f046e845d34137e7575081162… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-11T08:17:56+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/eb3de9f046e845d34137e7575081162… Patch: https://github.com/kamailio/kamailio/commit/eb3de9f046e845d34137e7575081162… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index f0892dcc195..43dddfef13e 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -74,7 +74,7 @@ Hugh Waite 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) - 4.6. http_client_request(url, met, body, hdrs, respv) + 4.6. http_client_request(met, url, body, hdrs, respv) 5. Pseudovariables @@ -177,7 +177,7 @@ Chapter 1. Admin Guide 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) - 4.6. http_client_request(url, met, body, hdrs, respv) + 4.6. http_client_request(met, url, body, hdrs, respv) 5. Pseudovariables @@ -705,7 +705,7 @@ modparam("http_client", "netinterface", "eth0") 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) - 4.6. http_client_request(url, met, body, hdrs, respv) + 4.6. http_client_request(met, url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -876,7 +876,7 @@ switch ($rc) { } ... -4.6. http_client_request(url, met, body, hdrs, respv) +4.6. http_client_request(met, url, body, hdrs, respv) Perform a HTTP request to "url", storing the response body in the "respv" variable. The method of the request is set by "met". The "body"

1 0

git:master:798948d6: http_client: docs - fix order of parameters for http_client_request()
by Elena-Ramona Modroiu 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: 798948d6989188eae41d79a1d7b1602bf4cb2d10 URL: https://github.com/kamailio/kamailio/commit/798948d6989188eae41d79a1d7b1602… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-11T07:28:15+01:00 http_client: docs - fix order of parameters for http_client_request() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/798948d6989188eae41d79a1d7b1602… Patch: https://github.com/kamailio/kamailio/commit/798948d6989188eae41d79a1d7b1602… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index df9d8c288e5..dd647fcb9a1 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -966,7 +966,7 @@ switch ($rc) { </section> <section id="http_client.f.http_client_request"> <title> - <function moreinfo="none">http_client_request(url, met, body, hdrs, respv)</function> + <function moreinfo="none">http_client_request(met, url, body, hdrs, respv)</function> </title> <para> Perform a HTTP request to "url", storing the response body

1 0

git:master:8cf75681: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: 8cf756812292e623ac9119fae30911ad005059fa URL: https://github.com/kamailio/kamailio/commit/8cf756812292e623ac9119fae30911a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-11T07:32:22+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8cf756812292e623ac9119fae30911a… Patch: https://github.com/kamailio/kamailio/commit/8cf756812292e623ac9119fae30911a… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6ffe4cab0cd..f0892dcc195 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -74,6 +74,7 @@ Hugh Waite 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) + 4.6. http_client_request(url, met, body, hdrs, respv) 5. Pseudovariables @@ -132,6 +133,7 @@ Hugh Waite 1.25. http_get_redirect() usage 1.26. http_client_query() usage 1.27. http_client_get() usage + 1.28. http_client_request() usage Chapter 1. Admin Guide @@ -175,6 +177,7 @@ Chapter 1. Admin Guide 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) + 4.6. http_client_request(url, met, body, hdrs, respv) 5. Pseudovariables @@ -702,6 +705,7 @@ modparam("http_client", "netinterface", "eth0") 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) + 4.6. http_client_request(url, met, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -872,6 +876,24 @@ switch ($rc) { } ... +4.6. http_client_request(url, met, body, hdrs, respv) + + Perform a HTTP request to "url", storing the response body in the + "respv" variable. The method of the request is set by "met". The "body" + and "hdrs" can be empty strings to skip setting them. The first four + parameters can contain variables that are evaluated at runtime. The + "respv" has to be the name of a writable variable. + + Example 1.28. http_client_request() usage +... +http_client_request("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param}) +&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024