- sr-dev - kamailio.org

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev