sr-dev July 2022

sr-dev@lists.kamailio.org

11 participants
230 discussions

[kamailio/kamailio] Typo in src/modules/siputils/doc/siputils_admin.xml doc (Issue #3200)
by arkadiam 25 Jul '22

25 Jul '22

### Description Typo in function example at src/modules/siputils/doc/siputils_admin.xml: Instead of: ... if(is_first_hop()) { ... } ... if(is_first_hop_mode("1")) { ... } ... example should be: ... if (is_first_hop()) { ... } ... if (is_first_hop("1")) { ... } ... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3200 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3200(a)github.com>

2 2

git:master:ac75a033: siputils: fix typo for is_first_hope, related to gh #3200
by Henning Westerholt 25 Jul '22

25 Jul '22

Module: kamailio Branch: master Commit: ac75a033132740b06d5afcdc17c25d3c354e7d89 URL: https://github.com/kamailio/kamailio/commit/ac75a033132740b06d5afcdc17c25d3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-07-25T18:28:19Z siputils: fix typo for is_first_hope, related to gh #3200 --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ac75a033132740b06d5afcdc17c25d3… Patch: https://github.com/kamailio/kamailio/commit/ac75a033132740b06d5afcdc17c25d3… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index d6480000b7..f636314614 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1193,7 +1193,7 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... -if(is_first_hop_mode("1")) { ... } +if(is_first_hop("1")) { ... } ... </programlisting> </example>

1 0

git:master:913761d5: modules: readme files regenerated - ratelimit ... [skip ci]
by Kamailio Dev 25 Jul '22

25 Jul '22

Module: kamailio Branch: master Commit: 913761d503284952c4f64e9fef31be2d82e06f74 URL: https://github.com/kamailio/kamailio/commit/913761d503284952c4f64e9fef31be2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-25T16:01:50+02:00 modules: readme files regenerated - ratelimit ... [skip ci] --- Modified: src/modules/ratelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/913761d503284952c4f64e9fef31be2… Patch: https://github.com/kamailio/kamailio/commit/913761d503284952c4f64e9fef31be2… --- diff --git a/src/modules/ratelimit/README b/src/modules/ratelimit/README index ecd6fce79a..4862e717f7 100644 --- a/src/modules/ratelimit/README +++ b/src/modules/ratelimit/README @@ -514,5 +514,5 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") The pipes and queues are stored as static vectors, so no more than MAX_PIPES/MAX_QUEUES can be added without recompilation. - * MAX_PIPES - 16 - * MAX_QUEUES - 10 + * MAX_PIPES - 32 + * MAX_QUEUES - 32

1 0

git:master:cae9d78a: ratelimit: fix docs to actual values in the code for queue and pipe limits
by Henning Westerholt 25 Jul '22

25 Jul '22

Module: kamailio Branch: master Commit: cae9d78a6c8d33f6c4ec780901a55c27260c2000 URL: https://github.com/kamailio/kamailio/commit/cae9d78a6c8d33f6c4ec780901a55c2… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-07-25T13:56:12Z ratelimit: fix docs to actual values in the code for queue and pipe limits --- Modified: src/modules/ratelimit/doc/ratelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cae9d78a6c8d33f6c4ec780901a55c2… Patch: https://github.com/kamailio/kamailio/commit/cae9d78a6c8d33f6c4ec780901a55c2… --- diff --git a/src/modules/ratelimit/doc/ratelimit_admin.xml b/src/modules/ratelimit/doc/ratelimit_admin.xml index 57eed26e185..02be16267b5 100644 --- a/src/modules/ratelimit/doc/ratelimit_admin.xml +++ b/src/modules/ratelimit/doc/ratelimit_admin.xml @@ -582,10 +582,10 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") MAX_PIPES/MAX_QUEUES can be added without recompilation. <itemizedlist> <listitem><para> - <emphasis>MAX_PIPES</emphasis> - 16 + <emphasis>MAX_PIPES</emphasis> - 32 </para></listitem> <listitem><para> - <emphasis>MAX_QUEUES</emphasis> - 10 + <emphasis>MAX_QUEUES</emphasis> - 32 </para></listitem> </itemizedlist> </para>

1 0

[kamailio/kamailio] Cannot load usrloc table at startup using DMQ_USRLOC sync feature (Issue #3195)
by Benedito Marques 21 Jul '22

21 Jul '22

I have an scenario with two kamailios, and no databases. At the first, I authenticate one subscriber successfully and save in memory usrloc: ``` # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if (!save("location","0x05")) { sl_reply_error(); } exit; } ``` -- ``` /etc/kamailio # kamcmd ul.dump { Domains: { Domain: { Domain: location Size: 1024 AoRs: { Info: { AoR: 1014(a)my.domain HashID: -1989102610 Contacts: { Contact: { Address: sip:1014@10.0.0.2:7071;ob Expires: 299 Q: -1.000000 Call-ID: d5cf6d5f293647a59ba64ba996a793b0 CSeq: 43689 User-Agent: MicroSIP/3.20.7 Received: sip:10.0.0.2:7071 Path: [not set] State: CS_NEW Flags: 1 CFlags: 0 Socket: [not set] Methods: 8159 Ruid: uloc-62d95ca2-3c-1 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: -1 Keepalive: 0 Last-Keepalive: 1658412252 KA-Roundtrip: 0 Last-Modified: 1658412252 } } } } Stats: { Records: 1 Max-Slots: 1 } } } } /etc/kamailio # ``` **The problem is**: when I start the second kamailio server, the current usrloc users are not replicated to it, so in the second server the usrloc is empty: ``` /etc/kamailio # kamcmd ul.dump { Domains: { Domain: { Domain: location Size: 1024 AoRs: { } Stats: { Records: 0 Max-Slots: 0 } } } } ``` **The modules loaded:** - dmq.so - dmq_usrloc.so **Params (sync enabled):** modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "usrloc_domain", "location") modparam("dmq_usrloc", "usrloc_delete", 1) modparam("dmq_usrloc", "replicate_socket_info", 0) **Obs**: The DMQ replication is working perfectly. So, if I register another user in server 1, server 2 receives the KDMQ message and the new user appears on usrloc. The real problem is to load pre registered users at startup. **Log messages from second server at startup:** ``` 0(51) DEBUG: <core> [core/sr_module.c:873]: init_mod(): dmq_usrloc 0(51) INFO: dmq_usrloc [dmq_usrloc.c:81]: mod_init(): dmq usrloc replication mode = 1 0(51) DEBUG: <core> [core/sr_module.c:652]: find_mod_export_record(): found export of <ul_bind_usrloc> in module usrloc [/usr/lib/kamailio/modules/usrloc.so] 0(51) DEBUG: <core> [core/sr_module.c:652]: find_mod_export_record(): found export of <bind_dmq> in module dmq [/usr/lib/kamailio/modules/dmq.so] 0(51) DEBUG: dmq_usrloc [usrloc_sync.c:286]: usrloc_dmq_initialize(): loaded dmq api 0(51) DEBUG: dmq_usrloc [usrloc_sync.c:299]: usrloc_dmq_initialize(): dmq peer registered 0(51) DEBUG: dmq_usrloc [dmq_usrloc.c:111]: mod_init(): dmq_usrloc initialized 0(51) DEBUG: <core> [core/sr_module.c:804]: init_mod_child(): idx 0 rank -127: dmq_usrloc [main] 0(51) DEBUG: dmq_usrloc [dmq_usrloc.c:127]: child_init(): child_init PROC_INIT 7(62) DEBUG: dmq_usrloc [usrloc_sync.c:552]: usrloc_dmq_request_sync(): requesting sync from dmq peers 0(51) DEBUG: <core> [core/sr_module.c:804]: init_mod_child(): idx 0 rank 0: dialog [main] 7(62) DEBUG: dmq_usrloc [usrloc_sync.c:568]: usrloc_dmq_request_sync(): sending serialized data {"action":3} 7(62) DEBUG: dmq_usrloc [usrloc_sync.c:317]: usrloc_dmq_send(): sending dmq broadcast... 7(62) DEBUG: dmq [dmq_funcs.c:166]: bcast_dmq_message1(): skipping node sip:10.0.2.38:5090 7(62) DEBUG: dmq [dmq_funcs.c:166]: bcast_dmq_message1(): skipping node sip:10.0.2.30:5090 7(62) DEBUG: dmq [dmq_funcs.c:166]: bcast_dmq_message1(): skipping node sip:0.0.0.0:5090 ``` **List nodes at SERVER 1:** ``` /etc/kamailio # kamcmd dmq.list_nodes { host: 10.0.1.36 port: 5090 resolved_ip: 10.0.1.36 status: active last_notification: 0 local: 0 } { host: 10.0.1.35 port: 5090 resolved_ip: 10.0.1.35 status: active last_notification: 0 local: 0 } { host: 0.0.0.0 port: 5090 resolved_ip: 0.0.0.0 status: active last_notification: 0 local: 1 } ``` **List nodes at SERVER 2:** ``` /etc/kamailio # kamcmd dmq.list_nodes { host: 10.0.1.35 port: 5090 resolved_ip: 10.0.1.35 status: active last_notification: 0 local: 0 } { host: 10.0.1.36 port: 5090 resolved_ip: 10.0.1.36 status: active last_notification: 0 local: 0 } { host: 0.0.0.0 port: 5090 resolved_ip: 0.0.0.0 status: active last_notification: 0 local: 1 } ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3195 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3195(a)github.com>

2 2

git:master:b8bf86eb: app_python3: use new Python 3.10+ API functions for tracking execution
by Daniel-Constantin Mierla 21 Jul '22

21 Jul '22

Module: kamailio Branch: master Commit: b8bf86eb11a17c853450e5c7f81d2446cf719fbc URL: https://github.com/kamailio/kamailio/commit/b8bf86eb11a17c853450e5c7f81d244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-21T20:15:29+02:00 app_python3: use new Python 3.10+ API functions for tracking execution - GH #3187 --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b8bf86eb11a17c853450e5c7f81d244… Patch: https://github.com/kamailio/kamailio/commit/b8bf86eb11a17c853450e5c7f81d244… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 421db19b78..47a34a4cb6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1810,6 +1810,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; +#if PY_VERSION_HEX >= 0x03100000 + PyCodeObject *pcode = NULL; +#endif struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; @@ -1832,10 +1835,27 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); - if (pstate != NULL && pstate->frame != NULL) { + if (pstate != NULL) { +#if PY_VERSION_HEX >= 0x03100000 + pframe = PyThreadState_GetFrame(pstate); + if(pframe != NULL) { + pcode = PyFrame_GetCode(pframe); + } +#else pframe = pstate->frame; +#endif } +#if PY_VERSION_HEX >= 0x03100000 + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (file:%s func:%s line:%d)\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, + (pcode)?PyBytes_AsString(pcode->co_filename):"", + (pcode)?PyBytes_AsString(pcode->co_name):"", + (pframe)?PyFrame_GetLineNumber(pframe):0); +#else LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n", @@ -1844,6 +1864,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); +#endif } }

1 0

[kamailio/kamailio] kamctl:Index "inserted_time"+"status" in watchers (PR #3182)
by Alessio Garzi 21 Jul '22

21 Jul '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 Function ps_watchers_db_timer_clean() inside src/modules/presence/subscribe.c is called repeatedly on my setup. Each time is called it performs a delete inside table watchers comparing columns inserted_time and status which are not indexed: ``` MariaDB [kamailio]> explain delete from `watchers` where `inserted_time`<1656252889 AND `status`=2; +------+-------------+----------+------+---------------+------+---------+------+------+-------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +------+-------------+----------+------+---------------+------+---------+------+------+-------------+ | 1 | SIMPLE | watchers | ALL | NULL | NULL | NULL | NULL | 1 | Using where | +------+-------------+----------+------+---------------+------+---------+------+------+-------------+ ``` Can we consider adding an index improving performance a bit? ``` MariaDB [kamailio]> CREATE INDEX inserted_time_status_idx ON watchers (`inserted_time`, `status`); Query OK, 0 rows affected (0.015 sec) Records: 0 Duplicates: 0 Warnings: 0 MariaDB [kamailio]> explain delete from `watchers` where `inserted_time`<1656252889 AND `status`=2; +------+-------------+----------+-------+--------------------------+--------------------------+---------+------+------+-------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +------+-------------+----------+-------+--------------------------+--------------------------+---------+------+------+-------------+ | 1 | SIMPLE | watchers | range | inserted_time_status_idx | inserted_time_status_idx | 4 | NULL | 1 | Using where | +------+-------------+----------+-------+--------------------------+--------------------------+---------+------+------+-------------+ 1 row in set (0.001 sec) ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3182 -- Commit Summary -- * kamctl:Index "inserted_time"+"status" in watchers -- File Changes -- M utils/kamctl/mysql/presence-create.sql (2) M utils/kamctl/postgres/presence-create.sql (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3182.patch https://github.com/kamailio/kamailio/pull/3182.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3182 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3182(a)github.com>

3 5

git:master:45c38614: kamctl: regenerated db schema files
by Henning Westerholt 21 Jul '22

21 Jul '22

Module: kamailio Branch: master Commit: 45c38614cbdc9bde2fa4b1836ae5aef5793b51d4 URL: https://github.com/kamailio/kamailio/commit/45c38614cbdc9bde2fa4b1836ae5aef… Author: Alessio Garzi <agarzi(a)sipwise.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-07-21T16:07:39+02:00 kamctl: regenerated db schema files - regenerated db schema files for table watchers after addition of index time_status_idx --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/45c38614cbdc9bde2fa4b1836ae5aef… Patch: https://github.com/kamailio/kamailio/commit/45c38614cbdc9bde2fa4b1836ae5aef… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index aacc80b5826..ef47c600984 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -69,6 +69,8 @@ CREATE TABLE watchers ( CONSTRAINT watchers_watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) ); +CREATE INDEX watchers_time_status_idx ON watchers (inserted_time, status); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE xcap ( diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index a3b3d9befef..71283ad7c88 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -69,6 +69,8 @@ CREATE TABLE `watchers` ( CONSTRAINT watcher_idx UNIQUE (`presentity_uri`, `watcher_username`, `watcher_domain`, `event`) ); +CREATE INDEX time_status_idx ON watchers (`inserted_time`, `status`); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE `xcap` ( diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index e63664f0881..eb65f1e928b 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -93,6 +93,8 @@ END watchers_tr; / BEGIN map2users('watchers'); END; / +CREATE INDEX watchers_time_status_idx ON watchers (inserted_time, status); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE xcap ( diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index b17bd76ef51..d2ca3de67b6 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -69,6 +69,8 @@ CREATE TABLE watchers ( CONSTRAINT watchers_watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) ); +CREATE INDEX watchers_time_status_idx ON watchers (inserted_time, status); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE xcap (

1 0

git:master:3e916b2d: lib/srdb1: Index "inserted_time"+"status" in watchers
by Henning Westerholt 21 Jul '22

21 Jul '22

Module: kamailio Branch: master Commit: 3e916b2ddf8a2a4a4db5ecbf6e64f7e4e23dc246 URL: https://github.com/kamailio/kamailio/commit/3e916b2ddf8a2a4a4db5ecbf6e64f7e… Author: Alessio Garzi <agarzi(a)sipwise.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-07-21T16:07:39+02:00 lib/srdb1: Index "inserted_time"+"status" in watchers - New index for watchers table for columns "inserted_time" and "status". This is a little performance boost since the function ps_watchers_db_timer_clean() cleans pending subscriptions using this columns inside the "where" clause. New index has been added to both Postgres and Mysql/MariaDB backends. --- Modified: src/lib/srdb1/schema/pr_watchers.xml --- Diff: https://github.com/kamailio/kamailio/commit/3e916b2ddf8a2a4a4db5ecbf6e64f7e… Patch: https://github.com/kamailio/kamailio/commit/3e916b2ddf8a2a4a4db5ecbf6e64f7e… --- diff --git a/src/lib/srdb1/schema/pr_watchers.xml b/src/lib/srdb1/schema/pr_watchers.xml index e5bdbffa404..919cf42a0f6 100644 --- a/src/lib/srdb1/schema/pr_watchers.xml +++ b/src/lib/srdb1/schema/pr_watchers.xml @@ -63,7 +63,7 @@ <natural/> </column> - <column> + <column id="status"> <name>status</name> <type>int</type> <size>11</size> @@ -78,7 +78,7 @@ <description>Reason</description> </column> - <column> + <column id="inserted_time"> <name>inserted_time</name> <type>int</type> <size>11</size> @@ -93,4 +93,10 @@ <unique/> </index> + <index> + <name>time_status_idx</name> + <colref linkend="inserted_time"/> + <colref linkend="status"/> + </index> + </table>

1 0

git:master:9b905296: dialog: formatting and logs adjustments
by Daniel-Constantin Mierla 20 Jul '22

20 Jul '22

Module: kamailio Branch: master Commit: 9b9052960ab190157744a429e4961d0d9d456f3a URL: https://github.com/kamailio/kamailio/commit/9b9052960ab190157744a429e4961d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-20T08:28:20+02:00 dialog: formatting and logs adjustments --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/9b9052960ab190157744a429e4961d0… Patch: https://github.com/kamailio/kamailio/commit/9b9052960ab190157744a429e4961d0…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2022