sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
351 discussions

git:master:2df6fd2b: tls: warn if thread-locals are initialized before this module
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 2df6fd2b92c95791fa299500680a31814f95291c URL: https://github.com/kamailio/kamailio/commit/2df6fd2b92c95791fa299500680a318… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T17:01:03+08:00 tls: warn if thread-locals are initialized before this module --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2df6fd2b92c95791fa299500680a318… Patch: https://github.com/kamailio/kamailio/commit/2df6fd2b92c95791fa299500680a318… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 1cc8a9540da..1d7169b27e6 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -401,6 +401,14 @@ static int mod_init(void) return -1; } #endif +#if OPENSSL_VERSION_NUMBER >= 0x10101000L + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k) != 0) { + LM_WARN("detected initialized thread-locals created before tls.so; " + "tls.so must be the first module loaded\n"); + } + } +#endif /* OPENSSL_VERSION_NUMBER*/ if(tls_disable) { LM_WARN("tls support is disabled "

1 0

git:master:5c48fb7b: modules: readme files regenerated - siprepo ... [skip ci]
by Kamailio Dev 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 5c48fb7ba1b6e7d516d6f5dad50f8c0a91f0a298 URL: https://github.com/kamailio/kamailio/commit/5c48fb7ba1b6e7d516d6f5dad50f8c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-20T09:46:07+01:00 modules: readme files regenerated - siprepo ... [skip ci] --- Modified: src/modules/siprepo/README --- Diff: https://github.com/kamailio/kamailio/commit/5c48fb7ba1b6e7d516d6f5dad50f8c0… Patch: https://github.com/kamailio/kamailio/commit/5c48fb7ba1b6e7d516d6f5dad50f8c0… --- diff --git a/src/modules/siprepo/README b/src/modules/siprepo/README index b355395f3ec..a0143a266f1 100644 --- a/src/modules/siprepo/README +++ b/src/modules/siprepo/README @@ -48,7 +48,7 @@ Daniel-Constantin Mierla 1.6. sr_msg_pull() usage 1.7. sr_msg_async_pull() usage 1.8. sr_msg_rm() usage - 1.9. sr_msg_checkj() usage + 1.9. sr_msg_check() usage Chapter 1. Admin Guide @@ -228,7 +228,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.9. sr_msg_checkj() usage + Example 1.9. sr_msg_check() usage ... request_route { ...

1 0

git:master:ed61054f: siprepo: docs - small typo
by Daniel-Constantin Mierla 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: ed61054f3b4064523888897bb22ae4d53b84d949 URL: https://github.com/kamailio/kamailio/commit/ed61054f3b4064523888897bb22ae4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-20T09:41:45+01:00 siprepo: docs - small typo --- Modified: src/modules/siprepo/doc/siprepo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ed61054f3b4064523888897bb22ae4d… Patch: https://github.com/kamailio/kamailio/commit/ed61054f3b4064523888897bb22ae4d… --- diff --git a/src/modules/siprepo/doc/siprepo_admin.xml b/src/modules/siprepo/doc/siprepo_admin.xml index 306eaf701eb..80ed1392066 100644 --- a/src/modules/siprepo/doc/siprepo_admin.xml +++ b/src/modules/siprepo/doc/siprepo_admin.xml @@ -245,7 +245,7 @@ request_route { This function can be used from ANY_ROUTE. </para> <example> - <title><function>sr_msg_checkj()</function> usage</title> + <title><function>sr_msg_check()</function> usage</title> <programlisting format="linespecific"> ... request_route {

1 0

git:master:8cc21a5a: tls: fix compiler warning of unused variable
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 8cc21a5af0846ddd657b20363895e220658816ea URL: https://github.com/kamailio/kamailio/commit/8cc21a5af0846ddd657b20363895e22… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:36:12+08:00 tls: fix compiler warning of unused variable --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cc21a5af0846ddd657b20363895e22… Patch: https://github.com/kamailio/kamailio/commit/8cc21a5af0846ddd657b20363895e22… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 5d7c74f9249..1cc8a9540da 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -588,8 +588,6 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { - int k; - if(tls_disable || (tls_domains_cfg == 0)) return 0;

1 0

git:master:ca87db75: core: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: ca87db75102504eb29e802a0047cf22730dfc30e URL: https://github.com/kamailio/kamailio/commit/ca87db75102504eb29e802a0047cf22… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 core: revert tls_threads_mode=1 --- Modified: src/core/globals.h Removed: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/ca87db75102504eb29e802a0047cf22… Patch: https://github.com/kamailio/kamailio/commit/ca87db75102504eb29e802a0047cf22…

1 0

git:master:398e647b: tls: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 398e647b0667f5609d30ccb9f4cedbb659dca3ab URL: https://github.com/kamailio/kamailio/commit/398e647b0667f5609d30ccb9f4cedbb… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 tls: revert tls_threads_mode=1 --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/398e647b0667f5609d30ccb9f4cedbb… Patch: https://github.com/kamailio/kamailio/commit/398e647b0667f5609d30ccb9f4cedbb… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 5a63beaf5ce..5d7c74f9249 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -45,9 +45,6 @@ #include "../../core/counters.h" #include "../../core/tcp_info.h" -#define KSR_RTHREAD_SKIP_P -#define KSR_RTHREAD_NEED_4PP -#include "../../core/rthreads.h" #include "tls_init.h" #include "tls_server.h" #include "tls_domain.h" @@ -596,20 +593,8 @@ static int mod_child(int rank) if(tls_disable || (tls_domains_cfg == 0)) return 0; - /* - * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor - * to avoid init of libssl in thread#1: - * - ksr_tls_threads_mode = 1 (KSR_TLS_THREADS_MTEMP) - */ if(rank == PROC_INIT) { - return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); - } - - if(ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP && rank - && rank != PROC_INIT && rank != PROC_POSTCHILDINIT) { - for(k = 0; k < tls_pthreads_key_mark; k++) - pthread_setspecific(k, 0x0); - LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + return mod_child_hook(&rank, NULL); } #ifdef KSR_SSL_COMMON

1 0

git:master:92f17d2e: xcap_client: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 92f17d2e7945858cdfe40ab498fb7b046e02955a URL: https://github.com/kamailio/kamailio/commit/92f17d2e7945858cdfe40ab498fb7b0… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 xcap_client: revert tls_threads_mode=1 --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/92f17d2e7945858cdfe40ab498fb7b0… Patch: https://github.com/kamailio/kamailio/commit/92f17d2e7945858cdfe40ab498fb7b0… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index ce54162249e..602d74cea5e 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -43,9 +43,6 @@ #include "../../core/mem/shm_mem.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "../presence/utils_func.h" #include "xcap_functions.h" #include "xcap_client.h" @@ -151,7 +148,7 @@ static int mod_init(void) xcap_dbf.close(xcap_db); xcap_db = NULL; - run_thread4L((_thread_proto4L)curl_global_init, CURL_GLOBAL_ALL); + curl_global_init(CURL_GLOBAL_ALL); if(periodical_query) { register_timer(query_xcap_update, 0, query_period);

1 0

git:master:de84212c: http_client: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: de84212c4a43402ea094f1b38aed9ca09b0c89a5 URL: https://github.com/kamailio/kamailio/commit/de84212c4a43402ea094f1b38aed9ca… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 http_client: revert tls_threads_mode=1 --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/de84212c4a43402ea094f1b38aed9ca… Patch: https://github.com/kamailio/kamailio/commit/de84212c4a43402ea094f1b38aed9ca… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index a7de8ea51bd..6f2d54c94b5 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -64,9 +64,6 @@ #include "../../core/lvalue.h" #include "../../core/pt.h" /* Process table */ #include "../../core/kemi.h" -#define KSR_RTHREAD_NEED_4L -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "functions.h" #include "curlcon.h" @@ -305,7 +302,7 @@ static int mod_init(void) LM_DBG("init curl module\n"); /* Initialize curl */ - if(run_thread4L((_thread_proto4L)&curl_global_init, CURL_GLOBAL_ALL)) { + if(curl_global_init(CURL_GLOBAL_ALL)) { LM_ERR("curl_global_init failed\n"); return -1; }

1 0

git:master:7f33c48c: http_async_client: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 7f33c48cc788d4caea0b1e06748bae0e6a6e90fb URL: https://github.com/kamailio/kamailio/commit/7f33c48cc788d4caea0b1e06748bae0… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 http_async_client: revert tls_threads_mode=1 --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f33c48cc788d4caea0b1e06748bae0… Patch: https://github.com/kamailio/kamailio/commit/7f33c48cc788d4caea0b1e06748bae0… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 0a9cbb0fbfb..b707cddb4a3 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,9 +50,6 @@ #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" -#define KSR_RTHREAD_NEED_V -#define KSR_RTHREAD_SKIP_P -#include "../../core/rthreads.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -294,7 +291,7 @@ static int mod_init(void) return -1; } - run_threadV((_thread_protoV)&set_curl_mem_callbacks); + set_curl_mem_callbacks(); /* init faked sip msg */ if(faked_msg_init() < 0) {

1 0

git:master:a8c23061: db_unixodbc: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: a8c23061bf2b9ce2240cd52e554b440cb996bc9e URL: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 db_unixodbc: revert tls_threads_mode=1 --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… Patch: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index 0637a1f6afd..11724a28b23 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -27,10 +27,6 @@ #include "../../core/mem/mem.h" #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" #include "connection.h" @@ -86,7 +82,7 @@ static int reconnect(const db1_con_t *_h) /* * Send an SQL query to the server */ -static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) +static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) { int ret = 0; SQLCHAR sqlstate[7]; @@ -160,11 +156,6 @@ static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) return ret; } -static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) -{ - return run_thread4PP((_thread_proto4PP)db_unixodbc_submit_query_impl, - (void *)_h, (void *)_s); -} /** * */ @@ -238,9 +229,8 @@ extern char *db_unixodbc_tquote; * Initialize database module * No function should be called before this * - * Init libssl in a thread - */ -static db1_con_t *db_unixodbc_init0(const str *_url) + */ +db1_con_t *db_unixodbc_init(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_unixodbc_new_connection); @@ -249,23 +239,13 @@ static db1_con_t *db_unixodbc_init0(const str *_url) return c; } -db1_con_t *db_unixodbc_init(const str *_url) -{ - return run_threadP((_thread_proto)&db_unixodbc_init0, (void *)_url); -} - /* * Shut down database module * No function should be called after this */ -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); + return db_do_close(_h, db_unixodbc_free_connection); } /* @@ -308,7 +288,7 @@ static int db_unixodbc_store_result(const db1_con_t *_h, db1_res_t **_r) /* * Release a result set from memory */ -static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) +int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) { if((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -324,12 +304,6 @@ static int db_unixodbc_free_result_impl(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 @@ -341,7 +315,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 */ -static int db_unixodbc_query_impl(const db1_con_t *_h, const db_key_t *_k, +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) { @@ -350,15 +324,6 @@ static int db_unixodbc_query_impl(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

← Newer
1
...
5
6
7
8
9
10
11
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024