sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
243 discussions

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

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024