- sr-dev - kamailio.org

[kamailio/kamailio] dispatcher: refine documentation (PR #3783)
by Dennis 13 Mar '24

13 Mar '24

- more clear documentation for the new ds_is_from_list flags   #### 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 - [ ] 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/3783 -- Commit Summary -- * dispatcher: refine documentation -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3783.patch https://github.com/kamailio/kamailio/pull/3783.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3783 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3783(a)github.com>

2 1

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

git:master:ef29e849: http_client: docs for http_client_request() function
by Elena-Ramona Modroiu 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: ef29e84929b8ef779341ef63a77e68ca6909705a URL: https://github.com/kamailio/kamailio/commit/ef29e84929b8ef779341ef63a77e68c… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-11T07:18:17+01:00 http_client: docs for http_client_request() function --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef29e84929b8ef779341ef63a77e68c… Patch: https://github.com/kamailio/kamailio/commit/ef29e84929b8ef779341ef63a77e68c… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 0e182cc95e3..df9d8c288e5 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -960,6 +960,30 @@ http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri= switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_request"> + <title> + <function moreinfo="none">http_client_request(url, met, body, hdrs, respv)</function> + </title> + <para> + 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. + </para> + <example> + <title><function>http_client_request()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:b9e5e4c2: http_client: function to do http request with method parameter
by Elena-Ramona Modroiu 11 Mar '24

11 Mar '24

Module: kamailio Branch: master Commit: b9e5e4c2c7ca37f51e367312adb0955ab14f8473 URL: https://github.com/kamailio/kamailio/commit/b9e5e4c2c7ca37f51e367312adb0955… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-11T07:14:31+01:00 http_client: function to do http request with method parameter --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/b9e5e4c2c7ca37f51e367312adb0955… Patch: https://github.com/kamailio/kamailio/commit/b9e5e4c2c7ca37f51e367312adb0955…

1 0

git:master:24e410f9: topos: properly handle cases of no user in contact for mode 1
by Daniel-Constantin Mierla 10 Mar '24

10 Mar '24

Module: kamailio Branch: master Commit: 24e410f9a20d004f55bcc79cd10fb35cb26e4570 URL: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-10T08:11:09+01:00 topos: properly handle cases of no user in contact for mode 1 - contact mode 1 accepted cases with no-user in contact uri but not in r-uri, however, requests within dialog can have one's contact in r-uri and then processing failed --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… Patch: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index bb153bb780a..946092c04f9 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -223,6 +223,7 @@ int tps_storage_fill_contact( int i; int contact_len; int cparam_len; + int cuser_len = 0; sr_xavp_t *vavu = NULL; if(dir == TPS_DIR_DOWNSTREAM) { @@ -317,21 +318,27 @@ int tps_storage_fill_contact( LM_ERR("failed to parse the contact uri\n"); return -1; } - memcpy(td->cp, curi.user.s, curi.user.len); - td->cp += curi.user.len; + if(curi.user.len > 0) { + memcpy(td->cp, curi.user.s, curi.user.len); + td->cp += curi.user.len; + cuser_len = curi.user.len; + } else { + LM_DBG("no contact user - skipping it\n"); + } } else { /* extract the ruri */ if(parse_sip_msg_uri(msg) < 0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.user.len == 0) { - LM_ERR("no r-uri user\n"); - return -1; + if(msg->parsed_uri.user.len > 0) { + memcpy(td->cp, msg->parsed_uri.user.s, + msg->parsed_uri.user.len); + td->cp += msg->parsed_uri.user.len; + cuser_len = msg->parsed_uri.user.len; + } else { + LM_DBG("no r-uri user - skipping it\n"); } - memcpy(td->cp, msg->parsed_uri.user.s, - msg->parsed_uri.user.len); - td->cp += msg->parsed_uri.user.len; } } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { @@ -344,6 +351,7 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } else { /* extract the b contact */ vavu = xavu_get_child_with_sval( @@ -354,11 +362,11 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } } - if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) - && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { + if(cuser_len > 0) { *td->cp = '@'; td->cp++; }

1 0

git:master:b6fccea2: topos: small rearangement by removing else after return in the true block
by Daniel-Constantin Mierla 10 Mar '24

10 Mar '24

Module: kamailio Branch: master Commit: b6fccea258e56b7d3195659245713a6d44acb013 URL: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-10T07:43:51+01:00 topos: small rearangement by removing else after return in the true block - reduce level of indentation - a few wraps in curly braces for clearer view of the if block --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… Patch: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index fc0c2835a33..bb153bb780a 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -241,8 +241,9 @@ int tps_storage_fill_contact( } contact_len = sv.len; - if(_tps_contact_host.len) + if(_tps_contact_host.len) { contact_len = sv.len - puri.host.len + _tps_contact_host.len; + } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -283,8 +284,9 @@ int tps_storage_fill_contact( for(i = 0; i < sv.len; i++) { *td->cp = sv.s[i]; td->cp++; - if(sv.s[i] == ':') + if(sv.s[i] == ':') { break; + } } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -296,27 +298,24 @@ int tps_storage_fill_contact( || msg->contact == NULL) { LM_WARN("bad sip message or missing Contact hdr\n"); return -1; - } else { - if(parse_contact(msg->contact) < 0 - || ((contact_body_t *)msg->contact->parsed) - ->contacts - == NULL - || ((contact_body_t *)msg->contact->parsed) - ->contacts->next - != NULL) { - LM_ERR("bad Contact header\n"); - return -1; - } else { - if(parse_uri(((contact_body_t *)msg->contact->parsed) - ->contacts->uri.s, - ((contact_body_t *)msg->contact->parsed) - ->contacts->uri.len, - &curi) - < 0) { - LM_ERR("failed to parse the contact uri\n"); - return -1; - } - } + } + if(parse_contact(msg->contact) < 0 + || ((contact_body_t *)msg->contact->parsed)->contacts + == NULL + || ((contact_body_t *)msg->contact->parsed) + ->contacts->next + != NULL) { + LM_ERR("bad Contact header\n"); + return -1; + } + if(parse_uri(((contact_body_t *)msg->contact->parsed) + ->contacts->uri.s, + ((contact_body_t *)msg->contact->parsed) + ->contacts->uri.len, + &curi) + < 0) { + LM_ERR("failed to parse the contact uri\n"); + return -1; } memcpy(td->cp, curi.user.s, curi.user.len); td->cp += curi.user.len;

1 0

Kamailio v5.8.0 Released - new major version is out
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Kamailio v5.8.0 is out – it comes with 4 new modules and a large set of improvements touching again more than 50 existing modules. You can read a bit more detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-8-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.8.0 brings more flexibility and optimizations across many existing components and modules, new parameters, functions, variables and transformations. Enjoy Kamailio v5.8.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:master:20edb642: pkg/kamailio/obs: packaged README.file_out
by Sergey Safarov 07 Mar '24

07 Mar '24

Module: kamailio Branch: master Commit: 20edb64247a20a5d6b4b8bfb264b6e31d283b039 URL: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-03-07T13:32:22+02:00 pkg/kamailio/obs: packaged README.file_out --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… Patch: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 13d6fb20ffd..59f7360f9e2 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:5.8:2e2217b1: ChangeLog: content set for v5.8.0
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 2e2217b153b5acf05a7cb37c70760194802312bb URL: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:30:56+01:00 ChangeLog: content set for v5.8.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… Patch: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… --- diff --git a/ChangeLog b/ChangeLog index a6fe8c22523..1e38365cf3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,25 @@ ===================== Changes Since Version 5.7.0 =========================== +commit 1fa3ba8ee48b6a68f2133544da56e0d68eae8609 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Mar 7 12:29:02 2024 +0100 + + Makefile.defs: version set to 5.8.0 + + - first in the new 5.8.x series + +commit e6b67b13a75a49d9269c53443de7233888c0df00 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Mar 7 12:23:09 2024 +0100 + + pkg/kamailio: version set 5.8.0 for rpms and alpine + +commit 50a0f82eab0a1f9dc5738f022231eba349a46a3a +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Thu Mar 7 11:41:19 2024 +0100 + + pkg/kamailio/deb: version set 5.8.0 [skip ci] commit ed99a5e2648c39e29fbbc7842c86425147c607c6 Author: Kamailio Dev <kamailio.dev(a)kamailio.org>

1 0

git:5.8:1fa3ba8e: Makefile.defs: version set to 5.8.0
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 1fa3ba8ee48b6a68f2133544da56e0d68eae8609 URL: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:29:02+01:00 Makefile.defs: version set to 5.8.0 - first in the new 5.8.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… Patch: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 62f1dd78273..f5e8b0da653 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.8:e6b67b13: pkg/kamailio: version set 5.8.0 for rpms and alpine
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: e6b67b13a75a49d9269c53443de7233888c0df00 URL: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:23:09+01:00 pkg/kamailio: version set 5.8.0 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… Patch: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0696216564a..eaa70ccd5ff 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.1.0 +pkgver=5.8.0 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 13d6fb20ffd..74df5cb4066 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.8.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.8:50a0f82e: pkg/kamailio/deb: version set 5.8.0 [skip ci]
by Victor Seva 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 50a0f82eab0a1f9dc5738f022231eba349a46a3a URL: https://github.com/kamailio/kamailio/commit/50a0f82eab0a1f9dc5738f022231eba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-07T11:42:06+01:00 pkg/kamailio/deb: version set 5.8.0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/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/jammy/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/50a0f82eab0a1f9dc5738f022231eba… Patch: https://github.com/kamailio/kamailio/commit/50a0f82eab0a1f9dc5738f022231eba…

1 0

git:5.8:dc289e49: ChangeLog: added content from 5.8.0 developent
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: dc289e492fab13e717c26495cfa2a3d0103658d3 URL: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T10:36:38+01:00 ChangeLog: added content from 5.8.0 developent --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d… Patch: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d…

1 0

git:5.7:3eb54577: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.7 Commit: 3eb545779876265f4587ff8ff627530b70c761dc URL: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-07T10:17:45+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… Patch: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 8d9f526cbe1..b1ae13eca1b 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -46,9 +47,10 @@ Daniel-Constantin Mierla 1.5. Set insert_delayed parameter 1.6. Set update_affected_found parameter 1.7. Set opt_ssl_mode parameter - 1.8. Set a my.cnf group in db_url parameter - 1.9. Adding a kamailio group to my.cnf - 1.10. Using [client] and specific group + 1.8. Set opt_ssl_ca parameter + 1.9. Set a my.cnf group in db_url parameter + 1.10. Adding a kamailio group to my.cnf + 1.11. Using [client] and specific group Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -105,6 +108,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 3.1. ping_interval (integer) @@ -209,6 +213,21 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... +3.8. opt_ssl_ca (string) + + Configures the CA certs used to verify the MySQL server cert when SSL + is enabled. + + Required when opt_ssl_mode = 4 or 5 and db_mysql is built with + libmysqlclient. + + Default value is NULL (NULL - not configured). + + Example 1.8. Set opt_ssl_ca parameter +... +modparam("db_mysql", "opt_ssl_ca", "/etc/ssl/certs/mysql-ca.pem") +... + 4. Functions No function exported to be used from configuration file. @@ -235,12 +254,12 @@ modparam("db_mysql", "opt_ssl_mode", 1) * mysql://user:pass@[group]/db * mysql://[group]/db - Example 1.8. Set a my.cnf group in db_url parameter + Example 1.9. Set a my.cnf group in db_url parameter ... modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) ... - Example 1.9. Adding a kamailio group to my.cnf + Example 1.10. Adding a kamailio group to my.cnf ... [kamailio] socket = /path/to/mysql.sock @@ -254,7 +273,7 @@ default-character-set = utf8 both your specific group and the client group, then the value is taken from the last one. - Example 1.10. Using [client] and specific group + Example 1.11. Using [client] and specific group ... [client] socket = /run/mysql/mysqld.sock

1 0

git:5.8:ed99a5e2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: ed99a5e2648c39e29fbbc7842c86425147c607c6 URL: https://github.com/kamailio/kamailio/commit/ed99a5e2648c39e29fbbc7842c86425… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-07T10:17:15+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/ed99a5e2648c39e29fbbc7842c86425… Patch: https://github.com/kamailio/kamailio/commit/ed99a5e2648c39e29fbbc7842c86425… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 78af3bdcc77..d98f94eb8ed 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -263,8 +263,9 @@ Chapter 1. Admin Guide profiles of tls.cfg file. When installing tls module of kamailio, a sample 'tls.cfg' file is - deployed in the same folder with 'kamailio.cfg', along with freshly - generated self signed certificates. + deployed in the same folder with 'kamailio.cfg'. For freshly generated + self signed certificates make must be called from tls folder +make install-tls-cert HINT: be sure you have enable_tls=yes to your kamailio.cfg. @@ -402,9 +403,6 @@ make -C modules/tls extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG" standard conforming (the verification should happen during TLS connection establishment and not after). - TLS specific config reloading is not safe, so for now better don't use - it, especially under heavy traffic. - This documentation is incomplete. The provided selects are not documented in this file. A list with all the ones implemented by the TLS module can be found in the Cookbook @@ -1683,6 +1681,10 @@ verify_client = optional_no_ca are not terminated and they continue to use the old certificates. The new configuration will be used for new connections. + Reload is generally safe and usable in production environments. If + possible should be done in a time where the service has lower + usage/connections. + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its execution rate can be restricted to specific time intervals by setting the "rpc_exec_delta" core parameter.

1 0

git:5.8:22f27451: tls/docs: Update certificate generation docs
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 22f274513a98cc081d44a6694e35c3e96844dae3 URL: https://github.com/kamailio/kamailio/commit/22f274513a98cc081d44a6694e35c3e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T10:07:03+01:00 tls/docs: Update certificate generation docs (cherry picked from commit 67785fea8f906236e4a30bc09bb11b3292c46572) --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/22f274513a98cc081d44a6694e35c3e… Patch: https://github.com/kamailio/kamailio/commit/22f274513a98cc081d44a6694e35c3e… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index 9b3f4eaacb3..5697792655a 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -93,7 +93,10 @@ </para> <para> When installing tls module of kamailio, a sample 'tls.cfg' file is deployed in the same - folder with 'kamailio.cfg', along with freshly generated self signed certificates. + folder with 'kamailio.cfg'. For freshly generated self signed certificates make must be called from tls folder + <programlisting> +make install-tls-cert + </programlisting> </para> <para> HINT: be sure you have <emphasis>enable_tls=yes</emphasis> to your kamailio.cfg.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev