- sr-dev - kamailio.org

git:master:aa15489f: core/rthreads.h: use global ksr_tls_threads_mode to constrain thread
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: aa15489f0a8de4a27197602d771fe02cf5745287 URL: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:24:30+08:00 core/rthreads.h: use global ksr_tls_threads_mode to constrain thread wrapping - 0: run wrapped function directly - 1: run wrapped function in thread for process#0 else run directly - 2: always run wrapped function in thread --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… Patch: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a416ad2ca50..084f463261b 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -27,6 +27,7 @@ */ #include <pthread.h> +#include "./globals.h" /* * prototype: void *fn(void *arg) { ... } */ @@ -35,13 +36,21 @@ 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(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 + fn(arg); +#endif /* USE_TLS */ } #endif @@ -63,14 +72,22 @@ 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(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}); pthread_join(tid, &ret); return ret; +#else + return fn(arg1, arg2); +#endif } #endif @@ -91,11 +108,19 @@ static void *run_thread_wrapV(struct _thread_argsV *args) 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(); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); +#else + fn(); +#endif } #endif @@ -119,14 +144,21 @@ 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(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); +#endif } #endif @@ -148,10 +180,17 @@ 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(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(arg1); + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); +#else + fn(arg1) +#endif } #endif

1 0

git:master:4d6e37fa: core: added tls_threads_mode global parameter
by Daniel-Constantin Mierla 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 4d6e37fa048a1aaa2d2fc6655985b4bcb9754258 URL: https://github.com/kamailio/kamailio/commit/4d6e37fa048a1aaa2d2fc6655985b4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-06T14:24:08+01:00 core: added tls_threads_mode global parameter - control how to execute functions that may be using libssl3 behind --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4d6e37fa048a1aaa2d2fc6655985b4b… Patch: https://github.com/kamailio/kamailio/commit/4d6e37fa048a1aaa2d2fc6655985b4b… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index be4467efa88..aa998d37985 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -442,6 +442,7 @@ TCP_WAIT_DATA "tcp_wait_data" TCP_SCRIPT_MODE "tcp_script_mode" DISABLE_TLS "disable_tls"|"tls_disable" ENABLE_TLS "enable_tls"|"tls_enable" +TLS_THREADS_MODE "tls_threads_mode" TLSLOG "tlslog"|"tls_log" TLS_PORT_NO "tls_port_no" TLS_METHOD "tls_method" @@ -960,6 +961,7 @@ IMPORTFILE "import_file" <INITIAL>{TCP_SCRIPT_MODE} { count(); yylval.strval=yytext; return TCP_SCRIPT_MODE; } <INITIAL>{DISABLE_TLS} { count(); yylval.strval=yytext; return DISABLE_TLS; } <INITIAL>{ENABLE_TLS} { count(); yylval.strval=yytext; return ENABLE_TLS; } +<INITIAL>{TLS_THREADS_MODE} { count(); yylval.strval=yytext; return TLS_THREADS_MODE; } <INITIAL>{TLSLOG} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_PORT_NO} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_METHOD} { count(); yylval.strval=yytext; return TLS_METHOD; } diff --git a/src/core/cfg.y b/src/core/cfg.y index c357faa927d..799c95697df 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -472,6 +472,7 @@ extern char *default_routename; %token TCP_SCRIPT_MODE %token DISABLE_TLS %token ENABLE_TLS +%token TLS_THREADS_MODE %token TLSLOG %token TLS_PORT_NO %token TLS_METHOD @@ -1467,6 +1468,14 @@ assign_stm: #endif } | ENABLE_TLS EQUAL error { yyerror("boolean value expected"); } + | TLS_THREADS_MODE EQUAL NUMBER { + #ifdef USE_TLS + ksr_tls_threads_mode = $3; + #else + warn("tls support not compiled in"); + #endif + } + | TLS_THREADS_MODE EQUAL error { yyerror("int value expected"); } | TLSLOG EQUAL NUMBER { #ifdef CORE_TLS tls_log=$3; diff --git a/src/core/globals.h b/src/core/globals.h index f8b77edb328..0ec87c89a12 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -109,6 +109,7 @@ extern int ksr_tcp_script_mode; #ifdef USE_TLS extern int tls_disable; extern unsigned short tls_port_no; +extern int ksr_tls_threads_mode; #endif #ifdef USE_SCTP extern int sctp_disable; diff --git a/src/main.c b/src/main.c index fc1570c3b7a..1856bf7bc03 100644 --- a/src/main.c +++ b/src/main.c @@ -338,8 +338,9 @@ int tcp_disable = 0; /* 1 if tcp is disabled */ int tls_disable = 0; /* tls enabled by default */ #else int tls_disable = 1; /* tls disabled by default */ -#endif /* CORE_TLS */ -#endif /* USE_TLS */ +#endif /* CORE_TLS */ +int ksr_tls_threads_mode = 0; /* threads execution mode for tls with libssl */ +#endif /* USE_TLS */ #ifdef USE_SCTP int sctp_children_no = 0; int sctp_disable = 2; /* 1 if sctp is disabled, 2 if auto mode, 0 enabled */

1 0

git:5.7:63009ee5: db_postgres: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: 5.7 Commit: 63009ee559bb68a3fde0b7f479d3023b06a6c376 URL: https://github.com/kamailio/kamailio/commit/63009ee559bb68a3fde0b7f479d3023… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T13:14:12+08:00 db_postgres: handle SSL and submit query (cherry-pick from d638c774ed816eec800e72ba2546004215cfe097) --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/63009ee559bb68a3fde0b7f479d3023… Patch: https://github.com/kamailio/kamailio/commit/63009ee559bb68a3fde0b7f479d3023… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 3d58f1a53e0..7948ff0075f 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -44,6 +44,7 @@ #include "../../core/hashes.h" #include "../../core/clist.h" #define KSR_RTHREAD_NEED_PI +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" @@ -158,7 +159,7 @@ void db_postgres_close(db1_con_t *_h) * \param _s query string * \return 0 on success, negative on failure */ -static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) +static int db_postgres_submit_query_impl(const db1_con_t *_con, const str *_s) { char *s = NULL; int i, retries; @@ -286,6 +287,12 @@ static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) return -1; } +static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) +{ + return run_thread4PP((_thread_proto4PP)db_postgres_submit_query_impl, + (void *)_con, (void *)_s); +} + void db_postgres_async_exec_task(void *param) { str *p;

1 0

git:5.7:103c62ba: db_mysql: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: 5.7 Commit: 103c62ba675f8d306e1c0fb60ddfd4c4bca1e931 URL: https://github.com/kamailio/kamailio/commit/103c62ba675f8d306e1c0fb60ddfd4c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T13:13:59+08:00 db_mysql: handle SSL and submit query (cherry-pick from 51d9f92eca3ef1044052581c9438af6e643652a1) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/103c62ba675f8d306e1c0fb60ddfd4c… Patch: https://github.com/kamailio/kamailio/commit/103c62ba675f8d306e1c0fb60ddfd4c… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 9cd238b78ab..e86e4a0391b 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -38,6 +38,8 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" + +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -67,7 +69,7 @@ static char *mysql_sql_buf; * \param _s executed query * \return zero on success, negative value on failure */ -static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) +static int db_mysql_submit_query_impl(const db1_con_t *_h, const str *_s) { time_t t; int i, code; @@ -128,6 +130,11 @@ static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) } +static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) +{ + return run_thread4PP((_thread_proto4PP)db_mysql_submit_query_impl, + (void *)_h, (void *)_s); +} /** * */

1 0

git:5.7:579d3973: db_unixodbc: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: 5.7 Commit: 579d39736b8f11d0e5c68715ba3a9aafc07cd7dc URL: https://github.com/kamailio/kamailio/commit/579d39736b8f11d0e5c68715ba3a9aa… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T13:13:42+08:00 db_unixodbc: handle SSL and submit query (cherry-pick from 7d917e6649be7188bb9ab152ada75bc7199b2980) --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/579d39736b8f11d0e5c68715ba3a9aa… Patch: https://github.com/kamailio/kamailio/commit/579d39736b8f11d0e5c68715ba3a9aa… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index c4ba64b019c..7a5f2bdb09e 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -25,6 +25,7 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" @@ -81,7 +82,7 @@ static int reconnect(const db1_con_t *_h) /* * Send an SQL query to the server */ -static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) +static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) { int ret = 0; SQLCHAR sqlstate[7]; @@ -155,6 +156,11 @@ static int db_unixodbc_submit_query(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); +} /** * */

1 0

git:5.7:6f037a48: core/rthread.h: add prototype for db queries
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: 5.7 Commit: 6f037a48f706e6108a063883f9e9a324bea56da9 URL: https://github.com/kamailio/kamailio/commit/6f037a48f706e6108a063883f9e9a32… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T13:13:23+08:00 core/rthread.h: add prototype for db queries (cherry-pick from ba921b2112e87625fba5789d1b049161bb611073) --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/6f037a48f706e6108a063883f9e9a32… Patch: https://github.com/kamailio/kamailio/commit/6f037a48f706e6108a063883f9e9a32… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a5ad7670dae..a416ad2ca50 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -98,3 +98,60 @@ static void run_threadV(_thread_protoV fn) pthread_join(tid, NULL); } #endif + +/* + * prototype: int fn(void *, void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_4PP +typedef int (*_thread_proto4PP)(void *, void *); +struct _thread_args4PP +{ + _thread_proto4PP fn; + void *arg1; + void *arg2; + int *ret; +}; +static void *run_thread_wrap4PP(struct _thread_args4PP *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2); + return NULL; +} + +static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) +{ + pthread_t tid; + int ret; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, + &(struct _thread_args4PP){fn, arg1, arg2, &ret}); + pthread_join(tid, NULL); + + return ret; +} +#endif + +/* + * prototype: void fn(void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_0P +typedef void (*_thread_proto0P)(void *); +struct _thread_args0P +{ + _thread_proto0P fn; + void *arg1; +}; +static void *run_thread_wrap0P(struct _thread_args0P *args) +{ + (*args->fn)(args->arg1); + return NULL; +} + +static void run_thread0P(_thread_proto0P fn, void *arg1) +{ + pthread_t tid; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, + &(struct _thread_args0P){fn, arg1}); + pthread_join(tid, NULL); +} +#endif

1 0

git:master:475b4da7: Sample etc/kamailio.cfg: tls should be loaded first if used
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 475b4da798fce232eba6834c3cb05e3c97e12d03 URL: https://github.com/kamailio/kamailio/commit/475b4da798fce232eba6834c3cb05e3… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T11:09:13+08:00 Sample etc/kamailio.cfg: tls should be loaded first if used --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/475b4da798fce232eba6834c3cb05e3… Patch: https://github.com/kamailio/kamailio/commit/475b4da798fce232eba6834c3cb05e3… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100644 new mode 100755 index 598d12bc23e..cc043fad58b --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -257,6 +257,12 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" /* set paths to location of modules */ # mpath="/usr/local/lib/kamailio/modules/" +# when using TLS with OpenSSL it is recommended to load this module +# first so that OpenSSL is initialized correctly +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif + #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif @@ -319,10 +325,6 @@ loadmodule "rtpproxy.so" #!endif #!endif -#!ifdef WITH_TLS -loadmodule "tls.so" -#!endif - #!ifdef WITH_HTABLE loadmodule "htable.so" #!endif

1 0

git:master:d638c774: db_postgres: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: d638c774ed816eec800e72ba2546004215cfe097 URL: https://github.com/kamailio/kamailio/commit/d638c774ed816eec800e72ba2546004… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T10:17:53+08:00 db_postgres: handle SSL and submit query --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/d638c774ed816eec800e72ba2546004… Patch: https://github.com/kamailio/kamailio/commit/d638c774ed816eec800e72ba2546004… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 3d58f1a53e0..7948ff0075f 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -44,6 +44,7 @@ #include "../../core/hashes.h" #include "../../core/clist.h" #define KSR_RTHREAD_NEED_PI +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" @@ -158,7 +159,7 @@ void db_postgres_close(db1_con_t *_h) * \param _s query string * \return 0 on success, negative on failure */ -static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) +static int db_postgres_submit_query_impl(const db1_con_t *_con, const str *_s) { char *s = NULL; int i, retries; @@ -286,6 +287,12 @@ static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) return -1; } +static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) +{ + return run_thread4PP((_thread_proto4PP)db_postgres_submit_query_impl, + (void *)_con, (void *)_s); +} + void db_postgres_async_exec_task(void *param) { str *p;

1 0

git:master:51d9f92e: db_mysql: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 51d9f92eca3ef1044052581c9438af6e643652a1 URL: https://github.com/kamailio/kamailio/commit/51d9f92eca3ef1044052581c9438af6… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T10:17:53+08:00 db_mysql: handle SSL and submit query --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/51d9f92eca3ef1044052581c9438af6… Patch: https://github.com/kamailio/kamailio/commit/51d9f92eca3ef1044052581c9438af6… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 9cd238b78ab..e86e4a0391b 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -38,6 +38,8 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" + +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -67,7 +69,7 @@ static char *mysql_sql_buf; * \param _s executed query * \return zero on success, negative value on failure */ -static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) +static int db_mysql_submit_query_impl(const db1_con_t *_h, const str *_s) { time_t t; int i, code; @@ -128,6 +130,11 @@ static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) } +static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) +{ + return run_thread4PP((_thread_proto4PP)db_mysql_submit_query_impl, + (void *)_h, (void *)_s); +} /** * */

1 0

git:master:7d917e66: db_unixodbc: handle SSL and submit query
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 7d917e6649be7188bb9ab152ada75bc7199b2980 URL: https://github.com/kamailio/kamailio/commit/7d917e6649be7188bb9ab152ada75bc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T10:17:53+08:00 db_unixodbc: handle SSL and submit query --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/7d917e6649be7188bb9ab152ada75bc… Patch: https://github.com/kamailio/kamailio/commit/7d917e6649be7188bb9ab152ada75bc… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index c4ba64b019c..7a5f2bdb09e 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -25,6 +25,7 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" +#define KSR_RTHREAD_NEED_4PP #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" @@ -81,7 +82,7 @@ static int reconnect(const db1_con_t *_h) /* * Send an SQL query to the server */ -static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) +static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) { int ret = 0; SQLCHAR sqlstate[7]; @@ -155,6 +156,11 @@ static int db_unixodbc_submit_query(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); +} /** * */

1 0

git:master:2ab212cc: modules: readme files regenerated - influxdbc ... [skip ci]
by Kamailio Dev 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: 2ab212ccf0b4ecd7a0671235641e2a80feb251ff URL: https://github.com/kamailio/kamailio/commit/2ab212ccf0b4ecd7a0671235641e2a8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-05T16:32:00+01:00 modules: readme files regenerated - influxdbc ... [skip ci] --- Modified: src/modules/influxdbc/README Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/2ab212ccf0b4ecd7a0671235641e2a8… Patch: https://github.com/kamailio/kamailio/commit/2ab212ccf0b4ecd7a0671235641e2a8…

1 0

git:master:10b86323: influxdbc: convert string value to double
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: 10b86323cc47f29b41c21fd601d5b309cca050e6 URL: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 influxdbc: convert string value to double --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… Patch: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index b1c79b4b494..2c2f8804bb4 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -242,6 +242,8 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) return -1; } + dval = strtod(sval.s, NULL); + ic_double(sname.s, dval); return 1;

1 0

git:master:ba2d0e17: influxdbc: docs for several parameters and functions
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: ba2d0e171b0171ba98bc7219a420dcda7677d366 URL: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 influxdbc: docs for several parameters and functions --- Modified: src/modules/influxdbc/doc/influxdbc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… Patch: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… --- diff --git a/src/modules/influxdbc/doc/influxdbc_admin.xml b/src/modules/influxdbc/doc/influxdbc_admin.xml index c59fe92a126..a02af97e048 100644 --- a/src/modules/influxdbc/doc/influxdbc_admin.xml +++ b/src/modules/influxdbc/doc/influxdbc_admin.xml @@ -68,6 +68,44 @@ ... modparam("influxdbc", "server", "127.0.0.1") ... +</programlisting> + </example> + </section> + <section id="influxdbc.p.port"> + <title><varname>port</varname> (int)</title> + <para> + Address of InfluxDB server. + </para> + <para> + <emphasis> + Default value is 8086. + </emphasis> + </para> + <example> + <title>Set <varname>port</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("influxdbc", "port", 8808) +... +</programlisting> + </example> + </section> + <section id="influxdbc.p.database"> + <title><varname>database</varname> (int)</title> + <para> + Database of InfluxDB server. + </para> + <para> + <emphasis> + Default value is empty. + </emphasis> + </para> + <example> + <title>Set <varname>database</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("influxdbc", "database", "stats") +... </programlisting> </example> </section> @@ -86,7 +124,7 @@ modparam("influxdbc", "server", "127.0.0.1") This function can be used from ANY_ROUTE. </para> <example> - <title><function>async_route</function> usage</title> + <title><function>influxdbc_measure()</function> usage</title> <programlisting format="linespecific"> ... request_route { @@ -95,6 +133,53 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_measureend"> + <title> + <function moreinfo="none">influxdbc_measureend()</function> + </title> + <para> + End the current measure group. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_measureend()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_measureend(); + ... +} +... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_lomg"> + <title> + <function moreinfo="none">influxdbc_long(name, value)</function> + </title> + <para> + Save the pair with provided name and value. Both parameters can + have variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_long()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_long("active", "$shv(active)"); + ... +} +... </programlisting> </example> </section>

1 0

git:master:faaad7e0: rtpengine: docs for ping_mode parameter
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: faaad7e0e654359e744d0c18253cc0dc84cd906e URL: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 rtpengine: docs for ping_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… Patch: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index fea67a665a2..adb3af92bdd 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2348,6 +2348,28 @@ modparam("rtpengine", "dtmf_events_sock", "127.0.0.1:2223") </example> </section> + <section id="rtpengine.p.ping_mode"> + <title><varname>ping_mode</varname> (integer)</title> + <para> + Specify if the RTPEngine instances have to be pinged at startup to + detect if they are active. Set it to 0 to disable pinging and to 1 + to activate pinging. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_mode", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

[kamailio/kamailio] RFE: RPM packaging of wolfSSL 5.6.6 for upcoming freeze/5.7 release (Issue #3713)
by space88man 04 Feb '24

04 Feb '24

### Description Request the RPM packaging of wolfSSL 5.6.6 for the upcoming freeze ### Expected behavior I intend to bump the internal submodule to 5.6.6 and it would be good if Kamailio RPM packages could be updated. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3713 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3713(a)github.com>

2 7

git:master:81605f92: pkg/kamailio: RPM packaged new modules
by Sergey Safarov 04 Feb '24

04 Feb '24

Module: kamailio Branch: master Commit: 81605f9289364a273a7b904d12972a6d01dc6207 URL: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-02-04T17:53:48+02:00 pkg/kamailio: RPM packaged new modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… Patch: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a7758b98e61..13d6fb20ffd 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1538,6 +1538,7 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc +%doc %{_docdir}/kamailio/modules/README.influxdbc %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex @@ -1697,9 +1698,11 @@ fi %{_libdir}/kamailio/modules/drouting.so %{_libdir}/kamailio/modules/enum.so %{_libdir}/kamailio/modules/exec.so +%{_libdir}/kamailio/modules/file_out.so %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so +%{_libdir}/kamailio/modules/influxdbc.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so

1 0

[kamailio/kamailio] thread-local: database module fixes need to be back-ported to 5.7 (Issue #3738)
by space88man 04 Feb '24

04 Feb '24

### Description OpenSSL integration update was back-ported to 5.7 fixing tls and outbound. The commonly used modules db_mysql, db_unixodbc, db_postgres - fixed on master - did not receive thread-local fixes in time for 5.7.4. Kamailio configurations with tls +(database module) may see shm errors Some database modules are observed to initialise OpenSSL even if the actual db connections are in clear. ### Troubleshooting - run the main kamailio process under gdb. - set breakpoint on CRYPTO_THREAD_set_local (an OpenSSL internal thread-local function) - observe if any calls happen in Thread#1—this is the failure case ### Workaround When combining tls + database module switch to tls_wolfssl instead -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3738 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3738(a)github.com>

1 1

git:5.7:74636a9b: Revert "tls_wolfssl: enable building with external package"
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: 74636a9bf53524a6d60351c1569a033270677d6c URL: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T10:11:45+08:00 Revert "tls_wolfssl: enable building with external package" This reverts commit 53ce759091f78ffecc6b4047ff3e8885329d718f. < 5.8 does not have 16-byte memory alignment --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… Patch: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 98239c43183..5ef95d697b6 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,13 +8,6 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -# make WOLFSSL_INTERNAL=yes... for internal submodule -# make WOLFSSL_INTERNAL=no... for system package -# default: yes - -WOLFSSL_INTERNAL ?= yes - -ifeq ($(WOLFSSL_INTERNAL),yes) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -41,15 +34,6 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a -else -WOLFSSL_LIBS ?= $(shell pkg-config wolfssl --libs) -WOLFSSL_INCLUDES ?= $(shell pkg-config wolfssl --cflags) - -LIBS += $(WOLFSSL_LIBS) -INCLUDES += $(WOLFSSL_INCLUDES) -include ../../Makefile.modules -endif - clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ (cd $(WOLFSSL_SRC); make distclean) || /bin/true

1 0

Re: [kamailio/kamailio] db_mysql: backport - no TLS with MariaDB Connector/C (ede2af9)
by space88man 04 Feb '24

04 Feb '24

@miconda @linuxmaniac - compilation fixes and handling of older versions(libmariadb-dev) squash-included here. Thank you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd15280dc11034/138246612(a)github.com>

1 0

git:5.7:ede2af94: db_mysql: backport - no TLS with MariaDB Connector/C
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: ede2af94386b99a87311351fcbdd15280dc11034 URL: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T08:12:52+08:00 db_mysql: backport - no TLS with MariaDB Connector/C - GH #3735 - includes compilation and stretch fixes - emulate SSL_MODE_XXX from MySQL - opt_ssl_mode: - 0|1(off) - 2|3|4(MYSQL_OPT_SSL_ENFORCE) - 5(MYSQL_OPT_SSL_VERIFY_SERVER_CERT) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… Patch: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index d3f57108886..b4c4dca33b0 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -116,7 +116,36 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (const void *)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void *)&db_mysql_timeout_interval); -#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) + +#ifdef MARIADB_BASE_VERSION + /* + * emulate SSL_MODE_XXXX from MySQL + */ + + switch(db_mysql_opt_ssl_mode) { + case 0: /* opt_ssl_mode = 0(off) */ + case 1: /* SSL_MODE_DISABLED */ + break; + case 2: /* SSL_MODE_PREFERRED */ + case 3: /* SSL_MODE_REQUIRED */ + case 4: /* SSL_MODE_VERIFY_CA */ +#if MYSQL_VERSION_ID >= 100339 + mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); +#else + LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); +#endif + break; + case 5: /* SSL_MODE_VERIFY_IDENTITY */ + mysql_options(ptr->con, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + (void *)&(int){1}); + break; + default: + LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", + db_mysql_opt_ssl_mode); + break; + } +#else +#if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) { @@ -136,7 +165,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) "ignoring\n", (unsigned int)db_mysql_opt_ssl_mode); } -#endif +#endif /* MYSQL_VERSION_ID */ +#endif /* MARIADB_BASE_VERSION */ #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */

1 0

Re: [kamailio/kamailio] outbound: init libssl in a thread (9a87d12)
by space88man 04 Feb '24

04 Feb '24

@linuxmaniac - I have included the Xenial fix from master here. Thanks! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9a87d12d6e9e68cd8c0ff7ac5755e89… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9a87d12d6e9e68cd8c0ff7ac5755e899cf81b703/138246585(a)github.com>

1 0

[kamailio/kamailio] 5.7 db modules: init libssl in a thread (PR #3740)
by space88man 04 Feb '24

04 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 - [ X] Related to issue #3738 (replace XXXX with an open issue number) #### Description 5.7.4 has OpenSSL fixes for tls and outbound but missed out the db modules—the most common users of libssl This PR updates db_mysql, db_unixodbc, db_postgres to init libssl in a thread to handle more configurations (tls + db module) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3740 -- Commit Summary -- * core: backport OpenSSL thread-local fixes * db_mysql: backport OpenSSL thread-local fixes * db_postgres: backport OpenSSL thread-local fixes * db_unixodbc: backport OpenSSL thread-local fixes -- File Changes -- A src/core/rthreads.h (100) M src/modules/db_mysql/km_dbase.c (9) M src/modules/db_postgres/km_dbase.c (19) M src/modules/db_unixodbc/dbase.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3740.patch https://github.com/kamailio/kamailio/pull/3740.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3740 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3740(a)github.com>

3 7

git:5.7:d2cc8657: db_unixodbc: init libssl in a thread
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: d2cc8657b06c8ca33c59c82dbf739d67a5ce8fa0 URL: https://github.com/kamailio/kamailio/commit/d2cc8657b06c8ca33c59c82dbf739d6… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T08:12:52+08:00 db_unixodbc: init libssl in a thread From: - 2611a4670c65dd32fc1daf6b67e37852936ba69c - b71ce6e5733ab08b84ff09481ada91e5fca43a33 --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/d2cc8657b06c8ca33c59c82dbf739d6… Patch: https://github.com/kamailio/kamailio/commit/d2cc8657b06c8ca33c59c82dbf739d6… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index eb02b29de50..c4ba64b019c 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -22,10 +22,10 @@ * */ - #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" +#include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" #include "connection.h" @@ -227,8 +227,10 @@ extern char *db_unixodbc_tquote; /* * Initialize database module * No function should be called before this + * + * Init libssl in a thread */ -db1_con_t *db_unixodbc_init(const str *_url) +static db1_con_t *db_unixodbc_init0(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_unixodbc_new_connection); @@ -237,6 +239,11 @@ db1_con_t *db_unixodbc_init(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

1 0

git:5.7:3644522e: db_postgres: init libssl in a thread
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: 3644522e041920bf508d16c2992a216df656702b URL: https://github.com/kamailio/kamailio/commit/3644522e041920bf508d16c2992a216… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T08:12:52+08:00 db_postgres: init libssl in a thread From: - 3426b153d02d9d8d3e909eff9d18cb14108072ca - 8a1c383f6af5bc0547e32430a4469333160b93e6 --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/3644522e041920bf508d16c2992a216… Patch: https://github.com/kamailio/kamailio/commit/3644522e041920bf508d16c2992a216… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 02cb5c421d5..3d58f1a53e0 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -43,6 +43,8 @@ #include "../../core/locking.h" #include "../../core/hashes.h" #include "../../core/clist.h" +#define KSR_RTHREAD_NEED_PI +#include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" #include "km_val.h" @@ -108,24 +110,37 @@ static void db_postgres_free_query(const db1_con_t *_con); * \param _url URL of the database that should be opened * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in a thread */ -db1_con_t *db_postgres_init(const str *_url) +static db1_con_t *db_postgres_init0(const str *_url) { return db_do_init(_url, (void *)db_postgres_new_connection); } +db1_con_t *db_postgres_init(const str *_url) +{ + return run_threadP((_thread_proto)db_postgres_init0, (void *)_url); +} /*! * \brief Initialize database for future queries, specify pooling * \param _url URL of the database that should be opened * \param pooling whether or not to use a pooled connection * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in thread */ -db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +static db1_con_t *db_postgres_init2_impl(const str *_url, db_pooling_t pooling) { return db_do_init2(_url, (void *)db_postgres_new_connection, pooling); } +db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +{ + return run_threadPI( + (_thread_protoPI)db_postgres_init2_impl, (void *)_url, pooling); +} /*! * \brief Close database when the database is no longer needed * \param _h closed connection, as returned from db_postgres_init

1 0

git:5.7:bfb7cbca: db_mysql: init libssl in a thread
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: bfb7cbcaa16e5f392cc77d7e2e8ea2b75064ace0 URL: https://github.com/kamailio/kamailio/commit/bfb7cbcaa16e5f392cc77d7e2e8ea2b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T08:12:52+08:00 db_mysql: init libssl in a thread From: - 5dffb934a2f7f986fdc09e433833991c54612646 - 733a268114261d49ed11aec83fe39ea8c34a0b69 --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/bfb7cbcaa16e5f392cc77d7e2e8ea2b… Patch: https://github.com/kamailio/kamailio/commit/bfb7cbcaa16e5f392cc77d7e2e8ea2b… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 577f3dc798b..9cd238b78ab 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -38,6 +38,7 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" +#include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" #include "db_mysql.h" @@ -197,8 +198,10 @@ static char *db_mysql_tquote = "`"; * No function should be called before this * \param _url URL used for initialization * \return zero on success, negative value on failure + * + * Init libssl in a thread */ -db1_con_t *db_mysql_init(const str *_url) +static db1_con_t *db_mysql_init0(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_mysql_new_connection); @@ -208,6 +211,10 @@ db1_con_t *db_mysql_init(const str *_url) } +db1_con_t *db_mysql_init(const str *_url) +{ + return run_threadP((_thread_proto)db_mysql_init0, (void *)_url); +} /** * Shut down the database module. * No function should be called after this

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev