sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
243 discussions

[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

← Newer
1
...
14
15
16
17
18
19
20
...
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