- sr-dev - kamailio.org

[kamailio/kamailio] tools/kemi: update kemi_mock for python (PR #3751)
by tsearle 09 Feb '24

09 Feb '24

fixes code generation when python keywords are used fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' made example more complete   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3751 -- Commit Summary -- * tools/kemi: update kemi_mock for python -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (51) M misc/tools/kemi/python_mock/test.py (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3751.patch https://github.com/kamailio/kamailio/pull/3751.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3751 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3751(a)github.com>

2 2

git:master:3e1a7bb5: tools/kemi: update kemi_mock for python (#3751)
by GitHub 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 3e1a7bb5f6143383b1f486b8c67c3bf97cb32a3f URL: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-02-09T10:17:58+01:00 tools/kemi: update kemi_mock for python (#3751) fixes code generation when python keywords are uses fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' --- Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Patch: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf…

1 0

git:master:6918c9e3: modules: readme files regenerated - ldap ... [skip ci]
by Kamailio Dev 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 6918c9e34b826f8d8c7fb1746851055fa35f8ece URL: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-09T10:01:34+01:00 modules: readme files regenerated - ldap ... [skip ci] --- Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Patch: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… --- diff --git a/src/modules/ldap/README b/src/modules/ldap/README index 921f45822f1..d69005f864e 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -31,6 +31,7 @@ Christian Schlatter 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -82,12 +83,13 @@ Christian Schlatter 1.6. ldap_client_bind_timeout example 1.7. Example LDAP Configuration File 1.8. config_file parameter usage - 1.9. Example Usage of ldap_url - 1.10. Example Usage + 1.9. Set connect_mode parameter + 1.10. Example Usage of ldap_url 1.11. Example Usage 1.12. Example Usage 1.13. Example Usage 1.14. Example Usage + 1.15. Example Usage 2.1. Example code fragment to load LDAP module API 2.2. Example LDAP module API function call @@ -114,6 +116,7 @@ Chapter 1. Admin Guide 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -418,6 +421,7 @@ ldap_client_bind_timeout = 500 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 4.1. config_file (string) @@ -428,6 +432,17 @@ ldap_client_bind_timeout = 500 Example 1.8. config_file parameter usage modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") +4.2. connect_mode (int) + + Control if the module must stop loading when connecting to server fails + during start up. Values: 0 - stop loading; 1 - continue even if + connecting to database server fails.. + + Default value: 0 + + Example 1.9. Set connect_mode parameter +modparam("ldap", "connect_mode", 1) + 5. Functions 5.1. ldap_search(ldap_url) @@ -458,7 +473,7 @@ modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") Kamailio pseudo variables and AVPs included in ldap_url do get substituted with their value. - Example 1.9. Example Usage of ldap_url + Example 1.10. Example Usage of ldap_url Search with LDAP session named sipaccounts, base ou=sip,dc=example,dc=com, one level deep using search filter @@ -492,7 +507,7 @@ ldap://ldap_1/dc=example,dc=com? This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.10. Example Usage + Example 1.11. Example Usage ... # ldap search if (!ldap_search("ldap://sipaccounts/ou=sip,dc=example,dc=com??one?(cn=$rU)")) @@ -570,7 +585,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.11. Example Usage + Example 1.12. Example Usage ... # ldap_search call @@ -639,7 +654,7 @@ ldap_result("SIPIdentitySIPURI/$avp(i:10)", "/^[^@]+@(.+)$/\1/"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.12. Example Usage + Example 1.13. Example Usage ... # ldap_search call ... @@ -688,7 +703,7 @@ if (!ldap_result_check("sn/$ru", "/^sip:([^@]).*$/\1/")) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.13. Example Usage + Example 1.14. Example Usage ... # ldap_search call ... @@ -745,7 +760,7 @@ if (ldap_result_next()) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.14. Example Usage + Example 1.15. Example Usage ... if (!ldap_filter_url_encode("cn=$avp(s:name)", "$avp(s:name_esc)")) {

1 0

[kamailio/kamailio] Ldap: option to start even when connecting to ldap server fails (PR #3747)
by Xenofon Karamanos 09 Feb '24

09 Feb '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 give the option for ldap to allow kamailio to start-up even if server is not reachable/available when starting. It follows similar logic to https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465… for SQL. A new config parameter for `ldap` module is defined, `connect_mode`, that defaults to 0, preserving the old behavior. If it's set `1`, `kamailio` will not exit and allow `ldap` to try and reconnect when necessary. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3747 -- Commit Summary -- * ldap: option to start even when connecting to server fails * ldap/docs: Add connect_mode docs -- File Changes -- M src/modules/ldap/doc/ldap_admin.xml (18) M src/modules/ldap/ldap_mod.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3747.patch https://github.com/kamailio/kamailio/pull/3747.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3747 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3747(a)github.com>

3 4

git:master:e7397acb: ldap/docs: Add connect_mode docs
by Henning Westerholt 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: e7397acb86db5cf0a214fe7f2812e21130e7b2f6 URL: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap/docs: Add connect_mode docs --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Patch: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 3337dd2be0c..2bb2c3a5ef4 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -455,6 +455,23 @@ modparam("ldap", "config_file", "/usr/local/etc/&kamailiobinary;/ldap.ini") </programlisting> </example> </section> + + <section> + <title><varname>connect_mode</varname> (int)</title> + + <para>Control if the module must stop loading when connecting to server fails during start up. Values: 0 - stop loading; 1 - continue even if connecting to database server fails..</para> + <para>Default value: + <varname>0</varname></para> + + <example> + <title>Set <varname>connect_mode</varname> parameter</title> + + <programlisting format="linespecific"> +modparam("ldap", "connect_mode", 1) + </programlisting> + </example> + </section> + </section> <section> @@ -1079,4 +1096,3 @@ if (ldap_search( </section> </section> </chapter> -

1 0

git:master:3120d1df: ldap: option to start even when connecting to server fails
by Henning Westerholt 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 3120d1dfcfa393b90272526e6fe2efb3aa32a19d URL: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap: option to start even when connecting to server fails --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Patch: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index fada29a3023..de0e25b1545 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -80,6 +80,7 @@ static int w_ldap_result_check_2( * Default module parameter values */ #define DEF_LDAP_CONFIG "/usr/local/etc/kamailio/ldap.cfg" +static int ldap_connect_mode = 0; /* * Module parameter variables @@ -125,6 +126,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"config_file", PARAM_STR, &ldap_config}, + {"connect_mode", PARAM_INT, &ldap_connect_mode}, {0, 0, 0} }; @@ -151,6 +153,7 @@ static int child_init(int rank) { int i = 0, ld_count = 0; char *ld_name; + int ret = 0; /* don't do anything for non-worker processes */ if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN) @@ -168,9 +171,15 @@ static int child_init(int rank) } if(oldap_connect(ld_name) != 0) { - LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); - ldap_disconnect(ld_name); - return -1; + if(ldap_connect_mode == 1) { + LM_INFO("[%s]: Failed to connect to LDAP host(s) but start " + "without connection enabled - proceed", + ld_name); + } else { + LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); + ldap_disconnect(ld_name); + return -1; + } } }

1 0

[kamailio/kamailio] RTPengine call was not terminated on BYE (Issue #3749)
by sergey-safarov 09 Feb '24

09 Feb '24

### Description Via sngrep I can see call was terminated via BYE message but was not terminated on RTPengine hosts. The `rtpengine-ctl list sessions all` show calls that was terminated properly via BYE message. In the kamailio config used `rtpengine_manage` function. I do not have any idea how to troubleshoot this. Could you suggest next step and I will add more details for this issue ### Additional Information * **Kamailio Version** Used 5.6.4 with small customization. ``` version: kamailio 5.6.4 (aarch64/linux) 06ad45 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-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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 06ad45 compiled on 16:37:11 Aug 7 2023 with gcc 8.5.0 ``` * **Operating System**: CentOS 8 Stream, aarch64 ``` [root@sbc-a0 ~]# uname -a Linux sbc-a0.nga911.com 4.19.113-300.el8.aarch64 #1 SMP Fri May 12 11:47:07 UTC 2023 aarch64 aarch64 aarch64 GNU/Linux [root@sbc-a0 ~]# cat /etc/os-release 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/3749 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3749(a)github.com>

2 2

[kamailio/kamailio] [DRAFT]: restrict thread execution to process_no = 0 (PR #3744)
by space88man 08 Feb '24

08 Feb '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 @henning @miconda this is a draft for the 5.7 stable branch which disables threading for process_no > 0. This restricts thread wrappers to the parent process. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3744 -- Commit Summary -- * [DRAFT]: restrict thread execution to process_no = 0 -- File Changes -- M src/core/rthreads.h (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3744.patch https://github.com/kamailio/kamailio/pull/3744.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3744 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3744(a)github.com>

4 9

git:5.7:f4edfd47: db_mysql: libssl thread guard for db_mysql_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: f4edfd47aa18aecaf5650bb39a69c6e800c14f2d URL: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_mysql: libssl thread guard for db_mysql_close --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… Patch: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index e86e4a0391b..7b65c0a012c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -40,6 +40,7 @@ #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -228,11 +229,16 @@ db1_con_t *db_mysql_init(const str *_url) * \param _h handle to the closed connection * \return zero on success, negative value on failure */ -void db_mysql_close(db1_con_t *_h) +static void db_mysql_close_impl(db1_con_t *_h) { db_do_close(_h, db_mysql_free_connection); } +void db_mysql_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_mysql_close_impl, _h); +} + /** * Retrieve a result set

1 0

git:5.7:58082265: db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query)
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 5808226593fcf11d4713b2161809466568c51682 URL: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query) --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… Patch: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index 7a5f2bdb09e..01aab5bb273 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -26,6 +26,8 @@ #include "../../core/dprint.h" #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_4P5I2P2 +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" @@ -254,11 +256,16 @@ db1_con_t *db_unixodbc_init(const str *_url) * Shut down database module * No function should be called after this */ -void db_unixodbc_close(db1_con_t *_h) +static void db_unixodbc_close_impl(db1_con_t *_h) { return db_do_close(_h, db_unixodbc_free_connection); } +void db_unixodbc_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_unixodbc_close_impl, _h); +} + /* * Retrieve result set */ @@ -299,7 +306,7 @@ static int db_unixodbc_store_result(const db1_con_t *_h, db1_res_t **_r) /* * Release a result set from memory */ -int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) { if((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -315,6 +322,11 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) return 0; } +int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +{ + return run_thread4PP((_thread_proto4PP)db_unixodbc_free_result_impl, _h, _r); +} + /* * Query table for specified rows * _h: structure representing database connection @@ -326,7 +338,7 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) * _nc: number of columns to return * _o: order by the specified column */ -int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, +static int db_unixodbc_query_impl(const db1_con_t *_h, const db_key_t *_k, const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) { @@ -335,6 +347,15 @@ int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, db_unixodbc_store_result); } +int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, + const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, + const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) +{ + return run_thread4P5I2P2((_thread_proto4P5I2P2)db_unixodbc_query_impl, + (void *)_h, (void *)_k, (void *)_op, (void *)_v, (void *)_c, _n, + _nc, (void *)_o, (void *)_r); +} + /*! * \brief Gets a partial result set, fetch rows from a result *

1 0

git:5.7:0936b6b7: db_postgres: libssl thread guard for db_postgres_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 0936b6b70efe2e9d05766ce925ca10e4ff4bf7be URL: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_postgres: libssl thread guard for db_postgres_close --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… Patch: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 7948ff0075f..e8dce6e09ea 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -45,6 +45,7 @@ #include "../../core/clist.h" #define KSR_RTHREAD_NEED_PI #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" @@ -147,11 +148,16 @@ db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) * \param _h closed connection, as returned from db_postgres_init * \note free all memory and resources */ -void db_postgres_close(db1_con_t *_h) +static void db_postgres_close_impl(db1_con_t *_h) { db_do_close(_h, db_postgres_free_connection); } +void db_postgres_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_postgres_close_impl, _h); +} + /*! * \brief Submit_query, run a query

1 0

git:5.7:0d0c9910: core/rthreads.h: thread wrapper for db_XXXX_query
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 0d0c9910095e3e87a4d27be5af30f02cd5f26020 URL: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 core/rthreads.h: thread wrapper for db_XXXX_query --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… Patch: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index add3426d4db..fa60ccef071 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -195,3 +195,55 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #endif /* USE_TLS */ } #endif + +/* + * prototype: + * db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, + * const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, + * const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) + */ +#ifdef KSR_RTHREAD_NEED_4P5I2P2 +typedef int (*_thread_proto4P5I2P2)( + void *, void *, void *, void *, void *, int, int, void *, void *); +struct _thread_args4P5I2P2 +{ + _thread_proto4P5I2P2 fn; + void *arg1; + void *arg2; + void *arg3; + void *arg4; + void *arg5; + int arg6; + int arg7; + void *arg8; + void *arg9; + int *ret; +}; +static void *run_thread_wrap4P5I2P2(struct _thread_args4P5I2P2 *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2, args->arg3, args->arg4, + args->arg5, args->arg6, args->arg7, args->arg8, args->arg9); + return NULL; +} + +static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, + void *arg3, void *arg4, void *arg5, int arg6, int arg7, void *arg8, + void *arg9) +{ +#ifdef USE_TLS + pthread_t tid; + int ret; + + if(likely(process_no)) { + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2, + &(struct _thread_args4P5I2P2){fn, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8, arg9, &ret}); + pthread_join(tid, NULL); + return ret; +#else + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +#endif +} +#endif

1 0

git:5.7:f0289725: core/rthreads.h: use thread wrappers only for process#0
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: f028972588296858429e28f941a085131af8084c URL: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T17:36:38+08:00 core/rthreads.h: use thread wrappers only for process#0 - for process#0 use threads to avoid initializing libssl thread-locals in thread#1 - for process_no > 0 revert to standard behaviour and reduce overhead of creating threads --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… Patch: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a416ad2ca50..add3426d4db 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -35,13 +35,20 @@ typedef void *(*_thread_proto)(void *); #ifndef KSR_RTHREAD_SKIP_P static void *run_threadP(_thread_proto fn, void *arg) { +#ifdef USE_TLS pthread_t tid; void *ret; + if(likely(process_no)) { + return fn(arg); + } pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); return ret; +#else + return fn(arg); +#endif /* USE_TLS */ } #endif @@ -63,14 +70,21 @@ static void *run_thread_wrapPI(struct _thread_argsPI *args) static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) { +#ifdef USE_TLS pthread_t tid; void *ret; + if(likely(process_no)) { + return fn(arg1, arg2); + } pthread_create(&tid, NULL, (_thread_proto)&run_thread_wrapPI, &(struct _thread_argsPI){fn, arg1, arg2}); pthread_join(tid, &ret); return ret; +#else + return fn(arg1, arg2); +#endif /* USE_TLS */ } #endif @@ -91,11 +105,20 @@ static void *run_thread_wrapV(struct _thread_argsV *args) static void run_threadV(_thread_protoV fn) { +#ifdef USE_TLS pthread_t tid; + if(likely(process_no)) { + fn(); + return; + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); +#else + fn(); +#endif /* USE_TLS */ } #endif @@ -119,14 +142,22 @@ static void *run_thread_wrap4PP(struct _thread_args4PP *args) static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) { +#ifdef USE_TLS pthread_t tid; int ret; + if(likely(process_no)) { + return fn(arg1, arg2); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, &(struct _thread_args4PP){fn, arg1, arg2, &ret}); pthread_join(tid, NULL); return ret; +#else + return fn(arg1, arg2); +#endif } #endif @@ -148,10 +179,19 @@ static void *run_thread_wrap0P(struct _thread_args0P *args) static void run_thread0P(_thread_proto0P fn, void *arg1) { +#ifdef USE_TLS pthread_t tid; + if(likely(process_no)) { + fn(arg1); + return; + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); +#else + fn(arg1); +#endif /* USE_TLS */ } #endif

1 0

git:master:7043a581: db_mysql: libssl thread guard for db_mysql_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: 7043a581c4cfe05d6f9a0161368a61f7c67e326c URL: https://github.com/kamailio/kamailio/commit/7043a581c4cfe05d6f9a0161368a61f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-09T07:05:17+08:00 db_mysql: libssl thread guard for db_mysql_close --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/7043a581c4cfe05d6f9a0161368a61f… Patch: https://github.com/kamailio/kamailio/commit/7043a581c4cfe05d6f9a0161368a61f… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index e86e4a0391b..7b65c0a012c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -40,6 +40,7 @@ #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -228,11 +229,16 @@ db1_con_t *db_mysql_init(const str *_url) * \param _h handle to the closed connection * \return zero on success, negative value on failure */ -void db_mysql_close(db1_con_t *_h) +static void db_mysql_close_impl(db1_con_t *_h) { db_do_close(_h, db_mysql_free_connection); } +void db_mysql_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_mysql_close_impl, _h); +} + /** * Retrieve a result set

1 0

git:master:c393d5d5: db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query)
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: c393d5d5d167bdbf9a2f465effdc761195ed1279 URL: https://github.com/kamailio/kamailio/commit/c393d5d5d167bdbf9a2f465effdc761… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-09T07:05:17+08:00 db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query) --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/c393d5d5d167bdbf9a2f465effdc761… Patch: https://github.com/kamailio/kamailio/commit/c393d5d5d167bdbf9a2f465effdc761… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index 7a5f2bdb09e..aa2387ee26e 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -26,6 +26,8 @@ #include "../../core/dprint.h" #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_4P5I2P2 +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" @@ -254,11 +256,16 @@ db1_con_t *db_unixodbc_init(const str *_url) * Shut down database module * No function should be called after this */ -void db_unixodbc_close(db1_con_t *_h) +static void db_unixodbc_close_impl(db1_con_t *_h) { return db_do_close(_h, db_unixodbc_free_connection); } +void db_unixodbc_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_unixodbc_close_impl, _h); +} + /* * Retrieve result set */ @@ -299,7 +306,7 @@ static int db_unixodbc_store_result(const db1_con_t *_h, db1_res_t **_r) /* * Release a result set from memory */ -int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) { if((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -315,6 +322,12 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) return 0; } +int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +{ + return run_thread4PP( + (_thread_proto4PP)db_unixodbc_free_result_impl, _h, _r); +} + /* * Query table for specified rows * _h: structure representing database connection @@ -326,7 +339,7 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) * _nc: number of columns to return * _o: order by the specified column */ -int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, +static int db_unixodbc_query_impl(const db1_con_t *_h, const db_key_t *_k, const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) { @@ -335,6 +348,15 @@ int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, db_unixodbc_store_result); } +int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, + const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, + const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) +{ + return run_thread4P5I2P2((_thread_proto4P5I2P2)db_unixodbc_query_impl, + (void *)_h, (void *)_k, (void *)_op, (void *)_v, (void *)_c, _n, + _nc, (void *)_o, (void *)_r); +} + /*! * \brief Gets a partial result set, fetch rows from a result *

1 0

git:master:e33911f5: db_postgres: libssl thread guard for db_postgres_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: e33911f5edbac36f54b6371f9b952b57488bcced URL: https://github.com/kamailio/kamailio/commit/e33911f5edbac36f54b6371f9b952b5… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-09T07:05:17+08:00 db_postgres: libssl thread guard for db_postgres_close --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/e33911f5edbac36f54b6371f9b952b5… Patch: https://github.com/kamailio/kamailio/commit/e33911f5edbac36f54b6371f9b952b5… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 7948ff0075f..e8dce6e09ea 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -45,6 +45,7 @@ #include "../../core/clist.h" #define KSR_RTHREAD_NEED_PI #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" @@ -147,11 +148,16 @@ db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) * \param _h closed connection, as returned from db_postgres_init * \note free all memory and resources */ -void db_postgres_close(db1_con_t *_h) +static void db_postgres_close_impl(db1_con_t *_h) { db_do_close(_h, db_postgres_free_connection); } +void db_postgres_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_postgres_close_impl, _h); +} + /*! * \brief Submit_query, run a query

1 0

[kamailio/kamailio] kamailio.cfg with MySQL/PostgreSQL: audit for all libssl calls (PR #3748)
by space88man 08 Feb '24

08 Feb '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 Audit of libssl calls with default kamailio.cfg + database using MariaDB and PostgreSQL and add libssl thread guards. Debian 12: for the default kamailio.cfg we build db_mysql / db_postgres / db_unixodbc and enable database with SSL 1. mariadb-client, libmariadb-dev, odbc-mariadb 2. postgresql-15, postgresql-client-15, odbc-postgresql This PR adds thread guards for all function calls that touch thread-locals in process#0thread1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3748 -- Commit Summary -- * core/rthreads.h: thread wrapper for db_XXXX_query * db_postgres: libssl thread guard for db_postgres_close * db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query) * db_mysql: libssl thread guard for db_mysql_close -- File Changes -- M src/core/rthreads.h (53) M src/modules/db_mysql/km_dbase.c (8) M src/modules/db_postgres/km_dbase.c (8) M src/modules/db_unixodbc/dbase.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3748.patch https://github.com/kamailio/kamailio/pull/3748.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3748 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3748(a)github.com>

1 1

git:master:4baa76cd: core/rthreads.h: thread wrapper for db_XXXX_query
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: 4baa76cd3e0d4052baf037c663a898fd11c54514 URL: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-09T07:05:17+08:00 core/rthreads.h: thread wrapper for db_XXXX_query --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… Patch: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 2f922be5a75..e96f45c9395 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -201,3 +201,56 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #endif } #endif + +/* + * prototype: + * db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, + * const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, + * const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) + */ +#ifdef KSR_RTHREAD_NEED_4P5I2P2 +typedef int (*_thread_proto4P5I2P2)( + void *, void *, void *, void *, void *, int, int, void *, void *); +struct _thread_args4P5I2P2 +{ + _thread_proto4P5I2P2 fn; + void *arg1; + void *arg2; + void *arg3; + void *arg4; + void *arg5; + int arg6; + int arg7; + void *arg8; + void *arg9; + int *ret; +}; +static void *run_thread_wrap4P5I2P2(struct _thread_args4P5I2P2 *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2, args->arg3, args->arg4, + args->arg5, args->arg6, args->arg7, args->arg8, args->arg9); + return NULL; +} + +static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, + void *arg3, void *arg4, void *arg5, int arg6, int arg7, void *arg8, + void *arg9) +{ +#ifdef USE_TLS + pthread_t tid; + int ret; + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2, + &(struct _thread_args4P5I2P2){fn, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8, arg9, &ret}); + pthread_join(tid, NULL); + return ret; +#else + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +#endif +} +#endif

1 0

git:master:5844207c: influxdbc: functions for kemi framework
by Daniel-Constantin Mierla 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: 5844207ce42ef830fe560e408c6e807184c8d31e URL: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-08T16:31:19+01:00 influxdbc: functions for kemi framework --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… Patch: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 0ec502a7d71..90f6107ac68 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -165,6 +165,16 @@ static int w_influxdbc_measure(sip_msg_t *msg, char *pname, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_measure(sip_msg_t *msg, str *name) +{ + ic_measure(name->s); + + return 1; +} + /** * */ @@ -175,6 +185,16 @@ static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_measureend(sip_msg_t *msg) +{ + ic_measureend(); + + return 1; +} + /** * */ @@ -212,6 +232,16 @@ static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_push(sip_msg_t *msg) +{ + ic_push(); + + return 1; +} + /** * */ @@ -234,6 +264,16 @@ static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue) return 1; } +/** + * + */ +static int ki_influxdbc_long(sip_msg_t *msg, str *name, int val) +{ + ic_long(name->s, val); + + return 1; +} + /** * */ @@ -288,6 +328,27 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) */ /* clang-format off */ static sr_kemi_t sr_kemi_influxdbc_exports[] = { + { str_init("influxdbc"), str_init("measure"), + SR_KEMIP_INT, ki_influxdbc_measure, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("measureend"), + SR_KEMIP_INT, ki_influxdbc_measureend, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("ic_long"), + SR_KEMIP_INT, ki_influxdbc_long, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("push"), + SR_KEMIP_INT, ki_influxdbc_push, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:c8306ceb: influxdb: added missing for sub start and end
by Daniel-Constantin Mierla 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: c8306ceb46c201172f84f72e5566922c22578fc2 URL: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-08T08:02:49+01:00 influxdb: added missing for sub start and end --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… Patch: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 2c2f8804bb4..0ec502a7d71 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -47,6 +47,8 @@ static char *_infdbc_tags = NULL; static int w_influxdbc_measure(sip_msg_t *msg, char *pname, char *p2); static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2); +static int w_influxdbc_sub(sip_msg_t *msg, char *pname, char *p2); +static int w_influxdbc_subend(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_string(sip_msg_t *msg, char *pname, char *pvalue); @@ -62,6 +64,10 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"influxdbc_measureend", (cmd_function)w_influxdbc_measureend, 0, 0, 0, ANY_ROUTE}, + {"influxdbc_sub", (cmd_function)w_influxdbc_sub, + 1, fixup_spve_null, 0, ANY_ROUTE}, + {"influxdbc_subend", (cmd_function)w_influxdbc_subend, + 0, 0, 0, ANY_ROUTE}, {"influxdbc_push", (cmd_function)w_influxdbc_push, 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, @@ -169,6 +175,33 @@ static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int w_influxdbc_sub(sip_msg_t *msg, char *pname, char *p2) +{ + str sname; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + + ic_sub(sname.s); + + return 1; +} + +/** + * + */ +static int w_influxdbc_subend(sip_msg_t *msg, char *p1, char *p2) +{ + ic_subend(); + + return 1; +} + /** * */

1 0

[kamailio/kamailio] topos: add compatiblity for early in-dialog NOTIFY (PR #3627)
by Maurits de Ruiter 07 Feb '24

07 Feb '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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description After enabling the Topos module, we ran into a bit of trouble with early in-dialog notifies. We use the `event: talk` package from Cisco Broadsoft to be able to do call control, as described in chapter 6 here: https://pubhub.devnetcloud.com/media/broadsoft-docs/docs/pdf/BW-SIPAccessSi… This will send a NOTIFY with a header `Event: talk` before the first `200 OK`. Currently this doesn't work with the topos module, since the NOTIFY method without a B-side contact will not check the INVITE record. When added to those methods in `tps_msg.c`, it tries to check the SUBSCRIBE for all NOTIFY's in `tps_storage.c`. The NOTIFY with `Event: talk` will follow on an INVITE, so there was a small change needed there. I've limited it to just the NOTIFY's with the `Event: talk` header, to minimize any impact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3627 -- Commit Summary -- * topos: add compatiblity for early in-dialog NOTIFY -- File Changes -- M src/modules/topos/tps_msg.c (5) M src/modules/topos/tps_storage.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3627.patch https://github.com/kamailio/kamailio/pull/3627.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3627 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3627(a)github.com>

3 19

Working with arrays in MongoDB documents
by mario.pereira＠quobis.com 07 Feb '24

07 Feb '24

Hi everybody, I normally use MongoDB as DB engine in my projects and I would like to get all MongoDB advantages when working with Kamailio. For this reason, I need to deal with arrays of information inside a document (for example, an array of contacts inside a document). And now the question: is it possible to insert, update and search info in a MongoDB document by using arrays via srdb1 lib? If yes, how? And if not, are you thinking about implementing it in the future? Thank you very much for your time. Regards, Mario

2 3

git:master:fb7c4ec9: core/rthreads.h: fix missing returns
by S-P Chan 07 Feb '24

07 Feb '24

Module: kamailio Branch: master Commit: fb7c4ec9a33d8147094aa664ce3c96b6c3cb7d35 URL: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T14:08:01+08:00 core/rthreads.h: fix missing returns --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… Patch: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 897e6b8d9ed..2f922be5a75 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,16 +40,17 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg); + } pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); return ret; #else - return fn(arg); + return fn(arg); #endif /* USE_TLS */ } #endif @@ -76,9 +77,10 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg1, arg2); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg1, arg2); + } pthread_create(&tid, NULL, (_thread_proto)&run_thread_wrapPI, &(struct _thread_argsPI){fn, arg1, arg2}); @@ -86,7 +88,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) return ret; #else - return fn(arg1, arg2); + return fn(arg1, arg2); #endif } #endif @@ -111,15 +113,17 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - fn(); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(); + return; + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); #else - fn(); + fn(); #endif } #endif @@ -148,16 +152,17 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg1, arg2); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg1, arg2); + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, &(struct _thread_args4PP){fn, arg1, arg2, &ret}); pthread_join(tid, NULL); return ret; #else - return fn(arg1, arg2); + return fn(arg1, arg2); #endif } #endif @@ -183,14 +188,16 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - fn(arg1); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(arg1); + return; + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); #else - fn(arg1) + fn(arg1) #endif } #endif

1 0

git:master:1a2993ca: core/rthreads.h: fix missing return
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 1a2993ca370da35c34abae1cb44086492faa0ade URL: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:54:35+08:00 core/rthreads.h: fix missing return --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… Patch: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 084f463261b..897e6b8d9ed 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -49,7 +49,7 @@ static void *run_threadP(_thread_proto fn, void *arg) return ret; #else - fn(arg); + return fn(arg); #endif /* USE_TLS */ } #endif

1 0

git:master:e52bc4ba: Sample etc/kamailio.cfg: add tls_threads_mode to config
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: e52bc4ba41417362c79da1cd3d41b283aabc4eb8 URL: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:49:14+08:00 Sample etc/kamailio.cfg: add tls_threads_mode to config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… Patch: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index cc043fad58b..2d68f7692e1 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -220,6 +220,13 @@ enable_tls=yes /* upper limit for TLS connections */ 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 */ +tls_threads_mode=1 #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev