- sr-dev - kamailio.org

git:master:b4753ae4: rtpengine: fix pkg mem leak in send_rtpp_command()
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: b4753ae4216b0c960ac094f4be8232fb4d0147b0 URL: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Author: vijay kumar <vijay.kumar(a)exotel.in> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:38:27+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Patch: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c51b4742081..6d62b92900d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3672,6 +3672,7 @@ static char *send_rtpp_command( len = _rtpe_lwscb.request(&node->rn_url, (str *)&rtpe_proto, &request, &response, rtpengine_tout_ms * 1000); + pkg_free(request.s); if(len < 0) { LM_ERR("failed to do websocket request\n");

1 0

git:master:f4332447: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: f43324473bfd9b6c5db59c5691e316d32c15be81 URL: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T21:31:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Patch: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 666f8844a52..bbe356a17d5 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1150,7 +1150,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") Example 1.35. cdr_extra example ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... 6.36. cdr_extra_nullable (integer)

1 0

git:master:1adc0724: acc: docs - small fix to cdr_extra param example
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 1adc07240c153b40f6bf5cb700145f8789070bcc URL: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T21:29:54+02:00 acc: docs - small fix to cdr_extra param example --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Patch: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 69be72fe2e6..37a1365627e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1156,7 +1156,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") <title>cdr_extra example</title> <programlisting format="linespecific"> ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... </programlisting> </example>

1 0

Maintenance work overnight on kamailio.org server
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Hello, there is some planned work on the data center infrastructure hosting kamailio.org server that is going to affect briefly the web server (web site, wiki) and the mailing lists. The downtime is expected to be 10-15 minutes around 1:00am Western Europe time (CEST / GMT+2), but if it takes longer or repeats, be patient for a while. Cheers, 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

[kamailio/kamailio] Option to not add received via param (Issue #3515)
by zusrut 15 Apr '24

15 Apr '24

### Description Hello. Probably I'm doing something wrong but I can't get rid of **received** parameter in the **Via** header in responses from kamailio by websocket transport. According [RFC 7118](https://datatracker.ietf.org/doc/rfc7118/): `` When a SIP WebSocket Server receives a request, it MAY decide not to add a "received" parameter to the top Via header. Therefore, SIP WebSocket Clients MUST accept responses without such a parameter in the top Via header regardless of whether the **Via** "sent-by" field contains a domain name. `` ### Expected behavior For responses to websocket transport have a way to not add **received** parameter in **Via** header #### Actual observed behavior Responses to OPTION or REGISTER methods trough websocket got **received** containing IP we want to not show to the end users. ### Possible Solutions maybe add a param in **tm** module or something ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) ``` and ``` kamailio 5.6.1 (x86_64/linux) b36a13 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3515 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3515(a)github.com>

4 7

git:master:70f19ddd: pkg/kamailio: app_lua_sr module relocated to archive [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 70f19ddd16b392f46e32b41536bde6fba8e7e14a URL: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:40+02:00 pkg/kamailio: app_lua_sr module relocated to archive [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Patch: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0696216564a..a2c1f4ac238 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua app_lua_sr" +_mod_list_lua="app_lua" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb" diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6d79bb8ec9f..a9a33082316 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2054,9 +2054,7 @@ fi %files lua %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_lua -%doc %{_docdir}/kamailio/modules/README.app_lua_sr %{_libdir}/kamailio/modules/app_lua.so -%{_libdir}/kamailio/modules/app_lua_sr.so %endif

1 0

git:master:0c49d30f: app_lua_sr: module relocated to archive
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0c49d30f9d5ae1b1c4b5210851e30725dfa7aa8b URL: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:02+02:00 app_lua_sr: module relocated to archive --- Modified: src/Makefile.groups Removed: src/modules/app_lua_sr/Makefile Removed: src/modules/app_lua_sr/README Removed: src/modules/app_lua_sr/app_lua_sr_api.c Removed: src/modules/app_lua_sr/app_lua_sr_api.h Removed: src/modules/app_lua_sr/app_lua_sr_exp.c Removed: src/modules/app_lua_sr/app_lua_sr_exp.h Removed: src/modules/app_lua_sr/app_lua_sr_mod.c Removed: src/modules/app_lua_sr/doc/Makefile Removed: src/modules/app_lua_sr/doc/app_lua_sr.xml Removed: src/modules/app_lua_sr/doc/app_lua_sr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Patch: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072…

1 0

git:master:94b9cd5d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 94b9cd5d5ffafde86fbcbede2d9a018fc616b6b1 URL: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T11:01:29+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Patch: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index b7c8075fad9..cb6251b6719 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -65,9 +65,9 @@ Daniel-Constantin Mierla 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -154,9 +154,9 @@ Chapter 1. Admin Guide 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -304,9 +304,9 @@ modparam("cfgutils", "lock_set_size", 4) 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -506,16 +506,18 @@ if(is_gflag("4")) }; ... -4.15. lock(key) +4.15. lock(key [, key2]) Lock the key. Can be used to synchronize operations in config file, a - hash id is computed over the key and appropriate lock is set in the + hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -524,13 +526,15 @@ if(is_gflag("4")) lock("$rU"); ... -4.16. trylock(key) +4.16. trylock(key [, key2]) Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -542,12 +546,14 @@ if (trylock("$rU")) { } ... -4.17. unlock(key) +4.17. unlock(key [, key2]) Unlock the key. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE.

1 0

[kamailio/kamailio] cfgutils lock (PR #3808)
by Victor Seva 15 Apr '24

15 Apr '24

#### 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 #### Description expose in config via cfgutils ``core_case_hash`` optional second string key for hashing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3808 -- Commit Summary -- * cfgutils: expose optional second string key for hashing at locks * cfgutils: document second optional string for hashing on lock functions family [skip ci] * app_lua_sr: support second str for cfgutils lock -- File Changes -- M src/modules/app_lua_sr/app_lua_sr_exp.c (30) M src/modules/cfgutils/api.h (4) M src/modules/cfgutils/cfgutils.c (103) M src/modules/cfgutils/doc/cfgutils_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3808.patch https://github.com/kamailio/kamailio/pull/3808.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3808 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3808(a)github.com>

2 2

git:master:92ac41c1: app_lua_sr: support second str for cfgutils lock
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 92ac41c1e770077d39516fc049358b3c3897d590 URL: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 app_lua_sr: support second str for cfgutils lock --- Modified: src/modules/app_lua_sr/app_lua_sr_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Patch: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_exp.c b/src/modules/app_lua_sr/app_lua_sr_exp.c index 522f0cfb87a..80a4cb69042 100644 --- a/src/modules/app_lua_sr/app_lua_sr_exp.c +++ b/src/modules/app_lua_sr/app_lua_sr_exp.c @@ -2783,20 +2783,29 @@ static const luaL_Reg _sr_sanity_Map[] = { static int lua_sr_cfgutils_lock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.mlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.mlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.mlock(&lkey, NULL); + } return app_lua_return_int(L, ret); } @@ -2808,20 +2817,29 @@ static int lua_sr_cfgutils_lock(lua_State *L) static int lua_sr_cfgutils_unlock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.munlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.munlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.munlock(&lkey, NULL); + } return app_lua_return_int(L, ret); }

1 0

git:master:235591cd: cfgutils: document second optional string for hashing on lock functions family [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 235591cd704529589bbde700b6232ac55281d071 URL: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: document second optional string for hashing on lock functions family [skip ci] --- Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Patch: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… --- diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 1cab1284fd5..35721e31c6d 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -485,10 +485,10 @@ if(is_gflag("4")) </example> </section> <section id="cfgutils.f.lock"> - <title><function moreinfo="none">lock(key)</function></title> + <title><function moreinfo="none">lock(key [, key2])</function></title> <para> Lock the key. Can be used to synchronize operations in config file, - a hash id is computed over the key and appropriate lock is set in the + a hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. @@ -497,6 +497,9 @@ if(is_gflag("4")) <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -510,7 +513,7 @@ lock("$rU"); </example> </section> <section id="cfgutils.f.trylock"> - <title><function moreinfo="none">trylock(key)</function></title> + <title><function moreinfo="none">trylock(key [, key2])</function></title> <para> Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. @@ -519,6 +522,9 @@ lock("$rU"); <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -535,7 +541,7 @@ if (trylock("$rU")) { </example> </section> <section id="cfgutils.f.unlock"> - <title><function moreinfo="none">unlock(key)</function></title> + <title><function moreinfo="none">unlock(key [, key2])</function></title> <para> Unlock the key. </para> @@ -543,6 +549,9 @@ if (trylock("$rU")) { <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -854,4 +863,3 @@ if (rand_event()) { </section> </section> </chapter> -

1 0

git:master:42476974: cfgutils: expose optional second string key for hashing at locks
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb URL: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: expose optional second string key for hashing at locks --- Modified: src/modules/cfgutils/api.h Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Patch: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e…

1 0

git:master:0fae1026: pkg/kamailio/deb: version 5.9.0~dev1 [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0fae1026d49aa765b4451d2534972b57a2c09998 URL: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T08:59:53+02:00 pkg/kamailio/deb: version 5.9.0~dev1 [skip ci] reset debian/changelog for 5.9.x series --- 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/0fae1026d49aa765b4451d2534972b5… Patch: https://github.com/kamailio/kamailio/commit/0fae1026d49aa765b4451d2534972b5…

1 0

git:master:39ca2874: Makefile.defs: version set to 5.9.0-dev1
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 39ca28748162e940bd91bf4e0cb0b1223b5f9138 URL: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T07:19:31+02:00 Makefile.defs: version set to 5.9.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… Patch: https://github.com/kamailio/kamailio/commit/39ca28748162e940bd91bf4e0cb0b12… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4165ca084fb..9feece65535 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:7bc702b7: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 7bc702b79bb07901c0925c9842b75ad3d818b4e1 URL: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-14T15:46:26+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… Patch: https://github.com/kamailio/kamailio/commit/7bc702b79bb07901c0925c9842b75ad… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 4520bce8333..75f47f5f445 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -851,6 +851,7 @@ sht_rm_value_re("ha=>.*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables. @@ -869,6 +870,7 @@ sht_rm_name("ha", "re", ".*"); The op parameter can be: * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. + * ew - match the val parameter as 'ends with'. All parameters can be static strings or contain variables.

1 0

git:master:bb093505: htable: docs for sw operator for functions removing items
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: bb093505c5c5f625339f85961518f9db3fd6725d URL: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:41:31+02:00 htable: docs for sw operator for functions removing items --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… Patch: https://github.com/kamailio/kamailio/commit/bb093505c5c5f625339f85961518f9d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 69ad5e64581..c5cc20e22ed 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -910,6 +910,12 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -950,6 +956,12 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>ew</emphasis> - match the val parameter as 'ends + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:29a890ff: htable: add ew (end-with) operator for delete items functions
by Daniel-Constantin Mierla 14 Apr '24

14 Apr '24

Module: kamailio Branch: master Commit: 29a890ffdcd394d26d53bd0951c7ca58262c7696 URL: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-14T15:29:57+02:00 htable: add ew (end-with) operator for delete items functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… Patch: https://github.com/kamailio/kamailio/commit/29a890ffdcd394d26d53bd0951c7ca5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 2391cb5c5d0..afda3dc6c54 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1033,7 +1033,7 @@ int ht_table_spec(char *spec) coldelim = tok.s[0]; LM_DBG("htable [%.*s] - coldelim [%c]\n", name.len, name.s, - coldelim); + coldelim); } else if(pit->name.len == 7 && strncmp(pit->name.s, "colnull", 7) == 0) { if(tok.len > 1) @@ -1045,8 +1045,7 @@ int ht_table_spec(char *spec) colnull = tok.s[0]; } - LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, - colnull); + LM_DBG("htable [%.*s] - colnull [%c]\n", name.len, name.s, colnull); } else { goto error; } @@ -1383,7 +1382,15 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) && strncmp(it->name.s, sre->s, sre->len) == 0) { match = 1; } + } else if(op == HT_RM_OP_EW) { + if(sre->len <= it->name.len + && strncmp(it->name.s + it->name.len - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } } + } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1393,6 +1400,16 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_EW) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && strncmp(it->value.s.s + it->value.s.len + - sre->len, + sre->s, sre->len) + == 0) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index e24a93b1f17..7c7642ef5df 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -124,6 +124,7 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_EQ 1 #define HT_RM_OP_NE 2 #define HT_RM_OP_SW 3 +#define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index bc5f18830be..7577e445a76 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -39,7 +39,8 @@ typedef enum HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_RM_CELL_SW + HT_DMQ_RM_CELL_SW, + HT_DMQ_RM_CELL_EW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 0fcd280de9c..6f775bb33ce 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -515,6 +515,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_EW, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_EW) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:master:671b874a: nghttp2: clear response headers on event route
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: 671b874a31fb10c6c9e9a246358928f202fc669d URL: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T21:24:54+02:00 nghttp2: clear response headers on event route --- Modified: src/modules/nghttp2/nghttp2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f… Patch: https://github.com/kamailio/kamailio/commit/671b874a31fb10c6c9e9a246358928f…

1 0

git:master:a368140d: nghttp2: fix typo in filed type
by Daniel-Constantin Mierla 13 Apr '24

13 Apr '24

Module: kamailio Branch: master Commit: a368140d8d32a68ccc21845aad95e43c98a802d7 URL: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-13T08:58:20+02:00 nghttp2: fix typo in filed type --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… Patch: https://github.com/kamailio/kamailio/commit/a368140d8d32a68ccc21845aad95e43… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 8b343fd11ce..ac69a147313 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -79,7 +79,7 @@ typedef struct http2_stream_data char *request_path; char *request_pathfull; char *request_method; - ttp2_msghdr_t *hdrlist; + http2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:702e9cdb: nghttp2: structure to hold headers in stream data
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 702e9cdbe8c6ca5856c25f9737d77e3223bbf9ce URL: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: structure to hold headers in stream data --- Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… Patch: https://github.com/kamailio/kamailio/commit/702e9cdbe8c6ca5856c25f9737d77e3… --- diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index cad3772d9ef..8b343fd11ce 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -66,12 +66,20 @@ struct app_context; typedef struct app_context app_context; +typedef struct http2_msghdr +{ + str name; + str value; + struct http2_msghdr *next; +} http2_msghdr_t; + typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; char *request_pathfull; char *request_method; + ttp2_msghdr_t *hdrlist; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:a8481f58: nghttp2: debug message instead of error on peer disconnect
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: a8481f588d5461285e512a0b68803ffc0f41d7b3 URL: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug message instead of error on peer disconnect --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… Patch: https://github.com/kamailio/kamailio/commit/a8481f588d5461285e512a0b68803ff… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d5153bef0c6..d8c23220a13 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -221,7 +221,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - LM_ERR("%s disconnected\n", session_data->client_addr); + LM_DBG("remote peer %s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); }

1 0

git:master:11c5ed67: nghttp2: debug with data content
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 11c5ed679193c4cc94957c0a5948e07bfbfcfee9 URL: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: debug with data content --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… Patch: https://github.com/kamailio/kamailio/commit/11c5ed679193c4cc94957c0a5948e07… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 8c17f847f87..d5153bef0c6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -560,6 +560,27 @@ static int on_frame_recv_callback( return 0; } +/* + * The implementation of nghttp2_on_data_chunk_recv_callback type. + * - function to get the received body. + */ +static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, + int32_t stream_id, const uint8_t *data, size_t len, void *user_data) +{ + struct Request *req; + (void)flags; + (void)user_data; + + req = nghttp2_session_get_stream_user_data(session, stream_id); + if(req) { + LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", + (unsigned long int)len); + LM_DBG("[[%.*s]]", (int)len, (char *)data); + LM_DBG("----------------------------\n"); + } + return 0; +} + static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id, uint32_t error_code, void *user_data) { @@ -587,6 +608,9 @@ static void initialize_nghttp2_session(http2_session_data *session_data) nghttp2_session_callbacks_set_on_frame_recv_callback( callbacks, on_frame_recv_callback); + nghttp2_session_callbacks_set_on_data_chunk_recv_callback( + callbacks, on_data_chunk_recv_callback); + nghttp2_session_callbacks_set_on_stream_close_callback( callbacks, on_stream_close_callback);

1 0

git:master:2b8d5877: nghttp2: added $nghttp2(pathfull) - full http path with all params
by Daniel-Constantin Mierla 12 Apr '24

12 Apr '24

Module: kamailio Branch: master Commit: 2b8d587713d96fbee31534b9b16f2c2b432e2e68 URL: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-12T21:59:44+02:00 nghttp2: added $nghttp2(pathfull) - full http path with all params --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… Patch: https://github.com/kamailio/kamailio/commit/2b8d587713d96fbee31534b9b16f2c2… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index 95918b1e6c8..c3e05e50b05 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -218,6 +218,14 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) goto error; } break; + case 8: + if(strncasecmp(in->s, "pathfull", 8) == 0) { + sp->pvp.pvn.u.isname.name.n = 6; + } else { + goto error; + } + break; + default: if(in->len > 2 && in->s[1] == ':' && (in->s[0] == 'h' || in->s[0] == 'H')) { @@ -275,6 +283,9 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.srcip); } return pv_get_null(msg, param, res); + case 6: /* pathfull */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.pathfull); + default: return pv_get_null(msg, param, res); } diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index dec339d7a15..8c17f847f87 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,7 +179,12 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); - free(stream_data->request_method); + if(stream_data->request_pathfull) { + free(stream_data->request_pathfull); + } + if(stream_data->request_method) { + free(stream_data->request_method); + } free(stream_data); } @@ -460,6 +465,7 @@ static int on_header_callback(nghttp2_session *session, for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + stream_data->request_pathfull = percent_decode(value, valuelen); } else if(namelen == sizeof(METHOD) - 1 && memcmp(METHOD, name, namelen) == 0) { if(stream_data->request_method) { diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index 34e6155abfc..cad3772d9ef 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_pathfull; char *request_method; int32_t stream_id; int fd; @@ -100,6 +101,7 @@ typedef struct ksr_nghttp2_ctx int rplhdrs_n; str method; str path; + str pathfull; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] corex.list_sockets broken output (Issue #3799)
by sergey-safarov 11 Apr '24

11 Apr '24

### Description I found `corex.list_sockets` does not show the address family (`af`) properly But `core.sockets_list` properly shows the address family (`af`). ### Troubleshooting #### Reproduction Required to create a config file with content like ``` loadmodule "pv.so" loadmodule "ctl.so" loadmodule "corex.so" listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 request_route { drop; } ``` Start kamailio and then execute ```sh kamcmd corex.list_sockets ``` The output will be like ``` { af: unknown proto: udp name: 127.0.0.1 addrlist: { addr: 127.0.0.1 } port: 5060 sockstr: udp:127.0.0.1:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } { af: unknown proto: udp name: ::1 addrlist: { addr: ::1 } port: 5060 sockstr: udp:[::1]:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.9.0-dev0 (aarch64/linux) 206399 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-NOSMP, 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_SEND_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: 206399 compiled on 12:57:52 Mar 30 2024 with gcc 8.5.0 ``` * **Operating System**: ``` NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3799 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3799(a)github.com>

2 3

git:master:8bc64a9e: corex: Fix unknown af in list_sockets
by Xenofon Karamanos 11 Apr '24

11 Apr '24

Module: kamailio Branch: master Commit: 8bc64a9e6820243336387d9cd9acf81f24d89993 URL: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-11T14:11:03+03:00 corex: Fix unknown af in list_sockets --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… Patch: https://github.com/kamailio/kamailio/commit/8bc64a9e6820243336387d9cd9acf81… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index fa553fbf911..90f2e124125 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -61,8 +61,8 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) return; } - if(rpc->struct_add(th, "sss{", "af", get_af_name(proto), "proto", - get_valid_proto_name(proto), "name", si->name.s, + if(rpc->struct_add(th, "sss{", "af", get_af_name(si->address.af), + "proto", get_valid_proto_name(proto), "name", si->name.s, "addrlist", &ih) < 0) { rpc->fault(ctx, 500, "Internal error address list structure");

1 0

[kamailio/kamailio] corex: Fix unknown af in list_sockets rpc call (PR #3811)
by Xenofon Karamanos 11 Apr '24

11 Apr '24

#### 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 - [x] Related to issue #3799 #### Description  This PR fixes the unknown address family when calling `corex.list_sockets` rpc call by providing the correct argument (address.af) to `get_af_name()` instead of proto. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3811 -- Commit Summary -- * corex: Fix unknown af in list_sockets -- File Changes -- M src/modules/corex/corex_rpc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3811.patch https://github.com/kamailio/kamailio/pull/3811.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3811 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3811(a)github.com>

1 1

git:master:9a43631e: nghttp2: store method in stream data
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 9a43631e1707490c0781f9d2d10055663ebcde44 URL: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T08:07:30+02:00 nghttp2: store method in stream data --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… Patch: https://github.com/kamailio/kamailio/commit/9a43631e1707490c0781f9d2d100556… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 38ae3673d46..dec339d7a15 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -179,6 +179,7 @@ static void delete_http2_stream_data(http2_stream_data *stream_data) close(stream_data->fd); } free(stream_data->request_path); + free(stream_data->request_method); free(stream_data); } @@ -436,6 +437,7 @@ static int on_header_callback(nghttp2_session *session, { http2_stream_data *stream_data; const char PATH[] = ":path"; + const char METHOD[] = ":method"; (void)flags; (void)user_data; @@ -446,15 +448,25 @@ static int on_header_callback(nghttp2_session *session, } stream_data = nghttp2_session_get_stream_user_data( session, frame->hd.stream_id); - if(!stream_data || stream_data->request_path) { + if(!stream_data) { break; } if(namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) { size_t j; + if(stream_data->request_path) { + break; + } for(j = 0; j < valuelen && value[j] != '?'; ++j) ; stream_data->request_path = percent_decode(value, j); + } else if(namelen == sizeof(METHOD) - 1 + && memcmp(METHOD, name, namelen) == 0) { + if(stream_data->request_method) { + break; + } + stream_data->request_method = + strndup((const char *)value, valuelen); } break; } @@ -497,8 +509,15 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.path.s = stream_data->request_path; _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); - _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; - _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + if(stream_data->request_method) { + _ksr_nghttp2_ctx.method.s = stream_data->request_method; + _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } + + if(session_data->client_addr) { + _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; + _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } ksr_event_route(); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index bb5e446631c..34e6155abfc 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -70,6 +70,7 @@ typedef struct http2_stream_data { struct http2_stream_data *prev, *next; char *request_path; + char *request_method; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:7fb51562: nghttp2: $nghttp2(url) replaced with $nghttp2(path)
by Daniel-Constantin Mierla 10 Apr '24

10 Apr '24

Module: kamailio Branch: master Commit: 7fb51562233c8b94a4bb38e4bcb8c7529937ed9e URL: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-10T07:31:18+02:00 nghttp2: $nghttp2(url) replaced with $nghttp2(path) - match corresponding http2 header name --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… Patch: https://github.com/kamailio/kamailio/commit/7fb51562233c8b94a4bb38e4bcb8c75… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index de7a13485bf..95918b1e6c8 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -186,15 +186,10 @@ int pv_parse_nghttp2_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; switch(in->len) { - case 3: - if(strncasecmp(in->s, "url", 3) == 0) { - sp->pvp.pvn.u.isname.name.n = 0; - } else { - goto error; - } - break; case 4: - if(strncasecmp(in->s, "data", 4) == 0) { + if(strncasecmp(in->s, "path", 4) == 0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncasecmp(in->s, "data", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 1; } else if(strncasecmp(in->s, "size", 4) == 0) { sp->pvp.pvn.u.isname.name.n = 2; @@ -264,8 +259,8 @@ int pv_get_nghttp2(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } switch(param->pvn.u.isname.name.n) { - case 0: /* url */ - return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.url); + case 0: /* path */ + return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.path); case 1: /* data */ return pv_get_strval(msg, param, res, &_ksr_nghttp2_ctx.data); case 2: /* size */ diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 46b4e003462..38ae3673d46 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -494,8 +494,8 @@ static int on_request_recv(nghttp2_session *session, _ksr_nghttp2_ctx.session_data = session_data; _ksr_nghttp2_ctx.stream_data = stream_data; - _ksr_nghttp2_ctx.url.s = stream_data->request_path; - _ksr_nghttp2_ctx.url.len = strlen(_ksr_nghttp2_ctx.url.s); + _ksr_nghttp2_ctx.path.s = stream_data->request_path; + _ksr_nghttp2_ctx.path.len = strlen(_ksr_nghttp2_ctx.path.s); _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index dc1f5f148c6..bb5e446631c 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -98,7 +98,7 @@ typedef struct ksr_nghttp2_ctx nghttp2_nv rplhdrs_v[KSR_NGHTTP2_RPLHDRS_SIZE]; int rplhdrs_n; str method; - str url; + str path; str httpversion; str data; char srcipbuf[IP_ADDR_MAX_STR_SIZE];

1 0

[kamailio/kamailio] User id conflict between kamctl et. al. and Linux OS installations (Issue #3752)
by Mark Warren 10 Apr '24

10 Apr '24

### Description After installing kamailio on Ubuntu (20.04 and 22.04) using normal kamailio.org instructions, things work fine. However, a developer is working on a large project as root, and occasionally restarts kamailio with the command "kamctl <start|stop|restart>", rather than the OS command "systemctl <stop|start|restart> kamailio". After that, any attempt to restart or check status using systmectl fails, and rebooting the server occasionally fails to restart kamailio. ### Troubleshooting #### Reproduction Install ubuntu 22.04 or 20.04. When up and running, try this: `systemctl status kamailio` (everything looks good) `ps -C kamailio -o comm,uid,euid,pid,ppid` (all happy, Kamailio running as user kamailio) `kamctl restart` `ps -C kamailio -o comm,uid,euid,pid,ppid` (Yes it's running, but as root, not kamailio) `systemctl status kamailio` (FAILS, 20.04 reports "Failed to start", 22.04 reports "kamailio.service: Deactivated successfully") `systemctl restart kamailio` (FAILS - same reports as preceding "status" command) #### Debugging Data  #### Log Messages  After command systemctl restart kamailio: ``` Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/tcp_main.c:5042]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nc_enabled) support disabled Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [main.c:2779]: main(): processes (at least): 32 - shm size: 67108864 - pkg size: 8388608 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: ERROR: <core> [core/tcp_main.c:3162]: tcp_init(): bind(c, 0x7f49b0475c74, 16) on 127.0.0.1:5060 : Address already in use Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Modify kamctl et. al. to call systemctl for start, stop, restart commands. Alternatively have kamctl call setuid() before start, restart, stop commands. ### Additional Information * **Kamailio Version** - output of `kamailio -v` On ubuntu 20.04: ``` version: kamailio 5.3.2 (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_BLACKLIST, 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 9.2.1 ``` For ubuntu 22.04: ``` version: kamailio 5.6.5 (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 11.4.0 ``` * **Operating System**: For ubuntu 22.04: ``` root@my_22.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.04.3 LTS Release: 22.04 Codename: jammy root@my_22.04_ubuntu:~# uname -a Linux my_22.04_ubuntu 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_22.04_ubuntu:~# ``` For ubuntu 20.04 ``` root@my_20.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal root@my_20.04_ubuntu:~# uname -a Linux my_20.04_ubuntu 5.4.0-171-generic #189-Ubuntu SMP Fri Jan 5 14:23:02 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_20.04_ubuntu:~# ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3752 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3752(a)github.com>

3 3

git:master:2da9ed93: Makefile.groups: added group for nghttp2 module
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 2da9ed9395ef04f889f4594753fc5f4cf7a75b29 URL: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:28:25+02:00 Makefile.groups: added group for nghttp2 module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… Patch: https://github.com/kamailio/kamailio/commit/2da9ed9395ef04f889f4594753fc5f4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index fec21d47bdd..ee514014be2 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -235,6 +235,9 @@ mod_list_ruxc=ruxc # - modules depending on microhttpd library mod_list_microhttpd=microhttpd +# - modules depending on nghttp2 library +mod_list_nghttp2=nghttp2 + # - modules depending on libgcrypt library mod_list_gcrypt=gcrypt @@ -288,6 +291,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_tlsa) \ $(mod_list_tls_wolfssl) \ $(mod_list_microhttpd) \ + $(mod_list_nghttp2) \ $(mod_list_gcrypt) \ $(mod_list_rtp_media_server) @@ -542,6 +546,9 @@ module_group_kruxc=$(mod_list_ruxc) # K microhttpd module module_group_kmicrohttpd=$(mod_list_microhttpd) +# K nghttp2 module +module_group_knghttp2=$(mod_list_nghttp2) + # K gcrypt module module_group_kgcrypt=$(mod_list_gcrypt)

1 0

git:master:5655ded5: modules: readme files regenerated - nghttp2 ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5655ded56eed50f743d2a60cb4c27c2c5b8dbd4b URL: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T19:31:21+02:00 modules: readme files regenerated - nghttp2 ... [skip ci] --- Modified: src/modules/nghttp2/README --- Diff: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… Patch: https://github.com/kamailio/kamailio/commit/5655ded56eed50f743d2a60cb4c27c2… --- diff --git a/src/modules/nghttp2/README b/src/modules/nghttp2/README index 21c296ca0a3..f880b2e5a13 100644 --- a/src/modules/nghttp2/README +++ b/src/modules/nghttp2/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -43,6 +44,7 @@ Daniel-Constantin Mierla 1.2. Set listen_port parameter 1.3. Set event_callback parameter 1.4. nghttp2_reply usage + 1.5. nghttp2_reply usage Chapter 1. Admin Guide @@ -62,7 +64,8 @@ Chapter 1. Admin Guide 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) 5. Event Routes @@ -87,7 +90,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libnghttp2 - libnghttpd library (v1.61.0+) + * libnghttp2 - libnghttpd library (v1.43.0+) 3. Parameters @@ -142,16 +145,32 @@ end 4. Functions - 4.1. nghttp2_reply(code, reason, ctype, body) + 4.1. nghttp2_reply(code, body) + 4.2. nghttp2_reply_header(name, value) -4.1. nghttp2_reply(code, reason, ctype, body) +4.1. nghttp2_reply(code, body) - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both + parameters can contain variables. Example 1.4. nghttp2_reply usage ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... + +4.2. nghttp2_reply_header(name, value) + + Set a header to be added to reply. There can be up to 15 headers. + + Example 1.5. nghttp2_reply usage +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:3439eb44: nghttp2: docs for nghttp2_reply_header(...) function
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 3439eb44087b044cb9caaaf8af8df155d6a42bba URL: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:15:32+02:00 nghttp2: docs for nghttp2_reply_header(...) function --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… Patch: https://github.com/kamailio/kamailio/commit/3439eb44087b044cb9caaaf8af8df15… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 4589bc145fe..54cde446de6 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -129,17 +129,39 @@ end <title>Functions</title> <section id="nghttp2.f.nghttp2_reply"> <title> - <function moreinfo="none">nghttp2_reply(code, reason, ctype, body)</function> + <function moreinfo="none">nghttp2_reply(code, body)</function> </title> <para> - Send back a reply with content-type and body. + Send back a reply with body. The body can be empty string. Both parameters + can contain variables. </para> <example> <title><function>nghttp2_reply</function> usage</title> <programlisting format="linespecific"> ... event_route[nghttp2:request] { - nghttp2_reply("200", "OK", "text/html", + nghttp2_reply("200", + "<html><body>OK</body></html>"); +} +... +</programlisting> + </example> + </section> + <section id="nghttp2.f.nghttp2_reply_header"> + <title> + <function moreinfo="none">nghttp2_reply_header(name, value)</function> + </title> + <para> + Set a header to be added to reply. There can be up to 15 headers. + </para> + <example> + <title><function>nghttp2_reply</function> usage</title> + <programlisting format="linespecific"> +... +event_route[nghttp2:request] { + nghttp2_reply_header("Content-Type", "text/html"); + nghttp2_reply_header("My-Header", "xyz"); + nghttp2_reply("200", "<html><body>OK</body></html>"); } ...

1 0

git:master:ec847027: nghttp2: separate function for setting response headers
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: ec847027effacb0f7003a3b12ff33017e10dc0c1 URL: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T19:10:57+02:00 nghttp2: separate function for setting response headers --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301… Patch: https://github.com/kamailio/kamailio/commit/ec847027effacb0f7003a3b12ff3301…

1 0

git:master:f3a5fb51: nghttp2: convert to debug messages
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: f3a5fb519d1e6a6670e44175332dc7889f8fb99e URL: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:21:40+02:00 nghttp2: convert to debug messages --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… Patch: https://github.com/kamailio/kamailio/commit/f3a5fb519d1e6a6670e44175332dc78… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 075ff6e0b23..bdbec4a8c58 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -240,7 +240,7 @@ static void delete_http2_session_data(http2_session_data *session_data) { http2_stream_data *stream_data; SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev); - fprintf(stderr, "%s disconnected\n", session_data->client_addr); + LM_ERR("%s disconnected\n", session_data->client_addr); if(ssl) { SSL_shutdown(ssl); } @@ -517,8 +517,7 @@ static int on_request_recv(nghttp2_session *session, } return 0; } - fprintf(stderr, "%s GET %s\n", session_data->client_addr, - stream_data->request_path); + LM_DBG("%s GET %s\n", session_data->client_addr, stream_data->request_path); if(!check_path(stream_data->request_path)) { if(error_reply(session, stream_data) != 0) { return NGHTTP2_ERR_CALLBACK_FAILURE; @@ -676,7 +675,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) SSL *ssl; (void)bev; - fprintf(stderr, "%s connected\n", session_data->client_addr); + LM_DBG("%s connected\n", session_data->client_addr); ssl = bufferevent_openssl_get_ssl(session_data->bev); @@ -690,8 +689,7 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) #endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */ if(alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) { - fprintf(stderr, "%s h2 is not negotiated\n", - session_data->client_addr); + LM_DBG("%s h2 is not negotiated\n", session_data->client_addr); delete_http2_session_data(session_data); return; } @@ -707,11 +705,11 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr) return; } if(events & BEV_EVENT_EOF) { - fprintf(stderr, "%s EOF\n", session_data->client_addr); + LM_DBG("%s EOF\n", session_data->client_addr); } else if(events & BEV_EVENT_ERROR) { - fprintf(stderr, "%s network error\n", session_data->client_addr); + LM_DBG("%s network error\n", session_data->client_addr); } else if(events & BEV_EVENT_TIMEOUT) { - fprintf(stderr, "%s timeout\n", session_data->client_addr); + LM_DBG("%s timeout\n", session_data->client_addr); } delete_http2_session_data(session_data); }

1 0

git:master:20fd1c44: nghttpd2: docs - update required libnghttp2 version
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 20fd1c44916f45b7dec6253f6f105aa606839281 URL: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:18:05+02:00 nghttpd2: docs - update required libnghttp2 version --- Modified: src/modules/nghttp2/doc/nghttp2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… Patch: https://github.com/kamailio/kamailio/commit/20fd1c44916f45b7dec6253f6f105aa… --- diff --git a/src/modules/nghttp2/doc/nghttp2_admin.xml b/src/modules/nghttp2/doc/nghttp2_admin.xml index 80465a7a49c..4589bc145fe 100644 --- a/src/modules/nghttp2/doc/nghttp2_admin.xml +++ b/src/modules/nghttp2/doc/nghttp2_admin.xml @@ -43,7 +43,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.61.0+) + <emphasis>libnghttp2</emphasis> - libnghttpd library (v1.43.0+) </para> </listitem> </itemizedlist>

1 0

git:master:6333db8f: nghttp2: compatibility with older libnghttp2 versions
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 6333db8fb19bd8684476914b3fe4d3ebda36940a URL: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: compatibility with older libnghttp2 versions --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e… Patch: https://github.com/kamailio/kamailio/commit/6333db8fb19bd8684476914b3fe4d3e…

1 0

git:master:740b73e6: nghttp2: Makefile - link with additional libraries
by Daniel-Constantin Mierla 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 740b73e6dd174f2946e29cfc00c2a72063fd6645 URL: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-09T17:10:47+02:00 nghttp2: Makefile - link with additional libraries --- Modified: src/modules/nghttp2/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… Patch: https://github.com/kamailio/kamailio/commit/740b73e6dd174f2946e29cfc00c2a72… --- diff --git a/src/modules/nghttp2/Makefile b/src/modules/nghttp2/Makefile index d6b2dd84674..f71ba0c3556 100644 --- a/src/modules/nghttp2/Makefile +++ b/src/modules/nghttp2/Makefile @@ -38,7 +38,55 @@ else LEVENTLIBS = $(shell $(LEVENT_BUILDER) --libs) endif -DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) -LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) + +ifeq ($(CROSS_COMPILE),) +LEVENTSSL_BUILDER = $(shell \ + if pkg-config --exists libevent_openssl; then \ + echo 'pkg-config libevent_openssl'; \ + fi) +endif + +ifeq ($(LEVENTSSL_BUILDER),) + LEVENTSSLDEFS=-I$(LOCALBASE)/include -I$(SYSBASE)/include + LEVENTSSLLIBS=-L$(LOCALBASE)/lib -levent_openssl +else + LEVENTSSLDEFS = $(shell $(LEVENTSSL_BUILDER) --cflags) + LEVENTSSLLIBS = $(shell $(LEVENTSSL_BUILDER) --libs) +endif + + +ifeq ($(CROSS_COMPILE),) +LSSL_BUILDER=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) +LCRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) +endif + +ifneq ($(LSSL_BUILDER),) + LSSLDEFS = $(shell $(LSSL_BUILDER) --cflags) + LSSLLIBS = $(shell $(LSSL_BUILDER) --libs) + +ifneq ($(CRYPTO_BUILDER),) + LCRYPTODEFS = $(shell $(LCRYPTO_BUILDER) --cflags) + LCRYPTOLIBS = $(shell $(LCRYPTO_BUILDER) --libs) +endif + +else + LSSLDEFS = -I$(LOCALBASE)/ssl/include + LSSLLIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \ + -L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \ + -lssl -lcrypto + LCRYPTODEFS = + LCRYPTOLIBS = +endif + + + +DEFS+=$(LNGHTTP2DEFS) $(LEVENTDEFS) $(LEVENTSSLDEFS) $(LSSLDEFS) $(LCRYPTODEFS) +LIBS=$(LNGHTTP2LIBS) $(LEVENTLIBS) $(LEVENTSSLLIBS) $(LSSLLIBS) $(LCRYPTOLIBS) include ../../Makefile.modules

1 0

git:master:9d3759c5: modules: readme files regenerated - ipops ... [skip ci]
by Kamailio Dev 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9d3759c5fcf38c842285dc2f6a700f7bb4cea740 URL: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-09T12:46:25+02:00 modules: readme files regenerated - ipops ... [skip ci] --- Modified: src/modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7… Patch: https://github.com/kamailio/kamailio/commit/9d3759c5fcf38c842285dc2f6a700f7…

1 0

[kamailio/kamailio] Add PRT query support to ipops module (PR #3802)
by Xenofon Karamanos 09 Apr '24

09 Apr '24

#### 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  This PR aims to add support for PRT queries in ipops module. Some functions were modified to accommodate and reuse the structures already defined for DNS. Any feedback is appreciated! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3802 -- Commit Summary -- * ipops: Move structures to header * ipops: Add PTR query support -- File Changes -- M src/modules/ipops/ipops_mod.c (30) M src/modules/ipops/ipops_pv.c (162) M src/modules/ipops/ipops_pv.h (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3802.patch https://github.com/kamailio/kamailio/pull/3802.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3802 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3802(a)github.com>

4 30

git:master:5a5b96c8: ipops: Add KEMI wrapper for ptr_query function
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5a5b96c8a1906b45873e50243f5946b8db5a068b URL: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add KEMI wrapper for ptr_query function --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Patch: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 60fd514d4fb..ea82beb0867 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1333,6 +1333,14 @@ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) return ptr_update_pv(&ip_address, &name); } +/** + * \brief KEMI wrapper for `ptr_query` function. + */ +static int ki_ptr_query(sip_msg_t *msg, str *ip, str *pvid) +{ + return ptr_update_pv(ip, pvid); +} + /** * */ @@ -1513,6 +1521,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("ptr_query"), + SR_KEMIP_INT, ki_ptr_query, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("ipops"), str_init("srv_query"), SR_KEMIP_INT, ki_srv_query, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:812ad6eb: ipops: Add brief comment for ptr_query
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 812ad6eb4e49426197e2860b89b255fffb018b5a URL: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add brief comment for ptr_query --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Patch: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index ea2669d2a19..60fd514d4fb 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1298,7 +1298,18 @@ static int ki_dns_query(sip_msg_t *msg, str *naptrname, str *pvid) } /** + *! \brief Return 1 (true) if the given `ip` IP address (string or pv) + * could successfully be resolved to a domain and saved into `pv_name` pv. + * Otherwise, return negative values depending on the error. * + * \param[in] msg SIP message structure. + * \param[in] ip IP address (string or pv) to resolve. + * \param[in] pv_name PV name to save the resolved domain. + * \returns 1 on success. + * \returns negative values depending on the error: + * \retval 1 success. + * \retval res -1 to -5 for bad input. + * \retval -6 for error in resolving the domain. */ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 10447e84bcd..034ec696594 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -413,8 +413,16 @@ int dns_update_pv(str *hostname, str *name) return 1; } -/* -* +/** + * \brief Updates the pointer (PTR) record for a given IP address and saves it into pv. + * + * \details This function updates the PTR record for a specified IP address, and saves it + * into `name` AVP encapsulated in $ptrquery pv. + * It performs a reverse DNS lookup to obtain the hostname corresponding to the IP address. + * + * @param ip_address The IP address to update the PTR record for. + * @param name The name of AVP to hold the information in $ptrquery pv. + * @return 1 on success, or a negative value on failure. */ int ptr_update_pv(str *ip_address, str *name) {

1 0

git:master:a824e939: ipops: Add ptr_query docs
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: a824e939b589ae595fc735de1337a8bf4470de20 URL: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add ptr_query docs --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Patch: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index 14dad9f5df6..912d953c9fe 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -883,6 +883,93 @@ if(dns_query("test.com", "xyz")) </section> + <section id="ipops.f.ptr_query"> + <title> + <function moreinfo="none">ptr_query(ip, pvid)</function> + </title> + + <para> + Store the hostname that correspond to an IP address (IPv4 or IPv6) + in a pseudo-variable variable $ptrquery(pvid=>hostname). + </para> + + <para> + <emphasis>Note: Results will be in in $ptrquery(pvid=>key).</emphasis> + key can be: + <itemizedlist> + <listitem> + <para> + <emphasis>addr</emphasis> - IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>type</emphasis> - type of IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv4</emphasis> - 1 if IPv4 address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv6</emphasis> - 1 if IPv6 address + </para> + </listitem> + <listitem> + <para> + <emphasis>count</emphasis> - number of hostnames found + </para> + </listitem> + <listitem> + <para> + <emphasis>hostname</emphasis> - hostname + </para> + </listitem> + </itemizedlist> + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>ip</emphasis> - string or pseudo-variable containing the ip. + </para> + </listitem> + <listitem> + <para> + <emphasis>pvid</emphasis> - AVP id for script variable. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>ptr_query</function> usage + </title> + <programlisting format="linespecific"> +... +if(ptr_query("8.8.8.8","ip4")) +{ + xlog(" number of names: $ptrquery(ip4=>count)\n"); + $var(j) = 0; + while($var(j)<$ptrquery(ip4=>count)) { + xlog(" #[$var(j)] name [ $ptrquery(ip4=>hostname) ]\n"); + $var(j) = $var(j) + 1; + } +} +... + </programlisting> + </example> + + </section> + <section id="ipops.f.srv_query"> <title> <function moreinfo="none">srv_query(srvcname, pvid)</function>

1 0

git:master:4c775edd: ipops: Add PTR query support
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 4c775eddaf76cbaf376bfb2d0e5efc78d0d60dc4 URL: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add PTR query support --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Patch: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7…

1 0

git:master:9181ee56: ipops: Move structures to header
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9181ee56e8e90845982a5d994b96917c1e03d059 URL: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Move structures to header --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Patch: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index c6374b6ab7c..6769d1863c7 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -35,38 +35,8 @@ #include "../../core/resolve.h" #include "../../core/pvar.h" +#include "ipops_pv.h" -#define PV_DNS_ADDR 64 -#define PV_DNS_RECS 32 - -typedef struct _sr_dns_record -{ - int type; - char addr[PV_DNS_ADDR]; -} sr_dns_record_t; - -typedef struct _sr_dns_item -{ - str name; - unsigned int hashid; - char hostname[256]; - int count; - int ipv4; - int ipv6; - sr_dns_record_t r[PV_DNS_RECS]; - struct _sr_dns_item *next; -} sr_dns_item_t; - -#define SR_DNS_PVIDX 1 - -typedef struct _dns_pv -{ - sr_dns_item_t *item; - int type; - int flags; - pv_spec_t *pidx; - int nidx; -} dns_pv_t; static sr_dns_item_t *_sr_dns_list = NULL; diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 8b6642ce3a8..f62e4e52e5e 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -24,6 +24,35 @@ #define _IPOPS_PV_H_ #include "../../core/pvar.h" +#define PV_DNS_ADDR 64 +#define PV_DNS_RECS 32 +#define SR_DNS_PVIDX 1 + +typedef struct _sr_dns_record +{ + int type; + char addr[PV_DNS_ADDR]; +} sr_dns_record_t; +typedef struct _sr_dns_item +{ + str name; + unsigned int hashid; + char hostname[256]; + int count; + int ipv4; + int ipv6; + sr_dns_record_t r[PV_DNS_RECS]; + struct _sr_dns_item *next; +} sr_dns_item_t; + +typedef struct _dns_pv +{ + sr_dns_item_t *item; + int type; + int flags; + pv_spec_t *pidx; + int nidx; +} dns_pv_t; int pv_parse_dns_name(pv_spec_t *sp, str *in); int pv_get_dns(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a7e02a40: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: a7e02a406a0ecec5434fc634149dfc8f61043b2f URL: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-08T21:31:24+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Patch: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 844a6cf3107..57ae0972735 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -78,6 +78,7 @@ Hugh Waite 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -141,6 +142,7 @@ Hugh Waite 1.29. http_client_request() usage 1.30. http_client_request_v2pk() usage 1.31. http_client_response_headers_set() usage + 1.32. http_client_response_headers_clear() usage Chapter 1. Admin Guide @@ -188,6 +190,7 @@ Chapter 1. Admin Guide 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -732,6 +735,7 @@ modparam("http_client", "response_headers", 1) 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 4.1. http_connect(connection, url, [content_type, data,] result) @@ -951,6 +955,20 @@ ram})&f_uri=$(fu{s.escape.param})", xinfo("response header: $httprhdr(X-Header)\n"); ... +4.9. http_client_response_headers_clear() + + Clear stored response headers, if not explicitely done, it happens when + the next HTTP request is performed. + + Example 1.32. http_client_response_headers_clear() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); +... + 5. Pseudo-Variables 5.1. $curlerror(error)

1 0

git:master:5ba76f65: nghttp2: new module for supporting direct http2 connections
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 5ba76f65f5c2ea522a2e6629bd845918258a80cf URL: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T21:25:11+02:00 nghttp2: new module for supporting direct http2 connections - initial import version --- Added: src/modules/nghttp2/Makefile Added: src/modules/nghttp2/README Added: src/modules/nghttp2/doc/Makefile Added: src/modules/nghttp2/doc/nghttp2.xml Added: src/modules/nghttp2/doc/nghttp2_admin.xml Added: src/modules/nghttp2/nghttp2_mod.c Added: src/modules/nghttp2/nghttp2_server.c Added: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Patch: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591…

1 0

git:master:d55cd7e6: http_client: docs for http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: d55cd7e613c787ce0dd91abad036d4ecd7556023 URL: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T17:03:19+02:00 http_client: docs for http_client_response_headers_clear() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Patch: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 0a8f147eb0e..e81d912c11e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1047,6 +1047,26 @@ http_client_response_headers_set("1"); http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); xinfo("response header: $httprhdr(X-Header)\n"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_clear"> + <title> + <function moreinfo="none">http_client_response_headers_clear()</function> + </title> + <para> + Clear stored response headers, if not explicitely done, it happens + when the next HTTP request is performed. + </para> + <example> + <title><function>http_client_response_headers_clear()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); ... </programlisting> </example>

1 0

git:master:cdf0633b: http_client: added http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: cdf0633b6b51bbfb7eb785715358c88aeb4c6a40 URL: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T14:14:58+02:00 http_client: added http_client_response_headers_clear() - clear response headers - if not explicitely done, it happens when next http request is performed --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Patch: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c8af2f64901..27310829d0e 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -160,6 +160,8 @@ static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_client_response_headers_set( sip_msg_t *_m, char *_pval, char *_p2); +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_p1, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -205,6 +207,9 @@ static cmd_export_t cmds[] = { {"http_client_response_headers_set", (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"http_client_response_headers_clear", + (cmd_function)w_http_client_response_headers_clear, 1, 0, + 0, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1184,6 +1189,16 @@ static int w_http_client_response_headers_set( return ki_http_client_response_headers_set(_m, ival); } +/*! + * + */ +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_pval, char *_p2) +{ + http_client_response_headers_reset(); + return 1; +} + /*! * Parse arguments to pv $curlerror */

1 0

git:5.8:215af598: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.8 Commit: 215af59832efc6e485563b55e3af9d209121d0c5 URL: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:47:20+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Patch: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.7:46cf3559: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.7 Commit: 46cf3559f4847b00790c043de41699b6c16f4920 URL: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:54+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… Patch: https://github.com/kamailio/kamailio/commit/46cf3559f4847b00790c043de41699b… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:5.6:2a6f18aa: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.6 Commit: 2a6f18aaf08d87c71c530a14ebae17d211ae8a25 URL: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:46:21+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… Patch: https://github.com/kamailio/kamailio/commit/2a6f18aaf08d87c71c530a14ebae17d… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 7d121430f1b..e10e2d11658 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -32,7 +32,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:60ded00a: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 60ded00a3b574a08457a696334d11d668595cc0b URL: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T11:35:38+03:00 pdb server: allow carrier id 0 --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… Patch: https://github.com/kamailio/kamailio/commit/60ded00a3b574a08457a696334d11d6… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

git:master:1b01ecfe: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 1b01ecfe0b4e9bbba62afae0f3a3bb1612cdffcd URL: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-07T16:01:35+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1… Patch: https://github.com/kamailio/kamailio/commit/1b01ecfe0b4e9bbba62afae0f3a3bb1…

1 0

git:master:b3562c6b: http_client: docs for http_client_response_headers_set()
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: b3562c6b10accec829a15c25fd56e53c8c89a87e URL: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T15:50:33+02:00 http_client: docs for http_client_response_headers_set() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… Patch: https://github.com/kamailio/kamailio/commit/b3562c6b10accec829a15c25fd56e53… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6424582074c..0a8f147eb0e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1026,6 +1026,27 @@ http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_set"> + <title> + <function moreinfo="none">http_client_response_headers_set(mode)</function> + </title> + <para> + Set if the HTTP response header should be stored (when mode is 1) + or not (when mode is 0). If mode is 0, then it also clears previously + stored response headers. + </para> + <example> + <title><function>http_client_response_headers_set()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_response_headers_set("1"); +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); ... </programlisting> </example>

1 0

git:master:00198b8d: http_client: added http_client_response_headers_set(mode)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 00198b8d863a94ea593b7473c88c35e6cad67014 URL: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:41:22+02:00 http_client: added http_client_response_headers_set(mode) - control if http response header should be set or not --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… Patch: https://github.com/kamailio/kamailio/commit/00198b8d863a94ea593b7473c88c35e… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 4bea581d50f..c8af2f64901 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -158,6 +158,8 @@ static int w_http_query_request(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -200,6 +202,9 @@ static cmd_export_t cmds[] = { {"http_get_redirect", (cmd_function)w_curl_get_redirect, 2, fixup_curl_get_redirect, fixup_free_curl_get_redirect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"http_client_response_headers_set", + (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1149,6 +1154,36 @@ static int w_http_query_request(sip_msg_t *_m, char *_met, char *_url, return ki_http_request_helper(_m, &met, &url, &body, &hdrs, 0, dst); } +/*! + * + */ +static int ki_http_client_response_headers_set(sip_msg_t *_m, int ival) +{ + if(ival == 0) { + http_client_response_headers_reset(); + http_client_response_headers_param = 0; + } else { + http_client_response_headers_param = 1; + } + + return 1; +} + +/*! + * + */ +static int w_http_client_response_headers_set( + sip_msg_t *_m, char *_pval, char *_p2) +{ + int ival = 0; + + if(fixup_get_ivalue(_m, (gparam_t *)_pval, &ival) < 0) { + LM_ERR("failed to get parameter value\n"); + return -1; + } + return ki_http_client_response_headers_set(_m, ival); +} + /*! * Parse arguments to pv $curlerror */

1 0

git:master:fdb9c938: http_client: docs for $httprhdr(name)
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: fdb9c938639b3fea29b8c1ba6e6e412a5da8a7f3 URL: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:27:11+02:00 http_client: docs for $httprhdr(name) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… Patch: https://github.com/kamailio/kamailio/commit/fdb9c938639b3fea29b8c1ba6e6e412… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index f5eb42f7b91..6424582074c 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -716,7 +716,8 @@ modparam("http_client", "netinterface", "eth0") <section id="http_client.p.response_headers"> <title><varname>response_headers</varname> (int)</title> <para> - Set to 1 in order to store HTTP response headers. + Set to 1 in order to store HTTP response headers. A header value + can be retrieved with $httprhdr(name). </para> <para> <emphasis> @@ -1031,7 +1032,7 @@ switch ($rc) { </section> </section> <section> - <title>Pseudovariables</title> + <title>Pseudo-Variables</title> <section > <title> <function moreinfo="none">$curlerror(error)</function> @@ -1044,6 +1045,15 @@ switch ($rc) { http://curl.haxx.se/libcurl/c/libcurl-errors.html </para> </section> + <section > + <title> + <function moreinfo="none">$httprhdr(name)</function> + </title> + <para> + Return response header value. It requires response_headers parameter + to be set to 1. + </para> + </section> </section> <section> <title>RPC Commands</title>

1 0

git:master:90d78b7b: http_clinet: added variable $httprhdr(name) - get response header value
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 90d78b7b2bfc1899c1b64c2db8a353d43df68218 URL: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T10:15:41+02:00 http_clinet: added variable $httprhdr(name) - get response header value --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… Patch: https://github.com/kamailio/kamailio/commit/90d78b7b2bfc1899c1b64c2db8a353d… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index e910b514bbf..0004eb3ddc1 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -39,6 +39,7 @@ #include "../../core/pvar.h" #include "../../core/route_struct.h" #include "../../core/ut.h" +#include "../../core/trim.h" #include "../../core/mem/mem.h" #include "../../core/parser/msg_parser.h" @@ -127,6 +128,46 @@ void http_client_response_headers_reset(void) _http_client_response_headers = NULL; } +/** + * + */ +int http_client_response_headers_get(str *hname, str *hbody) +{ + httpc_hdr_t *it; + char *p; + + if(_http_client_response_headers == NULL) { + return -1; + } + if(hname == NULL || hname->len <= 0 || hbody == NULL) { + return -1; + } + for(it = _http_client_response_headers; it != NULL; it = it->next) { + if(it->name.len == 0 && it->hbuf.s[0] != ' ' && it->hbuf.s[0] != '\t' + && it->hbuf.s[0] != '\r' && it->hbuf.s[0] != '\n') { + /* parsing */ + p = strchr(it->hbuf.s, ':'); + if(p == NULL) { + continue; + } + it->name.s = it->hbuf.s; + it->name.len = p - it->name.s; + trim(&it->name); + p++; + it->body.s = p; + it->body.len = it->hbuf.s + it->hbuf.len - it->body.s; + trim(&it->body); + } + if(it->name.len == hname->len + && strncasecmp(it->name.s, hname->s, hname->len) == 0) { + hbody->s = it->body.s; + hbody->len = it->body.len; + return 0; + } + } + return -1; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. diff --git a/src/modules/http_client/functions.h b/src/modules/http_client/functions.h index d0c66c64e66..30c326bd0f8 100644 --- a/src/modules/http_client/functions.h +++ b/src/modules/http_client/functions.h @@ -78,4 +78,7 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *http_get_content_type(const str *connection); +int http_client_response_headers_get(str *hname, str *hbody); +void http_client_response_headers_reset(void); + #endif /* CURL_FUNCTIONS_H */ diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index d640d772ad3..4bea581d50f 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -164,6 +164,8 @@ static int curl_con_param(modparam_t type, void *val); static int pv_parse_curlerror(pv_spec_p sp, str *in); static int pv_get_curlerror( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_httprhdr(pv_spec_p sp, str *in); +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); /* clang-format off */ /* Exported functions */ @@ -237,6 +239,8 @@ static param_export_t params[] = { static pv_export_t mod_pvs[] = { {{"curlerror", (sizeof("curlerror")-1)}, /* Curl error codes */ PVT_OTHER, pv_get_curlerror, 0, pv_parse_curlerror, 0, 0, 0}, + {{"httprhdr", (sizeof("httprhdr")-1)}, /* HTTP response header */ + PVT_OTHER, pv_get_httprhdr, 0, pv_parse_httprhdr, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1193,6 +1197,35 @@ static int pv_get_curlerror( return pv_get_strval(msg, param, res, &curlerr); } +/** + * + */ +static int pv_parse_httprhdr(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_VAL_STR; + sp->pvp.pvn.u.isname.name.s = *in; + + return 0; +} + +/** + * + */ +static int pv_get_httprhdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str hbody = STR_NULL; + + if(http_client_response_headers_get(&param->pvn.u.isname.name.s, &hbody) + < 0) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &hbody); +} /* * Fix curl_get_redirect params: connection(string/pvar) url (string that may contain pvars) and

1 0

git:master:f7e0a189: http_client: docs for modparam response_headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: f7e0a189362cc9f5ab8962868496c4b49b72a76c URL: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:33:04+02:00 http_client: docs for modparam response_headers --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… Patch: https://github.com/kamailio/kamailio/commit/f7e0a189362cc9f5ab8962868496c4b… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 2fb918d5997..f5eb42f7b91 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -709,6 +709,25 @@ http_follow_redirect = no <programlisting format="linespecific"> ... modparam("http_client", "netinterface", "eth0") +... + </programlisting> + </example> + </section> + <section id="http_client.p.response_headers"> + <title><varname>response_headers</varname> (int)</title> + <para> + Set to 1 in order to store HTTP response headers. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>response_headers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "response_headers", 1) ... </programlisting> </example>

1 0

git:master:8f364976: http_client: option to store http response headers
by Daniel-Constantin Mierla 07 Apr '24

07 Apr '24

Module: kamailio Branch: master Commit: 8f364976a81358de39cb5d675b3703f3f65a0d59 URL: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-07T09:20:33+02:00 http_client: option to store http response headers - new modparam response_headers has to be set to 1 --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… Patch: https://github.com/kamailio/kamailio/commit/8f364976a81358de39cb5d675b3703f… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index df6b8233b51..e910b514bbf 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -75,6 +75,58 @@ typedef struct } curl_query_t; +/** + * + */ +typedef struct httpc_hdr +{ + str hbuf; + str name; + str body; + struct httpc_hdr *next; +} httpc_hdr_t; + +/** + * + */ +httpc_hdr_t *_http_client_response_headers = NULL; + +/** + * + */ +httpc_hdr_t *httpc_hdr_block_add(httpc_hdr_t **head, char *s, int len) +{ + httpc_hdr_t *nv; + nv = pkg_mallocxz(sizeof(httpc_hdr_t) + (len + 1) * sizeof(char)); + if(!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->hbuf.s = (char *)nv + sizeof(httpc_hdr_t); + memcpy(nv->hbuf.s, s, len); + nv->hbuf.len = len; + nv->next = *head; + *head = nv; + + return nv; +} + +/** + * + */ +void http_client_response_headers_reset(void) +{ + httpc_hdr_t *it0; + httpc_hdr_t *it1; + it0 = _http_client_response_headers; + while(it0 != NULL) { + it1 = it0->next; + pkg_free(it0); + it0 = it1; + } + _http_client_response_headers = NULL; +} + /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. @@ -112,6 +164,20 @@ size_t write_function(void *ptr, size_t size, size_t nmemb, void *stream_ptr) } +size_t http_client_response_header_cb( + char *b, size_t size, size_t nitems, void *userdata) +{ + size_t numbytes; + + numbytes = size * nitems; + LM_DBG("http response header [%.*s]\n", (int)numbytes, b); + + httpc_hdr_block_add(&_http_client_response_headers, b, (int)numbytes); + + return numbytes; + ; +} + /*! Send query to server, optionally post data. */ static int curL_request_url(struct sip_msg *_m, const char *_met, @@ -288,6 +354,12 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, res |= curl_easy_setopt(curl, CURLOPT_INTERFACE, params->netinterface); } + if(http_client_response_headers_param != 0) { + http_client_response_headers_reset(); + res |= curl_easy_setopt( + curl, CURLOPT_HEADERFUNCTION, http_client_response_header_cb); + } + res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)(&stream)); diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 91573425990..d640d772ad3 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -117,6 +117,8 @@ unsigned int default_query_result = 1; /*!< Default download size for result of query function. 0=disabled (no limit) */ unsigned int default_query_maxdatasize = 0; +int http_client_response_headers_param = 0; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -224,6 +226,7 @@ static param_export_t params[] = { {"query_result", PARAM_INT, &default_query_result }, {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {"netinterface", PARAM_STRING, &default_netinterface }, + {"response_headers", PARAM_INT, &http_client_response_headers_param }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index c56f411df1f..42ee1e914f8 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -75,6 +75,8 @@ extern counter_handle_t connfail; /* Failed Connection attempts */ extern char *default_netinterface; +extern int http_client_response_headers_param; /* store http response headers */ + /* Curl stream object */ typedef struct {

1 0

[kamailio/kamailio] Kamailio segfaults when KEMI functions are invoked from app_python script (Issue #3746)
by David Minh Phan 07 Apr '24

07 Apr '24

### Description Kamailio segfaults when KEMI functions are invoked from app_python script ### Troubleshooting The same code was running ok with the 5.6 branch. It seems that the function sr_apy_kemi_exec_func_ex has been re-written in 5.7 with the following main changes : - The long IF/ELSE statement was replace by a FOR loop - The call to PyArg_ParseTuple function was replaced by the call to PyList_GetItem ==> **This seems to be the cause. The value returned by this function is alway NULL** #### Reproduction Any call to KSR.pv.seti function from a PYTHON 2 script would cause this error. #### Log Messages ``` sbin/kamailio[18449]: ERROR: app_python [apy_kemi.c:280]: sr_apy_kemi_exec_func_ex(): null parameter - func: seti idx: 0 argc: 2 Feb 6 11:34:16 .../sbin/kamailio[18509]: CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 37 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:793]: handle_sigs(): child process 18449 exited by a signal 11 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:796]: handle_sigs(): core was not generated Feb 6 11:34:16 .../sbin/kamailio[18380]: INFO: <core> [main.c:818]: handle_sigs(): terminating due to SIGCHLD Feb 6 11:34:16 .../sbin/kamailio[18509]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18502]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18495]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18482]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3746 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3746(a)github.com>

3 3

git:master:b4537720: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: b4537720ff8158d59856cc0601ff4bf84216be99 URL: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-06T08:46:21+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf… Patch: https://github.com/kamailio/kamailio/commit/b4537720ff8158d59856cc0601ff4bf…

1 0

git:master:9b3b8ec9: corex: docs for dns_file parameter
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: 9b3b8ec968c6f7bda0d10a0d4fe593a92560ee7d URL: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:35:19+02:00 corex: docs for dns_file parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Patch: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index d5cfe1db477..3cdad0aa2a5 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -162,6 +162,41 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_file"> + <title><varname>dns_file</varname> (string)</title> + <para> + Path to the file from where to load dns_cache records. It can be set + many times to add more than one file. + </para> + <para> + Inside the file, the dns_cache record has to be in a single line, with + the format of the dns_cache module parameter (see above). Empty lines + or lines with whitespaces only are ignored. Comment lines have to start + with '#'. Comments are not accepted after dns_cache records, only on + separate lines. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_file</varname> parameter</title> + <programlisting format="linespecific"> +... +# content of /etc/kamailio/kamailio-cache.dns + +# IPv4 record +type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0 +# IPv6 record +type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0 +... +... +modparam("corex", "dns_file", "/etc/kamailio/kamailio-cache.dns") +... </programlisting> </example> </section> @@ -1291,4 +1326,3 @@ sub do_uncompress() { </example> </section> </chapter> -

1 0

git:master:c8cf642c: corex: added dns_file modparam
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: c8cf642c21169bcaee82347db858d8f3bcb6a42c URL: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:19:19+02:00 corex: added dns_file modparam - can be set to the path of a file containing dns_cache records - each line has to contain a dns_cache-param-formatted record - empty lines are allowed - comment line has to start with #, comments can be only on separate line, not supported after dns_cache record --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Patch: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4152fbf5df4..6739e4cee16 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -32,6 +32,7 @@ #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../core/str_list.h" +#include "../../core/trim.h" #include "../../core/events.h" #include "../../core/onsend.h" #include "../../core/forward.h" @@ -82,12 +83,15 @@ static int corex_evrt_reply_out_no = -1; int corex_alias_subdomains_param(modparam_t type, void *val); int corex_dns_cache_param(modparam_t type, void *val); +int corex_dns_file_param(modparam_t type, void *val); +int corex_dns_file_load(void); static int mod_init(void); static int child_init(int); static void mod_destroy(void); static str_list_t *corex_dns_cache_list = NULL; +static str_list_t *corex_dns_file_list = NULL; static int corex_dns_cache_param_add(str *pval); @@ -176,6 +180,8 @@ static param_export_t params[] = { (void *)corex_alias_subdomains_param}, {"dns_cache", PARAM_STR | USE_FUNC_PARAM, (void *)corex_dns_cache_param}, + {"dns_file", PARAM_STR | USE_FUNC_PARAM, + (void *)corex_dns_file_param}, {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, @@ -226,6 +232,9 @@ static int mod_init(void) return -1; } } + if(corex_dns_file_load() < 0) { + return -1; + } if((nio_intercept > 0) && (nio_intercept_init() < 0)) { LM_ERR("failed to register network io intercept callback\n"); @@ -385,6 +394,67 @@ int corex_dns_cache_param(modparam_t type, void *val) return 0; } +int corex_dns_file_param(modparam_t type, void *val) +{ + str_list_t *sit; + + if(val == NULL || ((str *)val)->s == NULL || ((str *)val)->len == 0) { + LM_ERR("invalid parameter\n"); + return -1; + } + + sit = (str_list_t *)pkg_mallocxz(sizeof(str_list_t)); + if(sit == NULL) { + PKG_MEM_ERROR; + return -1; + } + sit->s = *((str *)val); + if(corex_dns_file_list != NULL) { + sit->next = corex_dns_file_list; + } + corex_dns_file_list = sit; + + return 0; +} + +int corex_dns_file_load(void) +{ + str_list_t *sit; + str sline; + char lbuf[512]; + FILE *FP; + + for(sit = corex_dns_file_list; sit != NULL; sit = sit->next) { + FP = fopen(sit->s.s, "r"); + if(FP == NULL) { + LM_ERR("failed to open file '%.*s'\n", sit->s.len, sit->s.s); + return -1; + } + while(fgets(lbuf, 512, FP)) { + sline.s = lbuf; + sline.len = strlen(sline.s); + trim(&sline); + if(sline.len <= 0) { + /* empty line */ + continue; + } + if(sline.s[0] == '#') { + /* comment */ + continue; + } + if(corex_dns_cache_param_add(&sline) < 0) { + LM_ERR("failed to add record: '%.*s' (%.*s)\n", sline.len, + sline.s, sit->s.len, sit->s.s); + fclose(FP); + return -1; + } + } + fclose(FP); + } + + return 0; +} + static int corex_dns_cache_param_add(str *pval) { str sval;

1 0

git:master:92d3573b: ims_ipsec_pcscf: log error message made info
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 92d3573b500374d100639484e5a84cb640dc6b1d URL: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T21:42:12+02:00 ims_ipsec_pcscf: log error message made info --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Patch: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 4f7301b56c1..b5a598b44ba 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,7 +1126,8 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); - } else if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TLS)) { + } else if((_cflags & IPSEC_SETDSTURI_FULL) + && (dst_proto == PROTO_TLS)) { buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", ci.via_host.len, ci.via_host.s, dst_port); @@ -1143,7 +1144,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) memcpy(m->dst_uri.s, buf, buf_len); m->dst_uri.len = buf_len; m->dst_uri.s[m->dst_uri.len] = '\0'; - LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + LM_INFO("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); } // Set send socket

1 0

git:master:5b689721: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 5b689721332a311dd2fb93d154e09c775701dab4 URL: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T20:31:21+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Patch: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7…

1 0

git:master:bae35e49: xhttp_prom: update documentation for uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: bae35e49fa364de6a4c003c4484358d5592677de URL: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:28:32Z xhttp_prom: update documentation for uptime statistic --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Patch: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index 83cede92633..d3b5961a218 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -182,8 +182,9 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") </programlisting> </example> </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> - <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <title><varname>xhttp_prom_pkg_stats</varname> (integer)</title> <para> Enable or disable internal &kamailio; pkg memory statistics. </para> @@ -201,6 +202,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") ... # enable pkg stats modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_uptime_stat"> + <title><varname>xhttp_prom_uptime_stat</varname> (integer)</title> + <para> + Enable or disable &kamailio; uptime statistic. + </para> + <para> + <emphasis>If not 0</emphasis>, uptime statistic will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no uptime statistic). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_uptime_stat</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable uptime statistic +modparam("xhttp_prom", "xhttp_prom_uptime_stat", 1) ... </programlisting> </example>

1 0

git:master:6af0ae46: xhttp_prom: new uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 6af0ae461486554481cbace41d50b8639b2ade8a URL: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:21:29Z xhttp_prom: new uptime statistic --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Patch: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 786a2c3e40a..efe111b752a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -33,6 +33,7 @@ #include <inttypes.h> #include <stdarg.h> +#include "../../core/globals.h" #include "../../core/counters.h" #include "../../core/ut.h" #include "../../core/pt.h" @@ -204,6 +205,36 @@ static int metric_generate( return 0; } +/** + * @brief Generate a string suitable for Prometheus pkgmem metric. + * + * @return 0 on success. + */ +static int prom_metric_uptime_print(prom_ctx_t *ctx) +{ + int uptime; + time_t now; + uint64_t ts; + + if(get_timestamp(&ts)) { + LM_ERR("Fail to get timestamp\n"); + goto error; + } + + time(&now); + uptime = (int)(now - up_since); + if(prom_body_printf(ctx, "%.*suptime %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, uptime, ts) + == -1) { + LM_ERR("Fail to print\n"); + goto error; + } + return 0; + +error: + return -1; +} + /** * @brief Generate a string suitable for Prometheus pkgmem metric. * @@ -322,6 +353,13 @@ int prom_stats_get(prom_ctx_t *ctx, str *stat) } } + if(uptime_stat_enabled) { + if(prom_metric_uptime_print(ctx)) { + LM_ERR("Fail to print uptime metric\n"); + return -1; + } + } + LM_DBG("Statistics for: %.*s\n", stat->len, stat->s); int len = stat->len; diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 6eaffb640a3..f54cfb19f17 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -153,6 +153,8 @@ int buf_size = 0; /**< size of buffer that contains the reply. */ int timeout_minutes = 60; /**< timeout in minutes to delete old metrics. */ +int uptime_stat_enabled = 0; /**< enable or disable uptime statistic. */ + int pkgmem_stats_enabled = 0; /**< enable or disable pkgmem statistics. */ char error_buf[ERROR_REASON_BUF_LEN]; @@ -213,6 +215,7 @@ static param_export_t params[] = {{"xhttp_prom_buf_size", INT_PARAM, &buf_size}, {"prom_histogram", PARAM_STRING | USE_FUNC_PARAM, (void *)prom_histogram_param}, {"xhttp_prom_timeout", INT_PARAM, &timeout_minutes}, + {"xhttp_prom_uptime_stat", INT_PARAM, &uptime_stat_enabled}, {"xhttp_prom_pkg_stats", INT_PARAM, &pkgmem_stats_enabled}, {0, 0, 0}}; struct module_exports exports = { diff --git a/src/modules/xhttp_prom/xhttp_prom.h b/src/modules/xhttp_prom/xhttp_prom.h index 12851368df4..fa1aa611ae2 100644 --- a/src/modules/xhttp_prom/xhttp_prom.h +++ b/src/modules/xhttp_prom/xhttp_prom.h @@ -84,6 +84,11 @@ extern str xhttp_prom_beginning; */ extern int timeout_minutes; +/** + * @brief enable or disable uptime statistic. + */ +extern int uptime_stat_enabled; + /** * @brief enable or disable pkgmem statistics. */

1 0

git:master:d1118064: siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: d1118064d04bb77c818540e68edf1766db1d560a URL: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T16:19:42+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Patch: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 2ba80b5be94..6cc977197fb 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -780,7 +780,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) return 1; /* reserve memory for clean tel uri */ - tel_uri.s = pkg_malloc(uri.len + 1); + tel_uri.s = pkg_mallocxz(uri.len + 1); if(tel_uri.s == 0) { LM_ERR("no more pkg memory\n"); return -1; @@ -839,7 +839,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* reserve memory for resulting sip uri */ sip_uri.len = 4 + tel_uri.len - 4 + 1 + hostpart.len + 1 + 10; - sip_uri.s = pkg_malloc(sip_uri.len + 1); + sip_uri.s = pkg_mallocxz(sip_uri.len + 1); if(sip_uri.s == 0) { LM_ERR("no more pkg memory\n"); pkg_free(tel_uri.s); @@ -873,6 +873,8 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* tel_uri is not needed anymore */ pkg_free(tel_uri.s); + sip_uri.len = strlen(sip_uri.s); + /* set result pv value and write sip uri to result pv */ res_val.rs = sip_uri; res_val.flags = PV_VAL_STR;

1 0

git:master:8523eb21: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8523eb2180ec878278863c5315ca4067586824bb URL: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T13:01:11+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Patch: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406…

1 0

git:master:3208dd82: textopsx: docs for msg_changed_route(...)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 3208dd822f94cff7b28d9682b083f3d144d7368e URL: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: docs for msg_changed_route(...) --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Patch: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b6b50916051..92666736c86 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -50,6 +50,33 @@ if(msg_apply_changes()) </example> </section> + <section id="textopsx.f.msg_changed_route"> + <title> + <function moreinfo="none">msg_changed_route(rname)</function> + </title> + <para> + Execute a route block specified by rname, using a new SIP message + structure build using the current SIP message with applied changes. + The current SIP message does not get the changes applied. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_changed_route()</function> usage</title> + <programlisting format="linespecific"> +... +append_hf("My-Header: yes\r\n"); +msg_changed_route("UPDATEDMSG"); +... +route[UPDATEDMSG] { + xinfo("My-Header-Value: $hdr(My-Header)\n"); +} +... +</programlisting> + </example> + </section> + <section id="textopsx.f.msg_set_buffer"> <title> <function moreinfo="none">msg_set_buffer(data)</function>

1 0

git:master:ac22a5c1: textopsx: added msg_changed_route(rname)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: ac22a5c174d4652ae09b779a5384182211700f20 URL: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: added msg_changed_route(rname) - execute a route block using the changed message, without efectivelly changing the current message structure (it stays without changes applied) --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Patch: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 5710cfeb864..8982924296a 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_changed_route_f(sip_msg_t *msg, char *str1, char *str2); static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); @@ -122,6 +123,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_changed_route", (cmd_function)msg_changed_route_f, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, @@ -276,6 +279,92 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) return sip_msg_apply_changes(msg); } +/** + * + */ +static int ki_msg_changed_route(sip_msg_t *msg, str *rname) +{ + str obuf = STR_NULL; + int ridx = -1; + sip_msg_t lmsg; + sr_kemi_eng_t *keng = NULL; + run_act_ctx_t ctx; + str evname = str_init("textopsx:msg-changed-route"); + + keng = sr_kemi_eng_get(); + if(keng == NULL) { + ridx = route_lookup(&main_rt, rname->s); + if(ridx < 0) { + LM_ERR("route block [%.*s] not found\n", rname->len, rname->s); + return -1; + } + } + + if(sip_msg_eval_changes(msg, &obuf) < 0 || obuf.s == NULL) { + LM_ERR("failed to evaluate msg changes\n"); + return -1; + } + + memset(&lmsg, 0, sizeof(sip_msg_t)); + lmsg.buf = obuf.s; + lmsg.len = obuf.len; + lmsg.id = msg->id; + lmsg.pid = msg->pid; + lmsg.rcv = msg->rcv; + lmsg.set_global_address = msg->set_global_address; + lmsg.set_global_port = msg->set_global_port; + lmsg.flags = msg->flags; + lmsg.msg_flags = msg->msg_flags; + memcpy(lmsg.xflags, msg->xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); + lmsg.hash_index = msg->hash_index; + lmsg.force_send_socket = msg->force_send_socket; + + /* parse the local message */ + LM_DBG("SIP message content updated - parsing\n"); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { + LM_ERR("parsing new sip message failed [[%.*s]]\n", lmsg.len, lmsg.buf); + return -1; + } + if(parse_headers(&lmsg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) + < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + lmsg.len, lmsg.buf); + return -1; + } + init_run_actions_ctx(&ctx); + + if(keng == NULL) { + run_top_route(main_rt.rlist[ridx], &lmsg, &ctx); + } else { + if(sr_kemi_ctx_route(keng, &ctx, &lmsg, get_route_type(), + rname, &evname) + < 0) { + LM_ERR("error running route kemi callback\n"); + } + } + + free_sip_msg(&lmsg); + + pkg_free(obuf.s); + + return 1; +} + +/** + * + */ +static int msg_changed_route_f(sip_msg_t *msg, char *prname, char *str2) +{ + str rname = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)prname, &rname) < 0) { + LM_ERR("could not get route name param value\n"); + return -1; + } + + return ki_msg_changed_route(msg, &rname); +} + /** * */

1 0

git:master:756f01ee: pv: use core helper to evaluate changes for pv updated message buffer
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 756f01eecec754726c09a7067e11db9781e35ac1 URL: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 pv: use core helper to evaluate changes for pv updated message buffer --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Patch: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1f998bfc1d3..40557ba4628 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -522,8 +522,6 @@ static str _ksr_pv_msg_buf_updated = STR_NULL; int pv_get_msg_buf_updated( struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - dest_info_t send_info; - if(msg == NULL) return -1; @@ -533,17 +531,7 @@ int pv_get_msg_buf_updated( _ksr_pv_msg_buf_updated.len = 0; } - init_dest_info(&send_info); - send_info.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, - BUILD_NO_VIA1_UPDATE); - } else if(msg->first_line.type == SIP_REQUEST) { - _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, &send_info, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } else { + if(sip_msg_eval_changes(msg, &_ksr_pv_msg_buf_updated) < 0) { return pv_get_null(msg, param, res); }

1 0

git:master:cad94eb7: core: msg translator - helper function to evaluate changes
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: cad94eb73c1223ddcf69aa0d073deb3118b46e3f URL: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 core: msg translator - helper function to evaluate changes --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Patch: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index acd5911867a..ab02fb7c47c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3485,6 +3485,33 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) return 1; } +/** + * evaluate changes and set the output buffer + * - obuf->s has to be pkg freed + * - return: 1 on success, -1 on failure + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf) +{ + dest_info_t dst; + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf->s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf->len, BUILD_NO_VIA1_UPDATE); + } else { + obuf->s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf->len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf->s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index eac64186d56..9d41b472767 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -173,6 +173,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, */ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); +/** + * evaluate changes and set the output buffer + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf); + /** * apply changes to sip msg buffer and reparse */

1 0

git:master:95f7af6f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 95f7af6f3aea7ff01fdc06a72703441c4ef320ca URL: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T11:31:18+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Patch: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441…

1 0

[kamailio/kamailio] DBURL can't read env params (Issue #3800)
by gao114882 05 Apr '24

05 Apr '24

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` I want to read params from environment, so define #!defenv MYSQL_IP #!trydef DBURL "mysql://kamailio:kamailio@MYSQL_IP/kamailio" but It can't read this ”MYSQL_IP“。 root@d2e1fcc3f89e:/# env |grep MYSQL* MYSQL_URL=172.16.4.111 MYSQL_IP=172.16.4.111 ``` #### Log Messages  ``` 0(34) ERROR: db_mysql [km_my_con.c:166]: db_mysql_new_connection(): driver error: Unknown server host 'MYSQL_IP' (-2) 0(34) ERROR: <core> [db.c:324]: db_do_init2(): could not add connection to the pool 0(34) ERROR: dispatcher [dispatch.c:955]: ds_connect_db(): cannot initialize db connection 0(34) ERROR: dispatcher [dispatch.c:989]: ds_init_db(): unable to connect to the database 0(34) ERROR: dispatcher [dispatcher.c:439]: mod_init(): could not initiate a connect to the database 0(34) ERROR: <core> [core/sr_module.c:1030]: init_mod(): Error while initializing module dispatcher (/usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.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, 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 with gcc 12.2.0 ``` * **Operating System**:  ``` cat /proc/version Linux version 3.10.0-1160.105.1.el7.x86_64 (mockbuild(a)kbuilder.bsys.centos.org) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC) ) #1 SMP Thu Dec 7 15:39:45 UTC 2023 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3800 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3800(a)github.com>

3 3

[kamailio/kamailio] Topos breaks early dialog transactions on multi-homed kamailio instances using enable_double_rr and versions >= 5.6.5 (Issue #3757)
by George Diamantopoulos 05 Apr '24

05 Apr '24

### Description All kamailio versions on the 5.7.x train and additionally point release 5.6.5 break early dialog transactions, at least when the following conditions are (cumulatively) met: * topos-redis is enabled (haven't tested other storage backends yet, let me know if needed) * kamailio is multihomed * enable_double_rr is enabled (the default) ### Troubleshooting #### SIP Traffic Here's an exchange demonstrating the problem: ``` kamailio instance ──────────┬──────────────────┬───────── internal external peer 172.30.154.1:5060 185.73.43.241:5060 195.167.21.66:5060 ──────────┬──────────────────┬───────── ──────────┬───────── │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ INVITE (SDP) │ │ │ ──────────────────────────> │ │ │ 100 Trying │ │ │ <────────────────────────── │ │ │ 183 Session Progress (SDP) │ │ │ <────────────────────────── │ │ │ PRACK │ │ │ ──────────────────────────> │ │ │ 200 OK │ │ │ <────────────────────────── │ │ │ UPDATE (SDP) │ UPDATE (SDP) │ │ <─────────────────────────── │ │ ``` Whereas the expected behaviour should be: ``` │ │ UPDATE (SDP) │ | <────────────────────────── │ UPDATE (SDP)│ │ │ <───────── │ │ │ ``` This is also exemplified by examining the Via headers as rewritten by kamailio. Not working (>= 5.6.5, 5.7.x): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bKtjlwcpvfh03epe0thhtjhq3qg;Role=3;Hpt=8e58_16` * Oubound Via: `Via: SIP/2.0/UDP 185.73.43.241;branch=z9hG4bK66c4.3453dd9a219858819d528b9da671e39e.0` Working (5.6.4): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bK8lj1ahz6npz65khd8jkzl1ohh;Role=3;Hpt=8e68_16` * Oubound Via: `Via: SIP/2.0/UDP 172.30.154.1;branch=z9hG4bK4dce.4f5448efd64465fa5dbaf5eef0dc35b7.0` ### Possible Solutions Only solution I have found so far is to downgrade to kamailio 5.6.4  ### Additional Information ``` version: kamailio 5.7.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, 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 with gcc 10.2.1 ``` But I have also tested all 5.7.x versions, which are all affected, as well 5.6.5. * **Operating System**:  ``` Linux host 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3757 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3757(a)github.com>

3 8

git:master:8330158b: rtpengine: docs for write_sdp_pv_mode parameter
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8330158b88815f28326fc5293831c83cebc2e41c URL: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T11:06:53+02:00 rtpengine: docs for write_sdp_pv_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Patch: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6d79abfaeff..f898aa32979 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -478,6 +478,32 @@ route { </example> </section> + <section id="rtpengine.p.write_sdp_pv_mode"> + <title><varname>write_sdp_pv_mode</varname> (int)</title> + <para> + If this parameter is set to 1, the returned SDP is written to pv + and also set to message body. + </para> + <para> + Default value: 0 (write SDP only to pv). + </para> + <example> + <title>Set <varname>write_sdp_pv_mode</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv_mode", 1) +... +route { + ... + rtpengine_manage(); + xinfo("new sdp: $avp(sdp)\n"); +} +</programlisting> + </example> + </section> + + <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> <para>

1 0

git:master:664190b3: rtpengine: added param write_sdp_pv_mode
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 664190b31303b52728f957113d97bd77a7ab4f8d URL: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T10:55:09+02:00 rtpengine: added param write_sdp_pv_mode - if set to 1, write the returned sdp in pv and set the body - default 0, write only in pv (existing behaviour so far) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Patch: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8a2f9f82d89..c51b4742081 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -322,6 +322,7 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t *write_sdp_pvar = NULL; +static int write_sdp_pvar_mode = 0; static str read_sdp_pvar_str = {NULL, 0}; static pv_spec_t *read_sdp_pvar = NULL; @@ -504,6 +505,7 @@ static param_export_t params[] = { {"force_send_interface", PARAM_STRING, &force_send_ip_str}, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param}, {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str}, + {"write_sdp_pv_mode", PARAM_INT, &write_sdp_pvar_mode}, {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str}, {"hash_table_tout", INT_PARAM, &hash_table_tout}, {"hash_table_size", INT_PARAM, &hash_table_size}, @@ -4708,9 +4710,11 @@ static int rtpengine_offer_answer( goto error_free; } - pkg_free(newbody.s); - - } else { + if(write_sdp_pvar_mode == 0) { + pkg_free(newbody.s); + } + } + if(write_sdp_pvar == NULL || write_sdp_pvar_mode != 0) { if(cl_field.len) { anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); cl_repl.s = pkg_malloc(10);

1 0

[kamailio/kamailio] app_python module still needs Python 2 (Issue #3805)
by waarmond 05 Apr '24

05 Apr '24

I'm trying to build current git sources on ArchLinux. `modules/app_python/Makefile` still asks for python2: ``` which: no python2 in ($PATH) which: no python2.7 in ($PATH) File "<string>", line 1 import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? ``` Is this intended? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3805 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3805(a)github.com>

2 2

git:master:30f620ae: sdpops: use find_sdp_line_start() to find start of attribute line
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 30f620ae2254888c0d8d7edc375cb312e33de124 URL: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:23:29+02:00 sdpops: use find_sdp_line_start() to find start of attribute line --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Patch: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 30de5dfc543..f40062420a7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2059,6 +2059,9 @@ int bind_sdpops(struct sdpops_binds *sob) return 0; } +/** + * + */ int sdpops_attr_val(str *payload, str *attr, str *val) { char *sline; @@ -2066,16 +2069,9 @@ int sdpops_attr_val(str *payload, str *attr, str *val) val->s = NULL; val->len = 0; - sline = find_sdp_line(payload->s, payload->s + payload->len, attr->s[0]); + sline = find_sdp_line_start( + payload->s, payload->s + payload->len, attr->s[0], 0); while(sline != NULL) { - /* check start of line */ - if(sline > payload->s) { - if(eline[-1] != '\n' && eline[-1] != '\r') { - sline = find_next_sdp_line( - sline, payload->s + payload->len, attr->s[0], NULL); - continue; - } - } /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) {

1 0

git:master:368661cc: core: parser/sdp - function to find sdp line with start EoL check option
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 368661cc15251af4cbf295d1f5fad5a42d1b647b URL: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:10:11+02:00 core: parser/sdp - function to find sdp line with start EoL check option --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Patch: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index d5cb359b40f..a5dffd9c398 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -733,9 +733,10 @@ int extract_sess_version(str *oline, str *sess_version) /* * Auxiliary for some functions. + * - smode: if 1, pstart is pointing inside msg body * Returns pointer to first character of found line, or NULL if no such line. */ -char *find_sdp_line(char *pstart, char *plimit, char linechar) +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode) { static char linehead[3] = "x="; char *cp, *cp1; @@ -749,11 +750,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) if(cp1 == NULL) return NULL; /* - * As it is body, we assume it has previous line and we can - * lookup previous character. + * smode==1 means it is msg body, thus it has previous line and it can + * lookup previous character even when cp1==pstart. */ - if(cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; + if(cp1 > pstart || smode == 1) { + if(cp1[-1] == '\n' || cp1[-1] == '\r') { + return cp1; + } + } /* * Having such data, but not at line beginning. * Skip them and reiterate. ser_memmem() will find next @@ -765,6 +769,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) } } +/* + * Auxiliary for some functions - expect pstart to point inside SIP message body. + * Returns pointer to first character of found line, or NULL if no such line. + */ +char *find_sdp_line(char *pstart, char *plimit, char linechar) +{ + return find_sdp_line_start(pstart, plimit, linechar, 1); +} /* This function assumes pstart points to a line of requested type. */ char *find_next_sdp_line( diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index e8ce6f7e60a..20d3ebd882d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -65,6 +65,7 @@ int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); int extract_max_size(str *body, str *max_size); int extract_path(str *body, str *path); +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode); char *find_sdp_line(char *p, char *plimit, char linechar); char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr);

1 0

git:master:b03ec735: core: parser/sdp - rename parameter to suggest better its role
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: b03ec73589c12e566b11ce2c653401daa915c805 URL: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T07:54:12+02:00 core: parser/sdp - rename parameter to suggest better its role --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Patch: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index b15ddeaa4bd..d5cb359b40f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,14 +735,13 @@ int extract_sess_version(str *oline, str *sess_version) * Auxiliary for some functions. * Returns pointer to first character of found line, or NULL if no such line. */ - -char *find_sdp_line(char *p, char *plimit, char linechar) +char *find_sdp_line(char *pstart, char *plimit, char linechar) { static char linehead[3] = "x="; char *cp, *cp1; linehead[0] = linechar; /* Iterate through body */ - cp = p; + cp = pstart; for(;;) { if(cp >= plimit) return NULL; @@ -767,13 +766,14 @@ char *find_sdp_line(char *p, char *plimit, char linechar) } -/* This function assumes p points to a line of requested type. */ -char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr) +/* This function assumes pstart points to a line of requested type. */ +char *find_next_sdp_line( + char *pstart, char *plimit, char linechar, char *defptr) { char *t; - if(p >= plimit || plimit - p < 3) + if(pstart >= plimit || plimit - pstart < 3) return defptr; - t = find_sdp_line(p + 2, plimit, linechar); + t = find_sdp_line(pstart + 2, plimit, linechar); return t ? t : defptr; }

1 0

git:master:57dd65c2: xhttp_prom: use proper prefix for pkg stats
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 57dd65c2c6abd520c0db876aca6bd2238229e187 URL: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T16:22:39Z xhttp_prom: use proper prefix for pkg stats --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Patch: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 1ea7edb1c5e..786a2c3e40a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -221,8 +221,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, - "kamailio_pkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " + "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " "%d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) == -1) { @@ -230,8 +231,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_available{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) == -1) { @@ -239,8 +241,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_real_used{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) == -1) { @@ -248,8 +251,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_frags{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) == -1) { @@ -257,8 +261,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_size{pid=\"%u\", rank=\"%d\" " + "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts) == -1) {

1 0

git:master:c4b81393: sdpops: function to parse path for sdp content
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c4b81393fed9a333af9349850e70ee377f3f3491 URL: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: function to parse path for sdp content --- Added: src/modules/sdpops/sdpops_path.c Added: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Patch: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3…

1 0

git:master:359a442e: sdpops: reformat the codecs map
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 359a442e14a156b0bcf60dc5b2580cbc57924e34 URL: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: reformat the codecs map --- Modified: src/modules/sdpops/sdpops_data.c --- Diff: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Patch: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… --- diff --git a/src/modules/sdpops/sdpops_data.c b/src/modules/sdpops/sdpops_data.c index 25d7de178ed..c158511b60e 100644 --- a/src/modules/sdpops/sdpops_data.c +++ b/src/modules/sdpops/sdpops_data.c @@ -91,19 +91,29 @@ Registration Procedures: Standards Action Process or expert approval */ -typedef struct _codecsmap -{ +/* clang-format off */ +typedef struct _codecsmap { str name; str ids; } codecsmap_t; -codecsmap_t sdpops_codecsmap_table[] = {{{"PCMU", 4}, {"0", 1}}, - {{"GSM", 3}, {"3", 1}}, {{"G723", 4}, {"4", 1}}, - {{"DVI4", 4}, {"5,6,16,17", 9}}, {{"LPC", 3}, {"7", 1}}, - {{"PCMA", 4}, {"8", 1}}, {{"G722", 4}, {"9", 1}}, - {{"L16", 3}, {"10,11", 5}}, {{"QCELP", 5}, {"12", 2}}, - {{"CN", 2}, {"13", 5}}, {{"MPA", 3}, {"14", 2}}, - {{"G728", 4}, {"15", 2}}, {{"G729", 4}, {"18", 2}}, {{0, 0}, {0, 0}}}; +codecsmap_t sdpops_codecsmap_table[] = { + {{"PCMU", 4}, {"0", 1}}, + {{"GSM", 3}, {"3", 1}}, + {{"G723", 4}, {"4", 1}}, + {{"DVI4", 4}, {"5,6,16,17", 9}}, + {{"LPC", 3}, {"7", 1}}, + {{"PCMA", 4}, {"8", 1}}, + {{"G722", 4}, {"9", 1}}, + {{"L16", 3}, {"10,11", 5}}, + {{"QCELP", 5}, {"12", 2}}, + {{"CN", 2}, {"13", 5}}, + {{"MPA", 3}, {"14", 2}}, + {{"G728", 4}, {"15", 2}}, + {{"G729", 4}, {"18", 2}}, + {{0, 0}, {0, 0}} +}; +/* clang-format on */ /** * set the string with the IDs mapped to codec name

1 0

git:master:d0d4f589: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: d0d4f58920669f280d80c6cd66578a4b68db9e43 URL: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T16:16:11+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Patch: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4…

1 0

git:master:a55967c0: xhttp_prom: update documentation
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: a55967c0e8cee184f1cc8cc0c5df4635041b88d1 URL: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T10:10:15-04:00 xhttp_prom: update documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Patch: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index e1f2709dd21..83cede92633 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -178,6 +178,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "200_replies") # Do not display internal &kamailio; statistics. This is the default option. modparam("xhttp_prom", "xhttp_prom_stats", "") +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> + <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <para> + Enable or disable internal &kamailio; pkg memory statistics. + </para> + <para> + <emphasis>If not 0</emphasis>, pkg memory statistics will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no pkg memory statistics). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_pkg_stats</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable pkg stats +modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) ... </programlisting> </example>

1 0

[kamailio/kamailio] core: dprint - include time in stderr json log (PR #3795)
by Alexander Bakker 04 Apr '24

04 Apr '24

#### 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 This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. I know this comes a little out of the blue, so any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3795 -- Commit Summary -- * core: dprint - include time in stderr json log -- File Changes -- M src/core/dprint.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3795.patch https://github.com/kamailio/kamailio/pull/3795.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3795 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3795(a)github.com>

2 2

git:master:c3e8860f: core: dprint - include time in stderr json log
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c3e8860f00ca1d4618b8d2ce986b5d5c3eb9a9d3 URL: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:21:54+02:00 core: dprint - include time in stderr json log This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Patch: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 724d3445370..83d1e30f3ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -573,31 +573,31 @@ static int _ksr_slog_json_flags = 0; ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_FMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ +#define KSR_SLOG_STDERR_JSON_FMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ "%s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CFMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ +#define KSR_SLOG_STDERR_JSON_CFMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ "\"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_PFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME \ +#define KSR_SLOG_STDERR_JSON_PFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME \ ".function\": \"%s\"%.*s\"%s%s%.*s%s, \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CPFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ - ".callid\": \"%.*s\"%s%s%.*s%s," \ +#define KSR_SLOG_STDERR_JSON_CPFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ + ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" #ifdef HAVE_PTHREAD @@ -735,9 +735,9 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } else { if(unlikely(log_color)) dprint_color(kld->v_level); - fprintf(stderr, efmt, process_no, my_pid(), kld->v_lname, - kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, - LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, + fprintf(stderr, efmt, iso8601buf, _tp.tv_nsec, process_no, my_pid(), + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, pme, prefmsg, smb, s_out.len, s_out.s, sme, (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL) ? ""

1 0

git:master:3c16c13a: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 3c16c13acdf95924636c4d938abe13dcb3707b73 URL: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T13:01:21+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Patch: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

[kamailio/kamailio] xhttp_prom: export pkg mem statistics (PR #3793)
by Ovidiu Sas 04 Apr '24

04 Apr '24

#### 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 Enhance xhttp_prom module to export pkgmem stats. The new stats can be enabled via a new module parameter: `xhttp_prom_pkgmem_stats_enabled`. Default value for the new module parameter: 0 (no pkg mem stats are generated). Any value different then 0 will export the pkg mem statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3793 -- Commit Summary -- * kex: expose access to pkg mem stats * xhttp_prom: export pkg mem stats -- File Changes -- A src/modules/kex/api.c (54) A src/modules/kex/api.h (69) M src/modules/kex/kex_mod.c (2) M src/modules/kex/pkg_stats.c (24) M src/modules/kex/pkg_stats.h (17) M src/modules/xhttp_prom/prom.c (66) M src/modules/xhttp_prom/xhttp_prom.c (44) M src/modules/xhttp_prom/xhttp_prom.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3793.patch https://github.com/kamailio/kamailio/pull/3793.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3793 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3793(a)github.com>

3 10

git:master:24d77c23: xhttp_prom: export pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 24d77c23e1c0a528289d611c16916caeb9992008 URL: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 xhttp_prom: export pkg stats --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Patch: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca…

1 0

git:master:b0d16caf: kex: expose access to pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: b0d16cafcfee44a8564e251c7a725324b25a1ff4 URL: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 kex: expose access to pkg stats --- Added: src/modules/kex/api.c Added: src/modules/kex/api.h Modified: src/modules/kex/kex_mod.c Modified: src/modules/kex/pkg_stats.c Modified: src/modules/kex/pkg_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Patch: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532…

1 0

[kamailio/kamailio] ndb_redis: docs - refine docs regarding client certificates (PR #3804)
by Jannik 04 Apr '24

04 Apr '24

#### 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 created ssl context in the `db_redis` and `ndb_redis` modules does not use client certificates [1], [2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. Without setting this configuration in Redis, no TLS connection to the Redis server can be established, since Redis will not accept unsigned/not-validated client certificates. There is also a small typo in "ac_path" in both docs which was fixed to "ca_path", added with some more specification to _which_ certificate is validated. [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3804 -- Commit Summary -- * db_redis: docs - refine docs regarding client certificates [skip ci] * ndb_redis: docs - refine docs regarding client certificates [skip ci] -- File Changes -- M src/modules/db_redis/doc/db_redis_admin.xml (10) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3804.patch https://github.com/kamailio/kamailio/pull/3804.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3804 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3804(a)github.com>

2 2

git:master:6faa1806: ndb_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 6faa180661e799187eff3a498f8b13e96719fa92 URL: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Patch: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 74d35c75cc9..024b01315ac 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -75,6 +75,12 @@ many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. </para> + <para> + If tls is enabled, the module will validate the REDIS server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the REDIS server must therefore be turned off. + </para> <para> <emphasis> Default value is NULL. @@ -330,9 +336,9 @@ modparam("ndb_redis", "debug", 1) </example> </section> <section id="ndb_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:40a50243: db_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 40a50243f0bae782b7acd97cf0a9b1138185068b URL: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Patch: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index a7e7c3bb3a9..15ed0ca61e2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -224,6 +224,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. </para> + <para> + If TLS is enabled, the module will validate the Redis server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the Redis server must therefore be turned off. + </para> <para> Default value: 0. </para> @@ -256,9 +262,9 @@ modparam("db_redis", "db_pass", "r3d1sPass") </section> <section id="db_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:eb8027f9: sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS)
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: eb8027f9292d46d70583168b76589fa55ccccb07 URL: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:16:24+02:00 sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS) - return string values for b=AS:.., b=RR:.., b=RS:.. --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Patch: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa…

1 0

git:master:8047c958: sdpops: aliased $sdp(raw) to $sdp(body)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 8047c958b42ea5af2e8f9ede0152f892ac0eea3a URL: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T20:16:21+02:00 sdpops: aliased $sdp(raw) to $sdp(body) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Patch: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b443d1f84ac..96d0bd202b8 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2259,6 +2259,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 3: + if(strncmp(in->s, "raw", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "body", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0;

1 0

git:master:3e73dbc6: sdpops: added $sdp(m0:raw) - get all lines of the first m= stream
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3e73dbc6b69c8e26f276690bb6aa1e6db380510e URL: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T19:19:27+02:00 sdpops: added $sdp(m0:raw) - get all lines of the first m= stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Patch: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b7ee2482616..b443d1f84ac 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2201,6 +2201,21 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 7: + /* m0:raw - all (raw) lines for m0 stream */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->raw_stream.s != NULL + && sdp->sessions->streams->raw_stream.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->raw_stream); + } + return pv_get_null(msg, param, res); + break; default: return pv_get_null(msg, param, res); @@ -2256,6 +2271,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) else goto error; break; + case 6: + if(strncmp(in->s, "m0:raw", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 7; + else + goto error; + break; case 11: if(strncmp(in->s, "m0:rtp:port", 11) == 0) sp->pvp.pvn.u.isname.name.n = 4;

1 0

git:master:ed60be16: pv: transformation to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ed60be162918fc1791ee6425f664eb2f76b9475e URL: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:52:58+02:00 pv: transformation to escape/unescape cr lf - {s.escape.crlf}, {s.unescape.crlf} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Patch: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0cc6f8f2e2c..a3ce0f0ace3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -566,6 +566,32 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE / 2 - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(escape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + case TR_S_UNESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(unescape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_ESCAPEUSER: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2768,6 +2794,12 @@ char *tr_parse_string(str *in, trans_t *t) && strncasecmp(name.s, "unescape.common", 15) == 0) { t->subtype = TR_S_UNESCAPECOMMON; goto done; + } else if(name.len == 11 && strncasecmp(name.s, "escape.crlf", 11) == 0) { + t->subtype = TR_S_ESCAPECRLF; + goto done; + } else if(name.len == 13 && strncasecmp(name.s, "unescape.crlf", 13) == 0) { + t->subtype = TR_S_UNESCAPECRLF; + goto done; } else if(name.len == 11 && strncasecmp(name.s, "escape.user", 11) == 0) { t->subtype = TR_S_ESCAPEUSER; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 827f74feb49..662d5a2b578 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -60,6 +60,8 @@ enum _tr_s_subtype TR_S_DECODEBASE64, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, + TR_S_ESCAPECRLF, + TR_S_UNESCAPECRLF, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM,

1 0

git:master:6992c9ee: core: helper functions to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 6992c9eedeabd931fc255e5c1e992b0cfb01dbca URL: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:48:29+02:00 core: helper functions to escape/unescape cr lf --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Patch: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 73e713cb451..475150dc0f7 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -109,6 +109,68 @@ int unescape_common(char *dst, char *src, int src_len) return j; } +/*! \brief + * add backslashes for CR LF + */ +int escape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + for(i = 0; i < sin->len; i++) { + switch(sin->s[i]) { + case '\n': + sout->s[j++] = '\\'; + sout->s[j++] = 'n'; + break; + case '\r': + sout->s[j++] = '\\'; + sout->s[j++] = 'r'; + break; + default: + sout->s[j++] = sin->s[i]; + } + } + sout->len = j; + return 0; +} + +/*! \brief + * remove backslashes for CR LF + */ +int unescape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + i = 0; + while(i < sin->len) { + if(sin->s[i] == '\\' && i + 1 < sin->len) { + switch(sin->s[i + 1]) { + case 'n': + sout->s[j++] = '\n'; + i++; + break; + case 'r': + sout->s[j++] = '\r'; + i++; + break; + default: + sout->s[j++] = sin->s[i]; + } + } else { + sout->s[j++] = sin->s[i]; + } + i++; + } + sout->len = j; + return 0; +} + /*! \brief Unscape all printable ASCII characters */ int unescape_user(str *sin, str *sout) { diff --git a/src/core/strutils.h b/src/core/strutils.h index b32e610512c..5781943dacb 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -56,6 +56,8 @@ int escape_common(char *dst, char *src, int src_len); /* remove backslashes to special characters */ int unescape_common(char *dst, char *src, int src_len); +int escape_crlf(str *sin, str *sout); +int unescape_crlf(str *sin, str *sout); int escape_user(str *sin, str *sout); int unescape_user(str *sin, str *sout); int escape_param(str *sin, str *sout);

1 0

git:master:ec7f3a21: sdops: typo fixed for $sdp(m0:rtcp:port)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ec7f3a2173c1de220afd5b4776d92c98bb901630 URL: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T17:02:14+02:00 sdops: typo fixed for $sdp(m0:rtcp:port) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Patch: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 644ded5b064..b7ee2482616 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2265,7 +2265,7 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; - else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + else if(strncmp(in->s, "m0:rtcp:port", 12) == 0) sp->pvp.pvn.u.isname.name.n = 5; else goto error;

1 0

Kamailio v5.8.1 Released
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, Kamailio SIP Server v5.8.1 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.1. For more details about version 5.8.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/04/kamailio-v5-8-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, 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:5.8:384843ce: ChangeLog: content updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 384843ceb6705996c0c6da6359868bd6e370a0b7 URL: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:26:52+02:00 ChangeLog: content updated for v5.8.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Patch: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd…

1 0

git:5.8:e8aa9871: Makefile.defs: version set to 5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: e8aa98718d91d0e5af7d757176a180e0f2940417 URL: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:23:42+02:00 Makefile.defs: version set to 5.8.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Patch: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f5e8b0da653..0f960b4478e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.8:69f667fe: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 69f667fe9b95d09a642cb7edd7f16ce09bbac3f1 URL: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:37+02:00 core: msg translator - duplicate reply via xavp params and handle errors (cherry picked from commit 5f83d4f9c447f5a7e3de8336dc0e076b10e43833) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Patch: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( 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"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:5.8:1caec71a: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 1caec71aeddb7f65afb93bf05cb9e0aae2a2c0cd URL: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:26+02:00 core: xavp - added missing closing parenthesis in log messages (cherry picked from commit 3b09fd343575c56d9658a61efebd4851662de338) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Patch: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) 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 long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:master:5f83d4f9: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 5f83d4f9c447f5a7e3de8336dc0e076b10e43833 URL: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:18:47+02:00 core: msg translator - duplicate reply via xavp params and handle errors --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Patch: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( 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"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:master:3b09fd34: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3b09fd343575c56d9658a61efebd4851662de338 URL: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:16:18+02:00 core: xavp - added missing closing parenthesis in log messages --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Patch: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) 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 long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:5.8:4708758f: pkg: deb specs updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 4708758f1c428cc94d1abdf9bb706c7c509efebe URL: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:22:44+02:00 pkg: deb specs updated for v5.8.1 --- 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/4708758f1c428cc94d1abdf9bb706c7… Patch: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7…

1 0

git:5.8:3b00630c: pkg/kamailio: version set 5.8.1 for rpms and alpine
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 3b00630c8a20cc0f2b2f458742d885ea7e28e05f URL: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:20:49+02:00 pkg/kamailio: version set 5.8.1 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Patch: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index eaa70ccd5ff..4b56df12b49 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.8.0 +pkgver=5.8.1 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 d8811a2d1f9..ee339c02d99 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.0 +%define ver 5.8.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:e7b207e9: pv: $K(IP4) and $K(IP6) - support SDP style for address family
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: e7b207e933d0f4284009059753d5b6a80ebfa9f7 URL: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:11:07+02:00 pv: $K(IP4) and $K(IP6) - support SDP style for address family --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… Patch: https://github.com/kamailio/kamailio/commit/e7b207e933d0f4284009059753d5b6a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 129247f2688..1f998bfc1d3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3894,6 +3894,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "WSS", 3) == 0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "IP4", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "IP6", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 1; else goto error; break;

1 0

git:master:42c76096: sdpops: added $sdp(c:af) - address family of first media connection
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 42c7609631235aae4a2d9d98c108b0af7cce1357 URL: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:07:15+02:00 sdpops: added $sdp(c:af) - address family of first media connection - can be compared with $K(IPv4) or $K(IPv6) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… Patch: https://github.com/kamailio/kamailio/commit/42c7609631235aae4a2d9d98c108b0a… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 507e7dbe81b..644ded5b064 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2174,6 +2174,33 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &s); } return pv_get_null(msg, param, res); + case 6: + /* c:af - connection address family */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_sintval(msg, param, res, sdp->sessions->pf); + } else { + return pv_get_null(msg, param, res); + } + } else { + if(sdp->sessions->streams->ip_addr.s != NULL + && sdp->sessions->streams->ip_addr.len > 0) { + return pv_get_sintval( + msg, param, res, sdp->sessions->streams->pf); + } else { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_sintval( + msg, param, res, sdp->sessions->pf); + } else { + return pv_get_null(msg, param, res); + } + } + } default: return pv_get_null(msg, param, res); @@ -2222,6 +2249,8 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "c:ip", 4) == 0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "c:af", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "o:ip", 4) == 0) sp->pvp.pvn.u.isname.name.n = 3; else

1 0

Releasing v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, with many countries having public holidays around Catholic Easter, I am considering to release Kamailio v5.8.1 (out of branch 5.8) on Wednesday, April 3, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, 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 1

git:master:cbe13bed: sdpops: added $sdp(m0:rtcp:port) - rtcp port of first media stream
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: cbe13bedc13278235ec66cde5938cd92e45e454b URL: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T21:22:39+02:00 sdpops: added $sdp(m0:rtcp:port) - rtcp port of first media stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… Patch: https://github.com/kamailio/kamailio/commit/cbe13bedc13278235ec66cde5938cd9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 3675d48718e..507e7dbe81b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2067,6 +2067,9 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) sdp_info_t *sdp = NULL; str sess_version = STR_NULL; long sess_version_num = 0; + unsigned int uport = 0; + static char uport_buf[INT2STR_MAX_LEN]; + str s = STR_NULL; if(msg == NULL || param == NULL) return -1; @@ -2150,6 +2153,27 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) msg, param, res, &sdp->sessions->streams->port); } return pv_get_null(msg, param, res); + case 5: + /* m0:rtcp:port */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->rtcp_port.s != NULL + && sdp->sessions->streams->rtcp_port.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->rtcp_port); + } + if(sdp->sessions->streams->port.s != NULL + && sdp->sessions->streams->port.len > 0) { + str2int(&sdp->sessions->streams->port, &uport); + uport++; + s.s = int2strbuf(uport, uport_buf, INT2STR_MAX_LEN, &s.len); + return pv_get_strval(msg, param, res, &s); + } + return pv_get_null(msg, param, res); default: return pv_get_null(msg, param, res); @@ -2212,6 +2236,8 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + sp->pvp.pvn.u.isname.name.n = 5; else goto error; break;

1 0

git:master:238219f1: sdpops: implemented $sdp(o:ip) - origin ip
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: 238219f126e3a155d109fab415d58f8903ee618d URL: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T17:06:58+02:00 sdpops: implemented $sdp(o:ip) - origin ip --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… Patch: https://github.com/kamailio/kamailio/commit/238219f126e3a155d109fab415d58f8… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 63243c3c3f6..3675d48718e 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2098,7 +2098,7 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } return pv_get_null(msg, param, res); case 2: - /* connection ip */ + /* c:ip - connection ip */ if(sdp->sessions == NULL) { return pv_get_null(msg, param, res); } @@ -2125,6 +2125,17 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 3: + /* o:ip - origin ip */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->o_ip_addr.s != NULL + && sdp->sessions->o_ip_addr.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->o_ip_addr); + } + return pv_get_null(msg, param, res); case 4: /* m0:rtp:port */ if(sdp->sessions == NULL) {

1 0

git:master:f2f3c57c: spdops: added $sdp(m0:rtp:port) - port of first media stream
by Daniel-Constantin Mierla 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: f2f3c57c2a9bc4bcdc829aaab743427cb349b7ab URL: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-02T17:06:58+02:00 spdops: added $sdp(m0:rtp:port) - port of first media stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… Patch: https://github.com/kamailio/kamailio/commit/f2f3c57c2a9bc4bcdc829aaab743427… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 980c275068b..63243c3c3f6 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2125,6 +2125,20 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 4: + /* m0:rtp:port */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->port.s != NULL + && sdp->sessions->streams->port.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->port); + } + return pv_get_null(msg, param, res); default: return pv_get_null(msg, param, res); @@ -2178,6 +2192,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) else goto error; break; + case 11: + if(strncmp(in->s, "m0:rtp:port", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 4; + else + goto error; + break; case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1;

1 0

[kamailio/kamailio] branch_failure route in case 503 and dns failover (PR #3138)
by vlitvinov 02 Apr '24

02 Apr '24

#### Pre-Submission Checklist    - [ ] 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  When we use DNS failover in case of timeout kamailio executes the branch_failure route. In the case of the 503 - on_reply route. This commit is to equate behavior in both cases. So if there are more candidates we will always execute branch_failure route and on_reply route only if this is the last candidate. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3138 -- Commit Summary -- * branch_failure route in case 503 and dns failover -- File Changes -- M src/modules/tm/t_reply.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3138.patch https://github.com/kamailio/kamailio/pull/3138.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3138 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3138(a)github.com>

4 16

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 43 to 44 (PR #3801)
by dependabot[bot] 02 Apr '24

02 Apr '24

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v44</h2> <h1>Changes in v44.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <h3>Overview</h3> <p>We've made a significant update to how pull requests (PRs) from forked repositories are processed. This improvement not only streamlines the handling of such PRs but also fixes a previously identified issue.</p> <h3>Before the Change</h3> <p>Previously, when you created a pull request from a forked repository, any files changed in the target branch after the PR creation would erroneously appear as part of the PR's changed files. This made it difficult to distinguish between the actual changes introduced by the PR and subsequent changes made directly to the target branch.</p> <h3>What Has Changed</h3> <p>With this update, a pull request from a fork will now <strong>only</strong> include the files that were explicitly changed in the fork. This ensures that the list of changed files in a PR accurately reflects the contributions from the fork, without being muddled by unrelated changes to the target branch.</p> <hr /> <h2>What's Changed</h2> <ul> <li>Upgraded to v43.0.1 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2004&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2005&q… <li>chore(deps): update typescript-eslint monorepo to v7.4.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2006&q… <li>fix: bug with prs from forks returning incorrect set of changed files by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2007&q… <li>fix: check for setting remote urls for forks by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2009&q… <li>fix: update to add the fork remote by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2010&q… <li>fix: update previous sha for forks by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2011&q… <li>fix: ensure the fork remote doesn't exists before creating it by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2012&q… <li>chore: update description of other_deleted_files output by <a href="https://github.com/tonyejack1"><code>@tonyejack1&… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2008&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2013&q… <li>remove: unused code by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2014&q… <li>chore: update description of outputs removing asterisks by <a href="https://github.com/tonyejack1"><code>@tonyejack1&… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2015&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2016&q… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/tonyejack1"><code>@tonyejack1&… made their first contribution in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2008&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v43.0.1...v4… <hr /> <h2>v44.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <h3>Overview</h3> <p>We've made a significant update to how pull requests (PRs) from forked repositories are processed. This improvement not only streamlines the handling of such PRs but also fixes a previously identified issue.</p> <h3>Before the Change</h3> <p>Previously, when you created a pull request from a forked repository, any files changed in the target branch after the PR creation would erroneously appear as part of the PR's changed files. This made it difficult to distinguish between the actual changes introduced by the PR and subsequent changes made directly to the target branch.</p> <h3>What Has Changed</h3> <p>With this update, a pull request from a fork will now <strong>only</strong> include the files that were explicitly changed in the fork. This ensures that the list of changed files in a PR accurately reflects the contributions from the fork, without being muddled by unrelated changes to the target branch.</p>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v43.0.1...v4… - (2024-03-27)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Ensure the fork remote doesn't exists before creating it (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2012…) (<a href="https://github.com/tj-actions/changed-files/commit/4bbd49b9986b1…) - (Tonye Jack)</li> <li>Update previos sha for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2011…) (<a href="https://github.com/tj-actions/changed-files/commit/f0e7702ccc359…) - (Tonye Jack)</li> <li>Update to add the fork remote (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2010…) (<a href="https://github.com/tj-actions/changed-files/commit/6354e6c5426d1…) - (Tonye Jack)</li> <li>Check for setting remote urls for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2009…) (<a href="https://github.com/tj-actions/changed-files/commit/117616472fb77…) - (Tonye Jack)</li> <li>Bug with prs from forks returning incorrect set of changed files (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2007…) (<a href="https://github.com/tj-actions/changed-files/commit/4ff79362e5015…) - (Tonye Jack)</li> </ul> <h2>➖ Remove</h2> <ul> <li>Unused code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2014…) (<a href="https://github.com/tj-actions/changed-files/commit/90941b398f6d8…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2016… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/2d756ea4c53f7…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/2d21bbb405b3e…) - (Tonye Jack)</li> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2013… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/2ca8dc42f60aa…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/4621617d4b568…) - (tonyejack1)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/c6557ed000b9d…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/0713a11242c79…) - (Tonye Jack)</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li>Update description of outputs removing asterisks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2015…) (<a href="https://github.com/tj-actions/changed-files/commit/ce497c39e9043…) - (tonyejack1)</li> <li>Update description of other_deleted_files output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2008…) (<a href="https://github.com/tj-actions/changed-files/commit/ee096d679e877…) - (tonyejack1)</li> <li><strong>deps:</strong> Update typescript-eslint monorepo to v7.4.0 (<a href="https://github.com/tj-actions/changed-files/commit/064742427d810…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/efe5e6c7a415f…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v43.0.1 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2004… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/01e9662a12a71…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v43.0.0...v4… - (2024-03-20)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Remove warning with detecting the local git repository when using Github's REST API (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2002…) (<a href="https://github.com/tj-actions/changed-files/commit/077b23f6a68d9…) - (Tonye Jack)</li> </ul> <h2>📦 Bumps</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/2d756ea4c53f7… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2016… <li><a href="https://github.com/tj-actions/changed-files/commit/ce497c39e9043… chore: update description of outputs removing asterisks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2015… <li><a href="https://github.com/tj-actions/changed-files/commit/2d21bbb405b3e… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/90941b398f6d8… remove: unused code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2014… <li><a href="https://github.com/tj-actions/changed-files/commit/2ca8dc42f60aa… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2013… <li><a href="https://github.com/tj-actions/changed-files/commit/ee096d679e877… chore: update description of other_deleted_files output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2008… <li><a href="https://github.com/tj-actions/changed-files/commit/4621617d4b568… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/4bbd49b9986b1… fix: ensure the fork remote doesn't exists before creating it (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2012… <li><a href="https://github.com/tj-actions/changed-files/commit/c6557ed000b9d… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/f0e7702ccc359… fix: update previos sha for forks (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2011… <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v43...v44&qu… 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/3801 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 43 to 44 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3801.patch https://github.com/kamailio/kamailio/pull/3801.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3801 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3801(a)github.com>

2 1

git:master:87e60ca5: github: [skip ci]: bump tj-actions/changed-files from 43 to 44
by Victor Seva 02 Apr '24

02 Apr '24

Module: kamailio Branch: master Commit: 87e60ca580f327d1d34f6881cda1048e5658a94b URL: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-02T03:30:26+02:00 github: [skip ci]: bump tj-actions/changed-files from 43 to 44 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v43...v44) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… Patch: https://github.com/kamailio/kamailio/commit/87e60ca580f327d1d34f6881cda1048… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index a237e2a0338..e70f646891c 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] Consider adding socket options SO_BINDTODEVICE when the interface name is given for listen in the config file (Issue #3716)
by Harish S 01 Apr '24

01 Apr '24

### Description Consider adding socket options SO_BINDTODEVICE when the interface name is given for listening in the config file. This will be useful in listening to linux VRF interfaces, especially when there are two different VRFs and it is required to proxy SIP messages between the VRFs -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3716 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3716(a)github.com>

3 3

git:5.8:4e4e935c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 4e4e935c45ccf32dab9bf5af693a0f52f54684ae URL: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-01T08:31:34+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… Patch: https://github.com/kamailio/kamailio/commit/4e4e935c45ccf32dab9bf5af693a0f5… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git:5.8:e394a051: blst: reformat exported structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: e394a05152b29d4009c9cb963bced72526c7651b URL: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:08:46+02:00 blst: reformat exported structures (cherry picked from commit e39557c96d2f419184c826d779f1a3309acc4269) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… Patch: https://github.com/kamailio/kamailio/commit/e394a05152b29d4009c9cb963bced72… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 6a2c1d625b6..148a9a9d9d0 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -49,37 +49,44 @@ static int blst_rpl_set_ignore_f(struct sip_msg *, char *, char *); static int blst_rpl_clear_ignore_f(struct sip_msg *, char *, char *); -static cmd_export_t cmds[] = {{"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, - {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, + {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, + {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, ANY_ROUTE}, - {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, - {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, + {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, + {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /* no params */ struct module_exports exports = { - "blst", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response function */ - 0, /* module initialization function */ - 0, /* per-child init function */ - 0 /* destroy function */ + "blst", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* RPC methods */ + 0, /* pseudo-variables exports */ + 0, /* response function */ + 0, /* module initialization function */ + 0, /* per-child init function */ + 0 /* destroy function */ }; +/* clang-format on */ /**

1 0

git:5.8:c0c8ee05: smsops: short reference section about variables
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: c0c8ee05ab25256b9154d2056ee04b07f3f2290a URL: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:08:38+02:00 smsops: short reference section about variables (cherry picked from commit 9a94930ae1168d5df79e3dc1414841cdf23a2eba) --- Modified: src/modules/smsops/doc/smsops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… Patch: https://github.com/kamailio/kamailio/commit/c0c8ee05ab25256b9154d2056ee04b0… --- diff --git a/src/modules/smsops/doc/smsops_admin.xml b/src/modules/smsops/doc/smsops_admin.xml index fa19ebfc79c..da95e37c012 100644 --- a/src/modules/smsops/doc/smsops_admin.xml +++ b/src/modules/smsops/doc/smsops_admin.xml @@ -95,5 +95,19 @@ smsdump(); </section> </section> + <section> + <title>Variables</title> + <para>Several variables are exported by the module to access the + attributes of the SMS.</para> + <itemizedlist> + <listitem> + <para><emphasis>$smsack</emphasis></para> + <para><emphasis>$smsbody</emphasis></para> + <para><emphasis>$rpdata(key)</emphasis></para> + <para><emphasis>$tpdu(key)</emphasis></para> + </listitem> + </itemizedlist> + </section> + </chapter>

1 0

git:5.8:b21a7aaa: smsops: reformat module exports structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: b21a7aaa467f2b76a52308557657c65274e34087 URL: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:55+02:00 smsops: reformat module exports structures (cherry picked from commit 9848d43cb367d6901a0b8c727759feb8a8fad930) --- Modified: src/modules/smsops/smsops.c --- Diff: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Patch: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… --- diff --git a/src/modules/smsops/smsops.c b/src/modules/smsops/smsops.c index 3e2cb88bc58..d8354af2319 100644 --- a/src/modules/smsops/smsops.c +++ b/src/modules/smsops/smsops.c @@ -30,31 +30,36 @@ MODULE_VERSION -static pv_export_t mod_pvs[] = {{{"smsack", sizeof("smsack") - 1}, PVT_OTHER, - pv_sms_ack, 0, 0, 0, 0, 0}, - {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, - pv_parse_rpdata_name, 0, 0, 0}, - {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, +/* clang-format off */ +static pv_export_t mod_pvs[] = { + {{"smsack", sizeof("smsack") - 1}, PVT_OTHER, pv_sms_ack, 0, 0, 0, 0, 0}, + {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, + pv_parse_rpdata_name, 0, 0, 0}, + {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, pv_parse_tpdu_name, 0, 0, 0}, - {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, - 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static cmd_export_t cmds[] = { - {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, - {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, + {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "smsops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - 0, /* exported parameters */ - 0, /* exported rpc functions */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function*/ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "smsops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function*/ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */

1 0

git:5.8:3f3c1940: db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 3f3c1940788a4713705169f8d96ae9a13ee2bad1 URL: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:44+02:00 db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT - follow up of previous commit (cherry picked from commit 14dc277e29a170b9ac51e7dda07fa25cbd9be048) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… Patch: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 49f7f7e1f7e..4c756db66ff 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -48,10 +48,10 @@ extern char *db_mysql_opt_ssl_ca; #define KSR_MYSQL_OPT_RECONNECT #else #if MYSQL_VERSION_ID < 80034 -#endif #define KSR_MYSQL_OPT_RECONNECT #endif #endif +#endif /*! \brief * Create a new connection structure,

1 0

git:5.8:557d7e83: db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 557d7e83c01c930df608b9d96791553d8f2bf724 URL: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:34+02:00 db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34 - https://dev.mysql.com/doc/c-api/8.0/en/c-api-auto-reconnect.html - MariaDB seems to still have it (cherry picked from commit da3d6e9a74b63fdb7b1c4063d6be017f1ce42bea) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553… Patch: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553…

1 0

git:5.8:c9edb30f: keepalive: reformat module exports structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: c9edb30ffa0c9544a10d0e72aabe84a1b3b2a103 URL: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:25+02:00 keepalive: reformat module exports structures (cherry picked from commit dd221a6e5162838b979fd38ffdfb750663aef869) --- Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… Patch: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… --- diff --git a/src/modules/keepalive/keepalive_mod.c b/src/modules/keepalive/keepalive_mod.c index 6b49603c303..4757b4346d5 100644 --- a/src/modules/keepalive/keepalive_mod.c +++ b/src/modules/keepalive/keepalive_mod.c @@ -70,39 +70,45 @@ str ka_ping_from = str_init("sip:keepalive@kamailio.org"); int ka_counter_del = 5; -static cmd_export_t cmds[] = {{"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, - fixup_spve_null, 0, ANY_ROUTE}, - // internal API - {"ka_add_destination", (cmd_function)w_add_destination, 2, - fixup_add_destination, 0, - REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"ka_del_destination", (cmd_function)w_del_destination, 2, - fixup_add_destination, 0, ANY_ROUTE}, - {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, + fixup_spve_null, 0, ANY_ROUTE}, + // internal API + {"ka_add_destination", (cmd_function)w_add_destination, 2, + fixup_add_destination, 0, REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, + {"ka_del_destination", (cmd_function)w_del_destination, 2, + fixup_add_destination, 0, ANY_ROUTE}, + {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"ping_interval", PARAM_INT, &ka_ping_interval}, - {"destination", PARAM_STRING | USE_FUNC_PARAM, - (void *)ka_mod_add_destination}, - {"ping_from", PARAM_STR, &ka_ping_from}, - {"delete_counter", PARAM_INT, &ka_counter_del}, {0, 0, 0}}; + {"ping_interval", PARAM_INT, &ka_ping_interval}, + {"destination", PARAM_STRING | USE_FUNC_PARAM, + (void *)ka_mod_add_destination}, + {"ping_from", PARAM_STR, &ka_ping_from}, + {"delete_counter", PARAM_INT, &ka_counter_del}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "keepalive", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "keepalive", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:5.8:3f44cabc: corex: fix conditions for dns_cache modparam srv attributes
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 3f44cabcfc0abc83ae1971ac74fbb0bd36829ce4 URL: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:14+02:00 corex: fix conditions for dns_cache modparam srv attributes (cherry picked from commit 8114b2016d032484edafe4edd04fb02d52cfd058) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… Patch: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ed37b22c757..4152fbf5df4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -454,7 +454,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 8 && strncasecmp(pit->name.s, "priority", 8) == 0) { - if(dns_flags == 0) { + if(dns_priority == 0) { if(str2sint(&pit->body, &dns_priority) < 0) { LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); @@ -463,7 +463,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - if(dns_flags == 0) { + if(dns_weight == 0) { if(str2sint(&pit->body, &dns_weight) < 0) { LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); @@ -472,7 +472,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 4 && strncasecmp(pit->name.s, "port", 4) == 0) { - if(dns_flags == 0) { + if(dns_port == 0) { if(str2sint(&pit->body, &dns_port) < 0) { LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); return -1;

1 0

git:5.8:dbf9208f: core: resolve/create_srv_pref_list() - insert at correct position in list
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: dbf9208f3a402844c9981fb7ed09493a1338dfdd URL: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:06:56+02:00 core: resolve/create_srv_pref_list() - insert at correct position in list (cherry picked from commit f35cf8904119dcf582ea2451648de5fef095466b) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… Patch: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index b6ee8592697..6d581f4915f 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1526,8 +1526,8 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) if(naptr_proto_supported(i) == 0) { continue; } else { - list[i - 1].proto_pref = tmp.proto_pref; - list[i - 1].proto = i; + list[list_len].proto_pref = tmp.proto_pref; + list[list_len].proto = i; list_len++; } };

1 0

git:5.8:0e00ae1d: core: socket info - parse advertise ip part to get address family
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: 0e00ae1db0242fc01e6f8c332e3920fd9465b3f9 URL: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:06:21+02:00 core: socket info - parse advertise ip part to get address family (cherry picked from commit 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… Patch: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

1 0

git:master:baa17755: crupto: replace local fixup functions with core helpers
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: master Commit: baa177556514cd7cdb794740a1bfd6e47ea814d1 URL: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T07:56:26+02:00 crupto: replace local fixup functions with core helpers --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Patch: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index b3fba9c005a..f3e644000f9 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -58,10 +58,8 @@ static void mod_destroy(void); static int w_crypto_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_crypto_aes_encrypt(void **param, int param_no); static int w_crypto_aes_decrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_crypto_aes_decrypt(void **param, int param_no); static int w_crypto_nio_in(sip_msg_t *msg, char *p1, char *p2); static int w_crypto_nio_out(sip_msg_t *msg, char *p1, char *p2); @@ -86,9 +84,9 @@ str _crypto_netio_key = STR_NULL; static cmd_export_t cmds[] = { {"crypto_aes_encrypt", (cmd_function)w_crypto_aes_encrypt, 3, - fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, - fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, @@ -345,28 +343,6 @@ static int w_crypto_aes_encrypt( return ki_crypto_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_encrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** * */ @@ -590,29 +566,6 @@ static int w_crypto_aes_decrypt( return ki_crypto_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_decrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - - /** * testing function */

1 0

git:5.8:c48fbea9: gcrypt: docs - module name used for section ids
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

Module: kamailio Branch: 5.8 Commit: c48fbea981c7b0bd281cd1fc2abedcda41d92c13 URL: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:05:20+02:00 gcrypt: docs - module name used for section ids (cherry picked from commit 68c69966c38b56775a3966d07c33ff94c2a8ba95) --- Modified: src/modules/gcrypt/doc/gcrypt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Patch: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… --- diff --git a/src/modules/gcrypt/doc/gcrypt_admin.xml b/src/modules/gcrypt/doc/gcrypt_admin.xml index 533ec5c80f9..3fc03d3eabc 100644 --- a/src/modules/gcrypt/doc/gcrypt_admin.xml +++ b/src/modules/gcrypt/doc/gcrypt_admin.xml @@ -127,7 +127,7 @@ modparam("gcrypt", "register_callid", 1) <section> <title>Functions</title> - <section id="async.f.gcrypt_aes_encrypt"> + <section id="gcrypt.f.gcrypt_aes_encrypt"> <title> <function moreinfo="none">gcrypt_aes_encrypt(text, key, res)</function> </title> @@ -150,7 +150,7 @@ gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); </example> </section> - <section id="async.f.gcrypt_aes_decrypt"> + <section id="gcrypt.f.gcrypt_aes_decrypt"> <title> <function moreinfo="none">gcrypt_aes_decrypt(text, key, res)</function> </title>

1 0

git:master:022da99c: gcrypt: replace local fixups with core helpers
by Daniel-Constantin Mierla 30 Mar '24

30 Mar '24

Module: kamailio Branch: master Commit: 022da99ca22efbf226d89234edb3f9883bd89bb2 URL: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-30T18:24:35+01:00 gcrypt: replace local fixups with core helpers --- Modified: src/modules/gcrypt/gcrypt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Patch: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… --- diff --git a/src/modules/gcrypt/gcrypt_mod.c b/src/modules/gcrypt/gcrypt_mod.c index 69be4432535..c75e6b905b4 100644 --- a/src/modules/gcrypt/gcrypt_mod.c +++ b/src/modules/gcrypt/gcrypt_mod.c @@ -45,10 +45,8 @@ static void mod_destroy(void); static int w_gcrypt_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_encrypt(void **param, int param_no); static int w_gcrypt_aes_decrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_decrypt(void **param, int param_no); /* init vector value */ static str _gcrypt_init_vector = str_init("SIP/2.0 is RFC3261"); @@ -59,9 +57,9 @@ static int _gcrypt_aes_mode = GCRY_CIPHER_MODE_ECB; /* clang-format off */ static cmd_export_t cmds[] = { {"gcrypt_aes_encrypt", (cmd_function)w_gcrypt_aes_encrypt, 3, - fixup_gcrypt_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"gcrypt_aes_decrypt", (cmd_function)w_gcrypt_aes_decrypt, 3, - fixup_gcrypt_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -260,28 +258,6 @@ static int w_gcrypt_aes_encrypt( return ki_gcrypt_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_aes_encrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** * */ @@ -422,28 +398,6 @@ static int w_gcrypt_aes_decrypt( return ki_gcrypt_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_aes_decrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** *

1 0

git:master:1c3ae81d: http_client: replaced local fixup with core helpers
by Daniel-Constantin Mierla 30 Mar '24

30 Mar '24

Module: kamailio Branch: master Commit: 1c3ae81d904db99de9398d49af1bf6c5f47a4d74 URL: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T23:08:07+01:00 http_client: replaced local fixup with core helpers --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Patch: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c…

1 0

git:master:2063993c: core: added fixup_spve1_pvar() helper
by Daniel-Constantin Mierla 29 Mar '24

29 Mar '24

Module: kamailio Branch: master Commit: 2063993c1ae54c07b39ea9deb8f735a47785c0ee URL: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T11:13:48+01:00 core: added fixup_spve1_pvar() helper - comments to spveX pvar fixup helpers --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Patch: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 0947f788461..bba3a469028 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -728,7 +728,9 @@ int fixup_free_spve_spve_igp(void **param, int param_no) } /** - * + * - first params are dynamic strings (spve) + * - n - how many params are spve; n+1 is name of pv + * - if pvmode==1, the last param pv has to be r/w */ int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { @@ -768,6 +770,15 @@ int fixup_spve_pvar(void **param, int param_no) return fixup_spve_n_pvar(param, 1, param_no, 0); } +/** + * - first params are dynamic strings + * - last param pv has to be r/w + */ +int fixup_spve1_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no, 1); +} + /** * */ @@ -777,7 +788,8 @@ int fixup_free_spve_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve2_pvar(void **param, int param_no) { @@ -793,7 +805,8 @@ int fixup_free_spve2_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve3_pvar(void **param, int param_no) { @@ -809,7 +822,8 @@ int fixup_free_spve3_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve4_pvar(void **param, int param_no) { diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a202c4ade2b..d3f954fb1c2 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -147,6 +147,7 @@ int fixup_free_igp_all(void **param, int param_no); int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); +int fixup_spve1_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); int fixup_spve2_pvar(void **param, int param_no); int fixup_free_spve2_pvar(void **param, int param_no);

1 0

git:5.8:613e2cdf: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: 613e2cdfc3ae9242d259bf8b67b6ed715c0c0ad8 URL: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:48Z file_out: FIx ��for�� loop initial declarations error (cherry picked from commit ae04ccac92225a1e7b573a28ded555789e8604cd) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Patch: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

git:5.8:f4d44a92: tls: Fix âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: f4d44a9201a79acf0620a005008f2594ff8d26ee URL: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:14Z tls: Fix ��for�� loop initial declarations error (cherry picked from commit 9f2abc69e27c4b3246628138ec81fced81d7bc7a) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Patch: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index b4a2afb7818..83b86d99d58 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -345,7 +345,8 @@ static tls_domains_cfg_t* tls_use_modparams(void) */ static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k = 0; + for(k = 0; k < 16; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); }

1 0

[kamailio/kamailio] sipdump.enable will not dump (Issue #3798)
by 53c70r 28 Mar '24

28 Mar '24

While testing I noticed a strange behavior. Usually when activated, `sipdump.enable 1` for the specific interface will dump needed logs and captures to `/tmp/`. After stopping the dump with `sipdump.enable 0` deleting all captures starting with `kamailio.*` under `/tmp/` and reactivating the dump with `sipdump.enable 1` without restarting kamailio, the service will not create new captures under `/tmp/`. This behavior was reproducible. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3798 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3798(a)github.com>

2 4

git:master:44a876a6: modules: readme files regenerated - smsops ... [skip ci]
by Kamailio Dev 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 44a876a6a832b0d6baf4e6ee183576684b91f0af URL: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-28T08:46:17+01:00 modules: readme files regenerated - smsops ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Patch: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git:master:e39557c9: blst: reformat exported structures
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: e39557c96d2f419184c826d779f1a3309acc4269 URL: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 blst: reformat exported structures --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Patch: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 6a2c1d625b6..148a9a9d9d0 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -49,37 +49,44 @@ static int blst_rpl_set_ignore_f(struct sip_msg *, char *, char *); static int blst_rpl_clear_ignore_f(struct sip_msg *, char *, char *); -static cmd_export_t cmds[] = {{"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, - {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, + {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, + {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, ANY_ROUTE}, - {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, - {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, + {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, + {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /* no params */ struct module_exports exports = { - "blst", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response function */ - 0, /* module initialization function */ - 0, /* per-child init function */ - 0 /* destroy function */ + "blst", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* RPC methods */ + 0, /* pseudo-variables exports */ + 0, /* response function */ + 0, /* module initialization function */ + 0, /* per-child init function */ + 0 /* destroy function */ }; +/* clang-format on */ /**

1 0

git:master:9a94930a: smsops: short reference section about variables
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 9a94930ae1168d5df79e3dc1414841cdf23a2eba URL: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 smsops: short reference section about variables --- Modified: src/modules/smsops/doc/smsops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Patch: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… --- diff --git a/src/modules/smsops/doc/smsops_admin.xml b/src/modules/smsops/doc/smsops_admin.xml index fa19ebfc79c..da95e37c012 100644 --- a/src/modules/smsops/doc/smsops_admin.xml +++ b/src/modules/smsops/doc/smsops_admin.xml @@ -95,5 +95,19 @@ smsdump(); </section> </section> + <section> + <title>Variables</title> + <para>Several variables are exported by the module to access the + attributes of the SMS.</para> + <itemizedlist> + <listitem> + <para><emphasis>$smsack</emphasis></para> + <para><emphasis>$smsbody</emphasis></para> + <para><emphasis>$rpdata(key)</emphasis></para> + <para><emphasis>$tpdu(key)</emphasis></para> + </listitem> + </itemizedlist> + </section> + </chapter>

1 0

[kamailio/kamailio] Kamailio 5.7 TLS fail to compile (Issue #3796)
by iliesh 27 Mar '24

27 Mar '24

### Description Unable to upgrade Kamailio 5.7 on CentOS7 Error: ``` tls_mod.c: In function ‘fork_child’: tls_mod.c:348:2: error: ‘for’ loop initial declarations are only allowed in C99 mode for(int k = 0; k < 16; k++) { ^ tls_mod.c:348:2: note: use option -std=c99 or -std=gnu99 to compile your code make[2]: *** [tls_mod.o] Error 1 make[1]: *** [modules] Error 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` Current installed version: ``` version: kamailio 5.7.4 (x86_64/linux) 2e6e87 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3796 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3796(a)github.com>

3 3

[kamailio/kamailio] Fix 'for' loop initial declarations error (PR #3797)
by Xenofon Karamanos 27 Mar '24

27 Mar '24

#### 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 - [x] Related to issue #3796 (replace XXXX with an open issue number) #### Description  This PR fixes the compiles error regarding initial declarations in `for` loops You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3797 -- Commit Summary -- * tls: Fix ‘for’ loop initial declarations error * file_out: FIx ‘for’ loop initial declarations error -- File Changes -- M src/modules/file_out/file_out.c (11) M src/modules/tls/tls_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3797.patch https://github.com/kamailio/kamailio/pull/3797.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3797 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3797(a)github.com>

1 1

git:master:ae04ccac: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: ae04ccac92225a1e7b573a28ded555789e8604cd URL: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-27T18:08:20+02:00 file_out: FIx ��for�� loop initial declarations error --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Patch: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

git:master:9f2abc69: tls: Fix âforâ loop initial declarations error
by Xenofon Karamanos 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: 9f2abc69e27c4b3246628138ec81fced81d7bc7a URL: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-27T18:08:20+02:00 tls: Fix ��for�� loop initial declarations error --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… Patch: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index b4a2afb7818..83b86d99d58 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -345,7 +345,8 @@ static tls_domains_cfg_t* tls_use_modparams(void) */ static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k = 0; + for(k = 0; k < 16; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); }

1 0

[kamailio/kamailio] topos module breaks UPDATE (Issue #3437)
by Guybrush T. 27 Mar '24

27 Mar '24

### Description Kamailio v5.5.6 with topos module and postgres DB. UAC (A) -> Kamailio Registrar (B) -> Kamailio PSTN GW (C) -> PSTN (D) Call goes from A to D, PSTN sends UPDATE, UPDATE is routed from C to A instead to B and then to A. #### Reproduction Caller calls callee and receives an UPDATE from callee. In my case it was when the call was routed to voicemail. #### Log Messages ``` Kamailio takes the wrong route in UPDATE (upstream) case. May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:882]: tps_request_received(): r-uri updated to: [sip:1234@<UAC-IP>;uniq=B0EB9A84A278626DA07219E2AE01C] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:187]: tps_add_headers(): adding to headers(0) - [Route: sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes#015#012] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:187]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-64527b0a-40362-1#015#012] The right one would be the x_rr (a_rr), but it takes only the s_rr: May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,7)=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][7] Column[x_rr]=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,8)=[sip:<PSTNgw>:5060;transport=udp;lr;Hpt=8ef8_116;CxtId=3;TRC=ffffffff-ffffffff;X-HwB2bUaCookie=18614] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][8] Column[y_rr]=[sip:<PSTNgw>:5060;transport=udp;lr;Hpt=8ef8_116;CxtId=3;TRC=ffffffff-ffffffff;X-HwB2bUaCookie=18614] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,9)=[sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][9] Column[s_rr]=[sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263019]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][10] Column[a_rr]=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263019]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893dbd8,0,11)=[] ``` ### Possible Solutions Respect Route headers for UPDATE messages. ### Additional Information Current running kamailio 5.5.6 but tried also latest 5.6.4 with same behavior. ``` version: kamailio 5.5.6 (x86_64/linux) 72dbb0 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: 72dbb0 compiled on 05:48:21 Apr 27 2023 with gcc 11.3.0 ``` * **Operating System**: ``` Distributor ID: Ubuntu Description: Ubuntu 22.04.2 LTS Release: 22.04 Codename: jammy Linux sipproxy 5.15.0-70-generic #77-Ubuntu SMP Tue Mar 21 14:02:37 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ``` Possibly related bug: https://github.com/kamailio/kamailio/issues/3090 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3437 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3437(a)github.com>

4 10

git:master:4137a8c6: pkg/kamailio: packaged pvtpl module into RPM
by Sergey Safarov 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: 4137a8c63a03a316a0fa0f37d518a09e68273309 URL: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-03-27T09:57:29+02:00 pkg/kamailio: packaged pvtpl module into RPM --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… Patch: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8bbe77b63dd..6d79bb8ec9f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1585,6 +1585,7 @@ fi %doc %{_docdir}/kamailio/modules/README.print_lib %doc %{_docdir}/kamailio/modules/README.pv %doc %{_docdir}/kamailio/modules/README.pv_headers +%doc %{_docdir}/kamailio/modules/README.pvtpl %doc %{_docdir}/kamailio/modules/README.pua_rpc %doc %{_docdir}/kamailio/modules/README.qos %doc %{_docdir}/kamailio/modules/README.ratelimit @@ -1750,6 +1751,7 @@ fi %{_libdir}/kamailio/modules/pua_rpc.so %{_libdir}/kamailio/modules/pv.so %{_libdir}/kamailio/modules/pv_headers.so +%{_libdir}/kamailio/modules/pvtpl.so %{_libdir}/kamailio/modules/qos.so %{_libdir}/kamailio/modules/ratelimit.so %{_libdir}/kamailio/modules/registrar.so

1 0

git:master:9848d43c: smsops: reformat module exports structures
by Daniel-Constantin Mierla 26 Mar '24

26 Mar '24

Module: kamailio Branch: master Commit: 9848d43cb367d6901a0b8c727759feb8a8fad930 URL: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-26T19:17:23+01:00 smsops: reformat module exports structures --- Modified: src/modules/smsops/smsops.c --- Diff: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… Patch: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… --- diff --git a/src/modules/smsops/smsops.c b/src/modules/smsops/smsops.c index 3e2cb88bc58..d8354af2319 100644 --- a/src/modules/smsops/smsops.c +++ b/src/modules/smsops/smsops.c @@ -30,31 +30,36 @@ MODULE_VERSION -static pv_export_t mod_pvs[] = {{{"smsack", sizeof("smsack") - 1}, PVT_OTHER, - pv_sms_ack, 0, 0, 0, 0, 0}, - {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, - pv_parse_rpdata_name, 0, 0, 0}, - {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, +/* clang-format off */ +static pv_export_t mod_pvs[] = { + {{"smsack", sizeof("smsack") - 1}, PVT_OTHER, pv_sms_ack, 0, 0, 0, 0, 0}, + {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, + pv_parse_rpdata_name, 0, 0, 0}, + {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, pv_parse_tpdu_name, 0, 0, 0}, - {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, - 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static cmd_export_t cmds[] = { - {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, - {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, + {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "smsops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - 0, /* exported parameters */ - 0, /* exported rpc functions */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function*/ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "smsops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function*/ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */

1 0

RFC: move app_lua_sr to kamailio-archive
by Victor Seva 26 Mar '24

26 Mar '24

Hi, I would like to move app_lua_sr to kamailio-archive but I would like to hear if anyone out there has a solid reason not to do it. Since we have app_lua as KEMI for a long time I think is time to retire the old remains of app_lua Cheers -- ----------------------------------------------------------------- | ,''`. Victor Seva | | : :' : linuxmaniac(a)torreviejawireless.org | | `. `' PGP: 8F19 CADC D42A 42D4 5563 730C 51A0 9B18 CF5A 5068 | | `- Debian Developer | -----------------------------------------------------------------

2 1

git:5.8:3fac5afc: file_out: Cast to correct type of str
by Xenofon Karamanos 26 Mar '24

26 Mar '24

Module: kamailio Branch: 5.8 Commit: 3fac5afc42a606391d6a7c0337ef5e4e136d6b80 URL: https://github.com/kamailio/kamailio/commit/3fac5afc42a606391d6a7c0337ef5e4… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-26T09:57:49Z file_out: Cast to correct type of str (cherry picked from commit 4ada818099b5b7cb7deff1b1ce93b5aacaa1b84e) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/3fac5afc42a606391d6a7c0337ef5e4… Patch: https://github.com/kamailio/kamailio/commit/3fac5afc42a606391d6a7c0337ef5e4… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 7e035f13359..886f01f944f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -344,7 +344,7 @@ static int fo_add_filename(modparam_t type, void *val) LM_ERR("modparam value is null\n"); return -1; } - if(strlen((char *)val) == 0) { + if(strlen(((str *)val)->s) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

1 0

git:5.8:028ba8f9: file_out: additional checks for silenting warnings
by Xenofon Karamanos 26 Mar '24

26 Mar '24

Module: kamailio Branch: 5.8 Commit: 028ba8f9d6bc40dcd47e6a0e5b40e5b3e2ea7b17 URL: https://github.com/kamailio/kamailio/commit/028ba8f9d6bc40dcd47e6a0e5b40e5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-26T09:57:25Z file_out: additional checks for silenting warnings (cherry picked from commit 19894425684504e2a19622ae5a9cdfc565f16fd3) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/028ba8f9d6bc40dcd47e6a0e5b40e5b… Patch: https://github.com/kamailio/kamailio/commit/028ba8f9d6bc40dcd47e6a0e5b40e5b… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 549eaa6e48f..7e035f13359 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -226,28 +226,31 @@ static void fo_log_writer_process(int rank) LM_ERR("deque error\n"); return; } - FILE *out = fo_get_file_handle(log_message.dest_file); - if(out == NULL) { - LM_ERR("file handle is NULL\n"); - return; - } + if(log_message.message != NULL) { + FILE *out = fo_get_file_handle(log_message.dest_file); + if(out == NULL) { + LM_ERR("file handle is NULL\n"); + return; + } - /* Get prefix for the file */ - if(log_message.prefix != NULL && log_message.prefix->len > 0) { - if(fprintf(out, "%.*s", log_message.prefix->len, - log_message.prefix->s) + /* Get prefix for the file */ + if(log_message.prefix != NULL && log_message.prefix->len > 0) { + if(fprintf(out, "%.*s", log_message.prefix->len, + log_message.prefix->s) + < 0) { + LM_ERR("Failed to write prefix to file with err {%s}\n", + strerror(errno)); + } + } + if(fprintf(out, "%.*s\n", log_message.message->len, + log_message.message->s) < 0) { - LM_ERR("Failed to write prefix to file with err {%s}\n", + LM_ERR("Failed to write to file with err {%s}\n", strerror(errno)); } - } - if(fprintf(out, "%.*s\n", log_message.message->len, - log_message.message->s) - < 0) { - LM_ERR("Failed to write to file with err {%s}\n", strerror(errno)); - } - if(fflush(out) < 0) { - LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); + if(fflush(out) < 0) { + LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); + } } if(log_message.prefix != NULL) { @@ -337,7 +340,11 @@ static int fo_fixup_free_int_pvar(void **param, int param_no) static int fo_add_filename(modparam_t type, void *val) { - if(val != NULL && strlen((char *)val) == 0) { + if(val == NULL) { + LM_ERR("modparam value is null\n"); + return -1; + } + if(strlen((char *)val) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

1 0

git:master:14dc277e: db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT
by Daniel-Constantin Mierla 25 Mar '24

25 Mar '24

Module: kamailio Branch: master Commit: 14dc277e29a170b9ac51e7dda07fa25cbd9be048 URL: https://github.com/kamailio/kamailio/commit/14dc277e29a170b9ac51e7dda07fa25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-25T23:25:19+01:00 db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT - follow up of previous commit --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/14dc277e29a170b9ac51e7dda07fa25… Patch: https://github.com/kamailio/kamailio/commit/14dc277e29a170b9ac51e7dda07fa25… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 49f7f7e1f7e..4c756db66ff 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -48,10 +48,10 @@ extern char *db_mysql_opt_ssl_ca; #define KSR_MYSQL_OPT_RECONNECT #else #if MYSQL_VERSION_ID < 80034 -#endif #define KSR_MYSQL_OPT_RECONNECT #endif #endif +#endif /*! \brief * Create a new connection structure,

1 0

git:master:da3d6e9a: db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34
by Daniel-Constantin Mierla 25 Mar '24

25 Mar '24

Module: kamailio Branch: master Commit: da3d6e9a74b63fdb7b1c4063d6be017f1ce42bea URL: https://github.com/kamailio/kamailio/commit/da3d6e9a74b63fdb7b1c4063d6be017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-25T23:07:55+01:00 db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34 - https://dev.mysql.com/doc/c-api/8.0/en/c-api-auto-reconnect.html - MariaDB seems to still have it --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/da3d6e9a74b63fdb7b1c4063d6be017… Patch: https://github.com/kamailio/kamailio/commit/da3d6e9a74b63fdb7b1c4063d6be017…

1 0

git:master:dd221a6e: keepalive: reformat module exports structures
by Daniel-Constantin Mierla 25 Mar '24

25 Mar '24

Module: kamailio Branch: master Commit: dd221a6e5162838b979fd38ffdfb750663aef869 URL: https://github.com/kamailio/kamailio/commit/dd221a6e5162838b979fd38ffdfb750… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-25T09:38:02+01:00 keepalive: reformat module exports structures --- Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd221a6e5162838b979fd38ffdfb750… Patch: https://github.com/kamailio/kamailio/commit/dd221a6e5162838b979fd38ffdfb750… --- diff --git a/src/modules/keepalive/keepalive_mod.c b/src/modules/keepalive/keepalive_mod.c index 6b49603c303..4757b4346d5 100644 --- a/src/modules/keepalive/keepalive_mod.c +++ b/src/modules/keepalive/keepalive_mod.c @@ -70,39 +70,45 @@ str ka_ping_from = str_init("sip:keepalive@kamailio.org"); int ka_counter_del = 5; -static cmd_export_t cmds[] = {{"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, - fixup_spve_null, 0, ANY_ROUTE}, - // internal API - {"ka_add_destination", (cmd_function)w_add_destination, 2, - fixup_add_destination, 0, - REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"ka_del_destination", (cmd_function)w_del_destination, 2, - fixup_add_destination, 0, ANY_ROUTE}, - {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, + fixup_spve_null, 0, ANY_ROUTE}, + // internal API + {"ka_add_destination", (cmd_function)w_add_destination, 2, + fixup_add_destination, 0, REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, + {"ka_del_destination", (cmd_function)w_del_destination, 2, + fixup_add_destination, 0, ANY_ROUTE}, + {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"ping_interval", PARAM_INT, &ka_ping_interval}, - {"destination", PARAM_STRING | USE_FUNC_PARAM, - (void *)ka_mod_add_destination}, - {"ping_from", PARAM_STR, &ka_ping_from}, - {"delete_counter", PARAM_INT, &ka_counter_del}, {0, 0, 0}}; + {"ping_interval", PARAM_INT, &ka_ping_interval}, + {"destination", PARAM_STRING | USE_FUNC_PARAM, + (void *)ka_mod_add_destination}, + {"ping_from", PARAM_STR, &ka_ping_from}, + {"delete_counter", PARAM_INT, &ka_counter_del}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "keepalive", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "keepalive", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,xenial #2628
by kamailio＠sipwise.com 24 Mar '24

24 Mar '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 1.18 MiB...] make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions presence_dmq.o publish.o utils_func.o event_list.o notify.o presentity.o hash.o presence.o bind_presence.o subscribe.o -lm -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o presence.so gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions xmlrpc.o http.o -lm -lxml2 -o xmlrpc.so Makefile.defs defs skipped Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_conference"' -DMOD_NAMEID='presence_conference' -c notify_body.c -o notify_body.o -MMD -MP Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"xmlops"' -DMOD_NAMEID='xmlops' -c pv_xml.c -o pv_xml.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_conference"' -DMOD_NAMEID='presence_conference' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"xmlops"' -DMOD_NAMEID='xmlops' -c xmlops_mod.c -o xmlops_mod.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_conference"' -DMOD_NAMEID='presence_conference' -c presence_conference.c -o presence_conference.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pv_xml.o xmlops_mod.o -lxml2 -o xmlops.so make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' /usr/bin/make every-module group_include="kperl" quiet=verbose make[1]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' /usr/bin/make -C src/ every-module make[2]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' config.mak loaded Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_conference"' -DMOD_NAMEID='presence_conference' -c add_events.c -o add_events.o -MMD -MP Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"app_perl"' -DMOD_NAMEID='app_perl' -c perlfunc.c -o perlfunc.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pidf.o add_events.o notify_body.o presence_conference.o -lm -lxml2 -o presence_conference.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_dialoginfo"' -DMOD_NAMEID='presence_dialoginfo' -c notify_body.c -o notify_body.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"app_perl"' -DMOD_NAMEID='app_perl' -c app_perl_mod.c -o app_perl_mod.o -MMD -MP xsubpp -typemap `perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap -typemap typemap kamailioxs.xs > kamailioxs.c gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -Wno-unused -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"app_perl"' -DMOD_NAMEID='app_perl' -c kamailioxs.c -o kamailioxs.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_dialoginfo"' -DMOD_NAMEID='presence_dialoginfo' -c presence_dialoginfo.c -o presence_dialoginfo.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_dialoginfo"' -DMOD_NAMEID='presence_dialoginfo' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_dialoginfo"' -DMOD_NAMEID='presence_dialoginfo' -c add_events.c -o add_events.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions presence_dialoginfo.o pidf.o add_events.o notify_body.o -lm -lxml2 -o presence_dialoginfo.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"presence_mwi"' -DMOD_NAMEID='presence_mwi' -c presence_mwi.c -o presence_mwi.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"presence_mwi"' -DMOD_NAMEID='presence_mwi' -c add_events.c -o add_events.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions presence_mwi.o add_events.o -o presence_mwi.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"presence_profile"' -DMOD_NAMEID='presence_profile' -c presence_profile.c -o presence_profile.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"presence_profile"' -DMOD_NAMEID='presence_profile' -c add_events.c -o add_events.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions presence_profile.o add_events.o -o presence_profile.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_reginfo"' -DMOD_NAMEID='presence_reginfo' -c notify_body.c -o notify_body.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions perlfunc.o app_perl_mod.o kamailioxs.o `perl -MExtUtils::Embed -e ldopts` -o app_perl.so gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_reginfo"' -DMOD_NAMEID='presence_reginfo' -c presence_reginfo.c -o presence_reginfo.o -MMD -MP Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_reginfo"' -DMOD_NAMEID='presence_reginfo' -c add_events.c -o add_events.o -MMD -MP Makefile.defs defs skipped gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions notify_body.o presence_reginfo.o add_events.o -lm -lxml2 -o presence_reginfo.so gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"db_perlvdb"' -DMOD_NAMEID='db_perlvdb' -c perlvdb_oohelpers.c -o perlvdb_oohelpers.o -MMD -MP Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c notify_body.c -o notify_body.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"db_perlvdb"' -DMOD_NAMEID='db_perlvdb' -c perlvdb_conv.c -o perlvdb_conv.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"db_perlvdb"' -DMOD_NAMEID='db_perlvdb' -c db_perlvdb.c -o db_perlvdb.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -DMOD_NAME='"db_perlvdb"' -DMOD_NAMEID='db_perlvdb' -c perlvdbfunc.c -o perlvdbfunc.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions perlvdb_oohelpers.o perlvdb_conv.o db_perlvdb.o perlvdbfunc.o -Wl,-E -fstack-protector-strong -L/usr/local/lib -L/usr/lib/x86_64-linux-gnu/perl/5.22/CORE -lperl -lm -lpthread -lc -lcrypt -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o db_perlvdb.so make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' /usr/bin/make every-module group_include="kutils" quiet=verbose make[1]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' /usr/bin/make -C src/ every-module make[2]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' config.mak loaded Makefile.defs defs skipped Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"utils"' -DMOD_NAMEID='utils' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c xcap_auth.c -o xcap_auth.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"utils"' -DMOD_NAMEID='utils' -c conf.c -o conf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"utils"' -DMOD_NAMEID='utils' -c xcap_auth.c -o xcap_auth.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c presence_xml.c -o presence_xml.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"utils"' -DMOD_NAMEID='utils' -c utils.c -o utils.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c pres_check.c -o pres_check.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions xcap_auth.o utils.o conf.o pidf.o -lm -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o utils.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"http_client"' -DMOD_NAMEID='http_client' -c http_client.c -o http_client.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"presence_xml"' -DMOD_NAMEID='presence_xml' -c add_events.c -o add_events.o -MMD -MP http_client.c: In function 'ki_http_query_request_v2pk': http_client.c:1157:30: error: 'CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE' undeclared (first use in this function) _m, met, url, body, hdrs, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); ^ http_client.c:1157:30: note: each undeclared identifier is reported only once for each function it appears in http_client.c: In function 'w_http_query_request_v2pk': http_client.c:1200:4: error: 'CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE' undeclared (first use in this function) CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); ^ http_client.c:1201:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ http_client.c: In function 'ki_http_query_request_v2pk': http_client.c:1158:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ ../../Makefile.rules:100: recipe for target 'http_client.o' failed make[3]: *** [http_client.o] Error 1 Makefile:508: recipe for target 'modules' failed make[2]: *** [modules] Error 1 make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' Makefile:34: recipe for target 'every-module' failed make[1]: *** [every-module] Error 2 make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' debian/rules:134: recipe for target 'build_utils' failed make: *** [build_utils] Error 2 make: *** Waiting for unfinished jobs.... Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pidf.o add_events.o notify_body.o xcap_auth.o presence_xml.o pres_check.o -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o presence_xml.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c pua_db.c -o pua_db.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c pua_callback.c -o pua_callback.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c send_subscribe.c -o send_subscribe.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c hash.c -o hash.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c pua.c -o pua.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c event_list.c -o event_list.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c pua_bind.c -o pua_bind.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c send_publish.c -o send_publish.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua"' -DMOD_NAMEID='pua' -c add_events.c -o add_events.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pua_callback.o send_publish.o event_list.o pua_bind.o pua.o pidf.o hash.o add_events.o send_subscribe.o pua_db.o -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o pua.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_bla"' -DMOD_NAMEID='pua_bla' -c registrar_cb.c -o registrar_cb.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_bla"' -DMOD_NAMEID='pua_bla' -c pua_bla.c -o pua_bla.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_bla"' -DMOD_NAMEID='pua_bla' -c notify.c -o notify.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions registrar_cb.o pua_bla.o notify.o -lm -lxml2 -o pua_bla.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_dialoginfo"' -DMOD_NAMEID='pua_dialoginfo' -c pua_dialoginfo.c -o pua_dialoginfo.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_dialoginfo"' -DMOD_NAMEID='pua_dialoginfo' -c dialog_publish.c -o dialog_publish.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pua_dialoginfo.o dialog_publish.o -lxml2 -o pua_dialoginfo.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_reginfo"' -DMOD_NAMEID='pua_reginfo' -c pua_reginfo.c -o pua_reginfo.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_reginfo"' -DMOD_NAMEID='pua_reginfo' -c usrloc_cb.c -o usrloc_cb.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_reginfo"' -DMOD_NAMEID='pua_reginfo' -c subscribe.c -o subscribe.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_reginfo"' -DMOD_NAMEID='pua_reginfo' -c notify.c -o notify.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pua_reginfo.o subscribe.o usrloc_cb.o notify.o -lxml2 -o pua_reginfo.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DWITH_EVENT_LOCAL_REQUEST -DMOD_NAME='"pua_rpc"' -DMOD_NAMEID='pua_rpc' -c pua_rpc.c -o pua_rpc.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions pua_rpc.o -o pua_rpc.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_usrloc"' -DMOD_NAMEID='pua_usrloc' -c ul_publish.c -o ul_publish.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_usrloc"' -DMOD_NAMEID='pua_usrloc' -c pua_usrloc.c -o pua_usrloc.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions ul_publish.o pua_usrloc.o -lxml2 -o pua_usrloc.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_xmpp"' -DMOD_NAMEID='pua_xmpp' -c request_winfo.c -o request_winfo.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_xmpp"' -DMOD_NAMEID='pua_xmpp' -c xmpp2simple.c -o xmpp2simple.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_xmpp"' -DMOD_NAMEID='pua_xmpp' -c pidf.c -o pidf.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_xmpp"' -DMOD_NAMEID='pua_xmpp' -c simple2xmpp.c -o simple2xmpp.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"pua_xmpp"' -DMOD_NAMEID='pua_xmpp' -c pua_xmpp.c -o pua_xmpp.o -MMD -MP gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions request_winfo.o xmpp2simple.o pua_xmpp.o pidf.o simple2xmpp.o -lxml2 -o pua_xmpp.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c notify.c -o notify.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c rls.c -o rls.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c subscribe.c -o subscribe.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c resource_notify.c -o resource_notify.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c rls_db.c -o rls_db.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"rls"' -DMOD_NAMEID='rls' -c utils.c -o utils.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions notify.o rls_db.o utils.o rls.o subscribe.o resource_notify.o -lm -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o rls.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"xcap_client"' -DMOD_NAMEID='xcap_client' -c xcap_callbacks.c -o xcap_callbacks.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"xcap_client"' -DMOD_NAMEID='xcap_client' -c xcap_functions.c -o xcap_functions.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"xcap_client"' -DMOD_NAMEID='xcap_client' -c xcap_client.c -o xcap_client.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions xcap_callbacks.o xcap_functions.o xcap_client.o -lm -L/usr/local/lib -lcurl -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o xcap_client.so Makefile.defs defs skipped Makefile.defs defs skipped gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"xcap_server"' -DMOD_NAMEID='xcap_server' -c xcap_server.c -o xcap_server.o -MMD -MP gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.9.0-dev0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 5.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5009000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/libxml2 -DMOD_NAME='"xcap_server"' -DMOD_NAMEID='xcap_server' -c xcap_misc.c -o xcap_misc.o -MMD -MP Makefile.defs defs skipped make[4]: 'libsrdb1.so.1.0' is up to date. gcc -shared -g -m64 -Wl,-O2 -Wl,-E -Wl,-Bsymbolic-functions -Wl,-z,relro -pthread -rdynamic "-ldl" -Wl,-Bsymbolic-functions xcap_server.o xcap_misc.o -lm -lxml2 -L../../lib/srdb1/ -lsrdb1 -Wl,-rpath,/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src/lib/srdb1 -o xcap_server.so make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651/src' make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu16.04.20240323005614.2651' dpkg-buildpackage: error: debian/rules build gave error exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.106004/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.106004/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_uKubR6 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.106004 + '[' 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/xenial-amd64.building.103193 + '[' -r /run/lock/xenial-amd64.update.103193 ']' + '[' '' = 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.Q2BI841oB8 ']' + rm -rf /tmp/tmp.Q2BI841oB8 + '[' -n /tmp/apt-jdg_uKubR6 ']' + sudo rm -rf /tmp/apt-jdg_uKubR6 + '[' -n 1361 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=596 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Mar 23 01:14:15 UTC 2024 [running 596 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Mar 23 01:14:15 UTC 2024 [running 596 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

git:5.6:3d642314: tls: revert commit a08562b2e56c89900220b7ed15c9ccd12655d9a6
by S-P Chan 24 Mar '24

24 Mar '24

Module: kamailio Branch: 5.6 Commit: 3d6423140a864b83e61dbc8e662c8fd53ecb9bb3 URL: https://github.com/kamailio/kamailio/commit/3d6423140a864b83e61dbc8e662c8fd… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-24T08:27:43+08:00 tls: revert commit a08562b2e56c89900220b7ed15c9ccd12655d9a6 - GH#3791: users of tls.so on systems that provide only libssl3 (e.g. bookworm) are advised to try >= 5.8.0 --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3d6423140a864b83e61dbc8e662c8fd… Patch: https://github.com/kamailio/kamailio/commit/3d6423140a864b83e61dbc8e662c8fd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 3805accf70a..499a9a77aea 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -306,17 +306,6 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif -/* unconditionally perform thread-local clean-up - * especially needed with libssl3 uses - * (bookworm/jammy/noble/el9) - */ -static void fork_child(void) -{ - for(int k = 0; k < 16; k++) { - if(pthread_getspecific(k) != 0) - pthread_setspecific(k, 0x0); - } -} static int mod_init(void) { @@ -418,9 +407,6 @@ static int mod_init(void) if(sr_tls_event_callback.s == NULL || sr_tls_event_callback.len <= 0) { tls_lookup_event_routes(); } - /* minimal fix for libssl 1.1.1/3.x uses - */ - pthread_atfork(NULL, NULL, &fork_child); return 0; error: tls_h_mod_destroy_f(); @@ -649,6 +635,11 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + LM_DBG("setting cryptorand random engine\n"); + RAND_set_rand_method(RAND_ksr_cryptorand_method()); +#endif + sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

1 0

git:5.6:a08562b2: tls: force thread-locals clean-up for libssl3
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.6 Commit: a08562b2e56c89900220b7ed15c9ccd12655d9a6 URL: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:38:18+08:00 tls: force thread-locals clean-up for libssl3 - minimal thread-locals patch as 5.6.x is packaged for distros that use libssl3 GH#3791 - simplified version of tls rework in 5.8.x --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… Patch: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 499a9a77aea..3805accf70a 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -306,6 +306,17 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* unconditionally perform thread-local clean-up + * especially needed with libssl3 uses + * (bookworm/jammy/noble/el9) + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} static int mod_init(void) { @@ -407,6 +418,9 @@ static int mod_init(void) if(sr_tls_event_callback.s == NULL || sr_tls_event_callback.len <= 0) { tls_lookup_event_routes(); } + /* minimal fix for libssl 1.1.1/3.x uses + */ + pthread_atfork(NULL, NULL, &fork_child); return 0; error: tls_h_mod_destroy_f(); @@ -635,11 +649,6 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - LM_DBG("setting cryptorand random engine\n"); - RAND_set_rand_method(RAND_ksr_cryptorand_method()); -#endif - sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

2 1

git:5.7:d03d5fdf: tls: NULL safety check
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: d03d5fdf2b6a29e783738a6ea98c35725826d9ed URL: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: NULL safety check (cherry picked from commit f6f9d90ada963b53b6552e1a172b8f2fd021c33b) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… Patch: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 51e88bed51f..c2a3c8de271 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -871,6 +871,8 @@ EVP_PKEY *tls_engine_private_key(const char *key_id) while(!(OSSL_STORE_eof(ctx))) { OSSL_STORE_INFO *info = OSSL_STORE_load(ctx); + if(info == NULL) + continue; int type; type = OSSL_STORE_INFO_get_type(info);

1 0

git:5.7:caa24125: etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: caa2412507586329b7b97685203fd8bd54cd2691 URL: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler (cherry picked from commit 5b4926b04ba0fcd8f65f5709789abd83181a381a) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… Patch: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a95a652b935..bf456f396fa 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -224,8 +224,9 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use threads for process#0 only - * 2: use threads for all processes */ + * 1: use thread executors for process#0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 3: use thread executors for all processes */ tls_threads_mode=1 #!endif

1 0

git:5.7:cf764b49: tls: new option tls_threads_mode = 2
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: cf764b499fbc3f28f7ed080b488e0e8111687cf8 URL: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: new option tls_threads_mode = 2 - use pthread_atfork to force all thread-locals to 0x0 after fork() (cherry picked from commit 464299c202f3ba963aed821b777075397e843856) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… Patch: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index c34c9933b1d..51e88bed51f 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -337,6 +337,20 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* global config tls_threads_mode = 2 + * - force all thread-locals to be 0x0 after fork() + * - with OpenSSL loaded the largest value observed + * is < 10 + * + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} + static int mod_init(void) { int method; @@ -446,6 +460,9 @@ static int mod_init(void) ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); } #endif + if(ksr_tls_threads_mode == 2) { + pthread_atfork(NULL, NULL, &fork_child); + } return 0; error: tls_h_mod_destroy_f();

1 0

git:5.7:d20df6fb: core/rthreads.h: add new option tls_threads_mode = 2
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: d20df6fb372ab4da0dd5e6f277b08345059c2be5 URL: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 core/rthreads.h: add new option tls_threads_mode = 2 - add global handling of thread-locals with tls_threads_mode = 2 - this will run a pthread_atfork handler to reset all thread-locals to 0x0 - alternative solution to running functions in thread executors - requires tls.so to be loaded to be effective (cherry picked from commit e7f040f219b46592081a6053b4ed1ae0d0552b1a) --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… Patch: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 0f4f0cf8b8a..6fee4d0b407 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,7 +40,7 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } @@ -77,7 +77,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -113,7 +113,7 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; @@ -152,7 +152,7 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -188,7 +188,7 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; @@ -240,7 +240,7 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } @@ -278,7 +278,7 @@ static int run_thread4L(_thread_proto4L fn, long arg1) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1); }

1 0

git:5.7:822960b0: tls: basic OpenSSL 3 support of provider keys (replaces ENGINE)
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 822960b0e869b5fce093f708daf65b9f4b4c47f8 URL: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: basic OpenSSL 3 support of provider keys (replaces ENGINE) - initial support for v3 provider keys (replaces ENGINE from v1.1.1) - can be disabled behind build flag -DOPENSSL_NO_PROVIDER - provider keys start with /uri: e.g private_key = /uri:pkcs11:token=NSS%20Certificate%20DB;type=private;object=Fork-Test-c67cc0e0 - global config: provider_quirks: 0 | 1 - 0 - default - 1 - create a new OSS_LIB_CTX* in the child This integration does not load any providers itself and depends on the usual export OPENSSL_CONF=my-openssl.cnf to configure providers. (cherry picked from commit 69883dd381368ca219cc52140e71d571775f95d5) --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9… Patch: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9…

1 0

git:5.7:88429b9e: tls: remove unused ENGINE define
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 88429b9e3546864845fb1a3c2ce5263620b51c58 URL: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: remove unused ENGINE define --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… Patch: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 3e22ec42712..3bfea131cf2 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,11 +128,6 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ -/* only OpenSSL <= 1.1.1 */ -#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_VERSION_NUMBER < 0x030000000L -#define KSR_SSL_ENGINE -#endif - extern str sr_tls_xavp_cfg; static str _ksr_tls_connect_server_id = STR_NULL;

1 0

git:5.7:af524f5b: tlsa: removed the map files used in the past for tls engine
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: af524f5b2b2fa3de4aa4e198bf3a9f0feff04e17 URL: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tlsa: removed the map files used in the past for tls engine - sync with code of tls module --- Removed: src/modules/tlsa/tls_map.c Removed: src/modules/tlsa/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… Patch: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… --- diff --git a/src/modules/tlsa/tls_map.c b/src/modules/tlsa/tls_map.c deleted file mode 100644 index ad799b5cdff..00000000000 --- a/src/modules/tlsa/tls_map.c +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.c" diff --git a/src/modules/tlsa/tls_map.h b/src/modules/tlsa/tls_map.h deleted file mode 100644 index 96705a7f7fa..00000000000 --- a/src/modules/tlsa/tls_map.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.h"

1 0

git:5.7:957c8005: tls: clean-up of ENGINE
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 957c8005d2a97207debf1d3e782c1df5de70d487 URL: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: clean-up of ENGINE - remove tls_map.* - not needed anymore - install an ENGINE in each worker SSL_CTX no need to replicate to all processes --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_server.c Removed: src/modules/tls/tls_map.c Removed: src/modules/tls/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df… Patch: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df…

1 0

git:5.7:4b206bcc: tls: make explicit ENGINE deprecation in OpenSSL 3
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 4b206bccc0ed46aac876921009d2884eb868075c URL: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: make explicit ENGINE deprecation in OpenSSL 3 --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884… Patch: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884…

1 0

git:master:8114b201: corex: fix conditions for dns_cache modparam srv attributes
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: 8114b2016d032484edafe4edd04fb02d52cfd058 URL: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:58:46+01:00 corex: fix conditions for dns_cache modparam srv attributes --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… Patch: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ed37b22c757..4152fbf5df4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -454,7 +454,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 8 && strncasecmp(pit->name.s, "priority", 8) == 0) { - if(dns_flags == 0) { + if(dns_priority == 0) { if(str2sint(&pit->body, &dns_priority) < 0) { LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); @@ -463,7 +463,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - if(dns_flags == 0) { + if(dns_weight == 0) { if(str2sint(&pit->body, &dns_weight) < 0) { LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); @@ -472,7 +472,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 4 && strncasecmp(pit->name.s, "port", 4) == 0) { - if(dns_flags == 0) { + if(dns_port == 0) { if(str2sint(&pit->body, &dns_port) < 0) { LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); return -1;

1 0

git:master:f35cf890: core: resolve/create_srv_pref_list() - insert at correct position in list
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: f35cf8904119dcf582ea2451648de5fef095466b URL: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:51:47+01:00 core: resolve/create_srv_pref_list() - insert at correct position in list --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… Patch: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index b6ee8592697..6d581f4915f 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1526,8 +1526,8 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) if(naptr_proto_supported(i) == 0) { continue; } else { - list[i - 1].proto_pref = tmp.proto_pref; - list[i - 1].proto = i; + list[list_len].proto_pref = tmp.proto_pref; + list[list_len].proto = i; list_len++; } };

1 0

git:master:0fb15fe7: http_client: CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE was added in libcurl 7.49.0
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: 0fb15fe72ec72474c12ab2688bf83d8396886360 URL: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:45:51+01:00 http_client: CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE was added in libcurl 7.49.0 - if not supported, fallback to default http version --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… Patch: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c15e36c4957..5bfd219b008 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -1135,6 +1135,11 @@ static int w_http_get_script( return ki_http_request_helper(_m, &met, &url, &body, &hdrs, 0, dst); } +/* CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE added in libcurl 7.49.0 */ +#if LIBCURL_VERSION_NUM < 0x073100 +#define CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE 0 +#endif + /*! * KEMI function to perform request with headers and body */

1 0

git:master:a03dd2fd: dmq: improve debug logs related to locks
by Victor Seva 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: a03dd2fdb6ac30937f29fe63cabbe09902ad8300 URL: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T01:13:39+01:00 dmq: improve debug logs related to locks * dmq_node_list->lock * dmq_worker->lock unreleased and some info inside worker_loop() --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Patch: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09…

1 0

git:5.5:fa08fabe: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.5 Commit: fa08fabebb0640d4fe6907b06c78f5154321e5c5 URL: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:12:51+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) (cherry picked from commit 3ad3a61a901192290344bd4fadd724f61b8a4444) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Patch: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index d40fd2cac2e..b04d0fa6d30 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -402,8 +402,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.6:3ad3a61a: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.6 Commit: 3ad3a61a901192290344bd4fadd724f61b8a4444 URL: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:11:40+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Patch: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.7:0a96c9f4: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.7 Commit: 0a96c9f4fb3bf179d417b0188d619afd7d9096ef URL: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:10:01+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Patch: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.8:814f5bdc: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.8 Commit: 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea URL: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:09:22+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Patch: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

git:master:0d240e4e: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 0d240e4e0dc3184ef37d338ba6872d295d6b16f2 URL: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:00:44+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Patch: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

[kamailio/kamailio] kamcmd keepalive.list the last up and down time reversed (Issue #3790)
by suiyuemanbu 22 Mar '24

22 Mar '24

kamailio 5.7.0 kamcmd keepalive.list { uri: sip:192.168.10.12:8877 owner: drouting last checked: Mon Mar 18 17:45:39 2024 last up: Mon Mar 18 17:45:59 2024 //err last down: Thu Jan 1 08:00:00 1970 //err state: 2 } { uri: sip:192.168.10.124:5080 owner: drouting last checked: Tue Mar 19 10:34:39 2024 last up: Thu Jan 1 08:00:00 1970 //err last down: Tue Mar 19 10:34:39 2024 //err state: 1 } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3790 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3790(a)github.com>

2 4

git:master:4ada8180: file_out: Cast to correct type of str
by Xenofon Karamanos 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 4ada818099b5b7cb7deff1b1ce93b5aacaa1b84e URL: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-22T10:30:30Z file_out: Cast to correct type of str --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Patch: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 7e035f13359..886f01f944f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -344,7 +344,7 @@ static int fo_add_filename(modparam_t type, void *val) LM_ERR("modparam value is null\n"); return -1; } - if(strlen((char *)val) == 0) { + if(strlen(((str *)val)->s) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

1 0

git:master:5f901c35: core: socket info - parse advertise ip part to get address family
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52 URL: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:25:48+01:00 core: socket info - parse advertise ip part to get address family --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Patch: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

1 0

git:master:919216d0: core: fixup helpers with option to check if variable is writable
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 919216d051b8d459eb97f7ab0968d6bf0bead188 URL: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:18:23+01:00 core: fixup helpers with option to check if variable is writable --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Patch: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 520ed44708c..0947f788461 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,12 +730,21 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_n_pvar(void **param, int n, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { + int ret = 0; if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == n + 1) - return fixup_pvar_null(param, 1); + if(param_no == n + 1) { + ret = fixup_pvar_null(param, 1); + if((ret == 0) && (pvmode == 1)) { + if(((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("pvar is not writeble\n"); + return E_UNSPEC; + } + } + return ret; + } return E_UNSPEC; } @@ -756,7 +765,7 @@ int fixup_free_spve_n_pvar(void **param, int n, int param_no) */ int fixup_spve_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 1, param_no); + return fixup_spve_n_pvar(param, 1, param_no, 0); } /** @@ -772,7 +781,7 @@ int fixup_free_spve_pvar(void **param, int param_no) */ int fixup_spve2_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 2, param_no); + return fixup_spve_n_pvar(param, 2, param_no, 1); } /** @@ -788,7 +797,7 @@ int fixup_free_spve2_pvar(void **param, int param_no) */ int fixup_spve3_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 3, param_no); + return fixup_spve_n_pvar(param, 3, param_no, 1); } /** @@ -804,7 +813,7 @@ int fixup_free_spve3_pvar(void **param, int param_no) */ int fixup_spve4_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 4, param_no); + return fixup_spve_n_pvar(param, 4, param_no, 1); } /**

1 0

git:master:61e076f0: http_client: use core helpers for fixup of http request functions
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 61e076f0dbb302b88c5013503697afd9dfd81748 URL: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:17:18+01:00 http_client: use core helpers for fixup of http request functions --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Patch: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 9be9b88d835..c15e36c4957 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -133,8 +133,6 @@ static int fixup_http_query_post(void **param, int param_no); static int fixup_free_http_query_post(void **param, int param_no); static int fixup_http_query_post_hdr(void **param, int param_no); static int fixup_free_http_query_post_hdr(void **param, int param_no); -static int fixup_http_query_request(void **param, int param_no); -static int fixup_free_http_query_request(void **param, int param_no); static int fixup_curl_connect(void **param, int param_no); static int fixup_free_curl_connect(void **param, int param_no); @@ -187,11 +185,11 @@ static cmd_export_t cmds[] = { {"http_client_get", (cmd_function)w_http_query_get_hdr, 4, fixup_http_query_post_hdr, fixup_free_http_query_post_hdr, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"http_connect", (cmd_function)w_curl_connect, 3, fixup_curl_connect, fixup_free_curl_connect, @@ -639,49 +637,6 @@ static int fixup_free_curl_connect(void **param, int param_no) return -1; } -/* - * Fix http_client_request params: met, url, hdrs, data (strings that may contain - * pvars) and result (writable pvar). - */ -static int fixup_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_spve_null(param, 1); - } - - if(param_no == 5) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("http_query: failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("http_query: result pvar is not writeble\n"); - return -1; - } - return 0; - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -/* - * Free http_client_request params. - */ -static int fixup_free_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_free_spve_null(param, 1); - } - - if(param_no == 5) { - return fixup_free_pvar_null(param, 1); - } - - LM_ERR("http_query: invalid parameter number <%d>\n", param_no); - return -1; -} - /* * Wrapper for Curl_connect (GET) */

1 0

git:master:19e91e09: core: fixup helpers for functions with strings and output variable params
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 19e91e097a851cc8c169c9c3144e2ab7669a5b71 URL: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:43:25+01:00 core: fixup helpers for functions with strings and output variable params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Patch: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 10be560982f..520ed44708c 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,11 +730,11 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_pvar(void **param, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_pvar_null(param, 1); return E_UNSPEC; } @@ -742,15 +742,79 @@ int fixup_spve_pvar(void **param, int param_no) /** * */ -int fixup_free_spve_pvar(void **param, int param_no) +int fixup_free_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_free_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_free_pvar_null(param, 1); return E_UNSPEC; } +/** + * + */ +int fixup_spve_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_free_spve_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_spve2_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_free_spve2_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_spve3_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_free_spve3_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_spve4_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 4, param_no); +} + +/** + * + */ +int fixup_free_spve4_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 4, param_no); +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 3143f060426..a202c4ade2b 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -148,6 +148,12 @@ int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); +int fixup_spve2_pvar(void **param, int param_no); +int fixup_free_spve2_pvar(void **param, int param_no); +int fixup_spve3_pvar(void **param, int param_no); +int fixup_free_spve3_pvar(void **param, int param_no); +int fixup_spve4_pvar(void **param, int param_no); +int fixup_free_spve4_pvar(void **param, int param_no); int fixup_spve_spve_igp(void **param, int param_no); int fixup_free_spve_spve_igp(void **param, int param_no);

1 0

git:master:ccd4481d: http_client: clang-format new code
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: ccd4481dcd42093ccca6d39cd71afc8fd4db938d URL: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:42:33+01:00 http_client: clang-format new code --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Patch: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index a359ce5090d..df6b8233b51 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -272,10 +272,11 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, * - 1 (default) : timeout value is in seconds. * - 2 : timeout value is in milliseconds. */ - if (timeout_mode == 1) { /* timeout is in seconds (default) */ + if(timeout_mode == 1) { /* timeout is in seconds (default) */ res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)params->timeout); - } else if (timeout_mode == 2) { /* timeout is in milliseconds */ - res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); + } else if(timeout_mode == 2) { /* timeout is in milliseconds */ + res |= curl_easy_setopt( + curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); } res |= curl_easy_setopt( @@ -734,7 +735,8 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, int http_client_request(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *_hdrs, char *_met, unsigned int _httpver) { - return http_client_request_c(_m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); + return http_client_request_c( + _m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); } /*! diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 64c3a7c65ab..9be9b88d835 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -1091,9 +1091,8 @@ static int w_http_query_post_hdr( /*! * helper for HTTP-Query function */ -static int ki_http_request_helper( - sip_msg_t *_m, str *met, str *url, str *body, str *hdrs, - unsigned int httpver, pv_spec_t *dst) +static int ki_http_request_helper(sip_msg_t *_m, str *met, str *url, str *body, + str *hdrs, unsigned int httpver, pv_spec_t *dst) { int ret = 0; str result = {NULL, 0}; @@ -1199,8 +1198,8 @@ static int ki_http_query_request_v2pk( return -1; } - return ki_http_request_helper(_m, met, url, body, hdrs, - CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); + return ki_http_request_helper( + _m, met, url, body, hdrs, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); } /*!

1 0

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

22 Mar '24

Module: kamailio Branch: master Commit: 61d04f441488af1b943c4d5f8c35befc9cdd0437 URL: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-22T07:31:22+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Patch: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 43dddfef13e..0884d21c289 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -75,6 +75,7 @@ Hugh Waite 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -134,6 +135,7 @@ Hugh Waite 1.26. http_client_query() usage 1.27. http_client_get() usage 1.28. http_client_request() usage + 1.29. http_client_request_v2pk() usage Chapter 1. Admin Guide @@ -178,6 +180,7 @@ Chapter 1. Admin Guide 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -706,6 +709,7 @@ modparam("http_client", "netinterface", "eth0") 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -894,6 +898,22 @@ switch ($rc) { } ... +4.7. http_client_request_v2pk(met, url, body, hdrs, respv) + + Similar to http_client_request(), but using HTTP/2 prior-knowledge that + the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by seting + libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + + Example 1.29. http_client_request_v2pk() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:584b51fd: http_client: documentation section for http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 584b51fd00c87539eba44e86121fc0df2c465a27 URL: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:16:53+01:00 http_client: documentation section for http_client_request_v2pk(...) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Patch: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index dd647fcb9a1..2fb918d5997 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -984,6 +984,28 @@ http_client_request("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param}) switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_request_v2pk"> + <title> + <function moreinfo="none">http_client_request_v2pk(met, url, body, hdrs, respv)</function> + </title> + <para> + Similar to http_client_request(), but using HTTP/2 prior-knowledge + that the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by + seting libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + </para> + <example> + <title><function>http_client_request_v2pk()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("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:09ad47cd: http_client: new function http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 09ad47cd64e698a9bad55d2d697e88166ff948cf URL: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:03:31+01:00 http_client: new function http_client_request_v2pk(...) - do HTTP/2 request with prior-knowledge --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Patch: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881…

1 0

git:master:93503fdc: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 93503fdc337dc76a9a0d8222e1d03d77489ea834 URL: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:46:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Patch: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 83ce7e9f4b0..472d6dd93e4 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -276,7 +276,7 @@ Joey Golan 1.87. set_rtpengine_set usage 1.88. rtpengine_offer usage 1.89. rtpengine_offer usage to force transcoding from opus to PCMU - 1.90. rtpengine_offer usage + 1.90. rtpengine_offer usage of via-branch parameter 1.91. rtpengine_answer usage 1.92. rtpengine_info usage 1.93. rtpengine_delete usage @@ -2540,14 +2540,14 @@ onreply_route[1] } ... - Example 1.90. rtpengine_offer usage + Example 1.90. rtpengine_offer usage of via-branch parameter route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-b -ranch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/A -VP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection stric +t-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4 +", "auto-next")) t_on_reply("1"); } }

1 0

git:master:779654d3: rtpengine: fix doc typos
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 779654d3654586dc1b2ac64b9ea6e7ce1dae75c8 URL: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: fix doc typos Fix doc typos in `rtpengine_offer()` usage examples. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Patch: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index b6145b3b6e2..6d79abfaeff 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2885,13 +2885,13 @@ onreply_route[1] <example> - <title><function>rtpengine_offer</function> usage</title> + <title><function>rtpengine_offer</function> usage of via-branch parameter</title> <programlisting format="linespecific"> route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-branch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) t_on_reply("1"); } }

1 0

git:master:5b0e9e8c: rtpengine: format files in clang format
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 5b0e9e8cb818e1de0c88f9b505a5813147629499 URL: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: format files in clang format Formatting in clang for files not complying with it. --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Patch: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813…

1 0

git:master:7d95e672: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 7d95e67213f05c9ede6f0339246ae7e2fe93dea5 URL: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:16:24+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Patch: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e…

1 0

[kamailio/kamailio] rtpengine: add flags processing on the daemon side (PR #3788)
by Donat Zenichev 21 Mar '24

21 Mar '24

#### 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  Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept (so backwards compatibility). General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function where it's reasonable to use rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The reason why the `via-branch` has been selected as a point of behavior differentiation is that currently it's only given via option flags list (raw string), meanwhile with a newer behavior option flags will not be parsed by the module. Since the module still has to provide all the basic identifiers, such as: call-id, From/To tags and via-branch, via-branch now is moved to a separate parameter, and gives to the module a clue a newer behavior is to be applied. The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script Current change is only applicable with rtpengine versions equal or later than mr12.3 Backwards compatibility provided, so users are not forced to change anything. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3788 -- Commit Summary -- * rtpengine: add flags processing on the daemon side * rtpengine: update documentation in regards of flags processing -- File Changes -- M src/modules/rtpengine/doc/rtpengine.xml (8) M src/modules/rtpengine/doc/rtpengine_admin.xml (45) M src/modules/rtpengine/rtpengine.c (847) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3788.patch https://github.com/kamailio/kamailio/pull/3788.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3788 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3788(a)github.com>

3 6

git:master:c6fff3a5: rtpengine: update documentation in regards of flags processing
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: c6fff3a531740e648615a6e6223088693ecdccb9 URL: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: update documentation in regards of flags processing Due to a newer approach for parsing flags being added, update the documentation of module accordingly. --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Patch: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886…

1 0

git:master:5cd02f56: rtpengine: add flags processing on the daemon side
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 5cd02f5653e9b9f523a62a0dae78b801f962ce8e URL: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: add flags processing on the daemon side Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept. General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function which takes rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Patch: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80…

1 0

[kamailio/kamailio] TLS crash in Kamailio 5.6.3 (5.7.4) on Debian 12 (Issue #3791)
by Evgeniy G 21 Mar '24

21 Mar '24

**Description** I have installed kamailio 5.6.3(from debian repo) on Debian 12. Try testing with openvas and some case, I saw kamailio crashes. > Mar 19 12:55:45 hostname kamailio[1789359]: CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f0429907ea0), called from tls: tls_init.c: ser_free(323), first free tls: tls_init.c: ser_free(323) - ignoring > Mar 19 12:55:45 hostname kamailio[1789361]: CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f0429907ee8 (address 0x7f0429907f20) beginning overwritten (80)! Memory allocator was called from tls: tls_init.c:323. Fragment marked by tls: tls_init.c:293. Exec from core/mem/q_malloc.c:511. > Mar 19 12:55:45 hostname kamailio[1789367]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 620 > Mar 19 12:55:45 hostname kamailio[1788962]: ALERT: <core> [main.c:774]: handle_sigs(): child process 1789361 exited by a signal 6. Next step, I added option --atexit=no to args - result same. Next step, I tried to build kamailio 5.7.4 from source and re-run testing, the result was the same - kamailio was crash. After that, I tried use `tlsa` module instead of `tlsa`, but it not resolve problem. Backtrace: [kamailio_5.6.3_backtrace_full.txt](https://github.com/kamailio/kamailio/fil… [kamailio_5.6.3_backtrace.txt](https://github.com/kamailio/kamailio/files/14… **Additional Information** > openssl version OpenSSL 3.0.11 19 Sep 2023 (Library: OpenSSL 3.0.11 19 Sep 2023) **Kamailio**: > kamailio -v version: kamailio 5.6.3 (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 12.2.0 > kamailio -v version: kamailio 5.7.4 (x86_64/linux) c717c0 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: c717c0 compiled on 13:23:19 Mar 20 2024 with gcc 12.2.0 **OS**: > lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm > uname -a Linux hostname 6.1.0-18-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.76-1 (2024-02-01) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3791 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3791(a)github.com>

3 4

git:master:b59812ff: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: b59812ff025a4c7e531ce9ad29d435820908fa8a URL: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T07:31:23+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Patch: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 0433f481cf3..9297251072a 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -346,8 +346,8 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey) -"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)" +); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -359,7 +359,8 @@ request_route { 4.5. secsipid_get_url(url, ovar) - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. The url parameters can contain pseudo-variables and ovar has to be the name of a writable pseudo-variable.

1 0

git:master:01ec19f7: secsipid: note that get url function is doing caching
by Daniel-Constantin Mierla 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 01ec19f73a7257a83bd9abb9a02c12e2c3d225e0 URL: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-21T07:21:27+01:00 secsipid: note that get url function is doing caching - use get url function in example for verify --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Patch: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index c43ccf3c637..f8f2e823a21 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -338,7 +338,7 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -356,7 +356,8 @@ request_route { <function moreinfo="none">secsipid_get_url(url, ovar)</function> </title> <para> - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. </para> <para> The url parameters can contain pseudo-variables and ovar has to be

1 0

[kamailio/kamailio] xhttp: fix execution of async functions (PR #3723)
by Vadim Saranov 21 Mar '24

21 Mar '24

#### 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 - [x] Related to issue #3720 #### Description Fixing R-RURI and adding necessary headers when creating fake_msg in xhttp_mod.c for successful message validation and the ability to perform various kamailio functions from event_route[xhttp:request]. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3723 -- Commit Summary -- * xhttp: fix execution of async functions -- File Changes -- M src/modules/xhttp/xhttp_mod.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3723.patch https://github.com/kamailio/kamailio/pull/3723.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3723 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3723(a)github.com>

3 5

git:master:eca79b06: modules: readme files regenerated - pvtpl ... [skip ci]
by Kamailio Dev 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: eca79b066984d8bd219c19a8c0dccb4955503bfc URL: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-20T16:16:11+01:00 modules: readme files regenerated - pvtpl ... [skip ci] --- Modified: src/modules/pvtpl/README --- Diff: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Patch: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… --- diff --git a/src/modules/pvtpl/README b/src/modules/pvtpl/README index 4ed20d00202..5bf5553aa97 100644 --- a/src/modules/pvtpl/README +++ b/src/modules/pvtpl/README @@ -30,12 +30,15 @@ Daniel-Constantin Mierla 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File List of Examples 1.1. Set tpl parameter - 1.2. gcrypt_aes_encrypt usage + 1.2. pvtpl_render usage + 1.3. Template file Chapter 1. Admin Guide @@ -53,7 +56,9 @@ Chapter 1. Admin Guide 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File 1. Overview @@ -101,18 +106,33 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) -4.1. pvtpl_apply(tplname, res) +4.1. pvtpl_render(tplname, res) - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can be - static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the + result in the variable specified by 'res'. This function can be used from ANY_ROUTE. - Example 1.2. gcrypt_aes_encrypt usage + Example 1.2. pvtpl_render usage +... +pvtpl_render("t1", "$var(out)"); +... + +5. Template File + + The template file can contain text and config variables that are + evaluate when running pvtpl_render() functions. + + The templates files are loaded at startup and prepared for runtime. It + is no option to reload the template files. + + Example 1.3. Template file ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} ...

1 0

git:master:d3900987: pvtpl: docs - section for template file
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: d3900987ddd012a192c4a429b29ac8d4e24587c5 URL: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:15:27+01:00 pvtpl: docs - section for template file --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Patch: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ca0174d3c4..25459ac1139 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -120,11 +120,35 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -pvtpl_render("t1", "$var(out)") +pvtpl_render("t1", "$var(out)"); ... </programlisting> </example> </section> </section> + <section> + <title>Template File</title> + <para> + The template file can contain text and config variables that are evaluate + when running pvtpl_render() functions. + </para> + <para> + The templates files are loaded at startup and prepared for runtime. It is + no option to reload the template files. + </para> + <example> + <title>Template file</title> + <programlisting format="linespecific"> +... +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} +... +</programlisting> + </example> + + </section> </chapter>

1 0

git:master:d75e10f9: pvtpl: renamed pvtpl_apply() to pvtpl_render()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: d75e10f983e7afaa7779e8fde6524d7eccdfd497 URL: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:07:16+01:00 pvtpl: renamed pvtpl_apply() to pvtpl_render() --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml Modified: src/modules/pvtpl/pvtpl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Patch: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ccfb8f9a23..8ca0174d3c4 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -105,24 +105,22 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <section> <title>Functions</title> - <section id="pvtpl.f.pvtpl_apply"> + <section id="pvtpl.f.pvtpl_render"> <title> - <function moreinfo="none">pvtpl_apply(tplname, res)</function> + <function moreinfo="none">pvtpl_render(tplname, res)</function> </title> <para> - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can - be static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the result + in the variable specified by 'res'. </para> <para> This function can be used from ANY_ROUTE. </para> <example> - <title><function>gcrypt_aes_encrypt</function> usage</title> + <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +pvtpl_render("t1", "$var(out)") ... </programlisting> </example> diff --git a/src/modules/pvtpl/pvtpl_mod.c b/src/modules/pvtpl/pvtpl_mod.c index 15ee74b6838..9862a225236 100644 --- a/src/modules/pvtpl/pvtpl_mod.c +++ b/src/modules/pvtpl/pvtpl_mod.c @@ -42,7 +42,7 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv); +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv); /* clang-format off */ typedef struct pvtpl_item { @@ -61,7 +61,7 @@ static pvtpl_item_t *_pvtpl_list = NULL; /* clang-format off */ static cmd_export_t cmds[]={ - {"pvtpl_apply", (cmd_function)w_pvtpl_apply, 2, fixup_spve_pvar, + {"pvtpl_render", (cmd_function)w_pvtpl_render, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -278,7 +278,7 @@ static int pvtpl_tpl_param(modparam_t type, void *val) /** * */ -static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) +static int pvtpl_render(sip_msg_t *msg, str *tplname, pv_spec_t *dst) { pvtpl_item_t *it; pv_value_t val; @@ -313,7 +313,7 @@ static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) /** * */ -static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) +static int ki_pvtpl_render(sip_msg_t *msg, str *tplname, str *opv) { pv_spec_t *dst; @@ -324,13 +324,13 @@ static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) return -1; } - return pvtpl_apply(msg, tplname, dst); + return pvtpl_render(msg, tplname, dst); } /** * */ -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv) { str tplname; pv_spec_t *dst; @@ -341,7 +341,7 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) } dst = (pv_spec_t *)popv; - return pvtpl_apply(msg, &tplname, dst); + return pvtpl_render(msg, &tplname, dst); } /** @@ -349,8 +349,8 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) */ /* clang-format off */ static sr_kemi_t sr_kemi_pvtpl_exports[] = { - { str_init("pvtpl"), str_init("pvtpl_apply"), - SR_KEMIP_INT, ki_pvtpl_apply, + { str_init("pvtpl"), str_init("pvtpl_render"), + SR_KEMIP_INT, ki_pvtpl_render, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev