sr-dev

sr-dev@lists.kamailio.org

17 participants
44125 discussions

git:master:de84212c: http_client: revert tls_threads_mode=1

by S-P Chan

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 day, 7 hours

git:master:92f17d2e: xcap_client: revert tls_threads_mode=1

by S-P Chan

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 day, 7 hours

git:master:398e647b: tls: revert tls_threads_mode=1

by S-P Chan

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 day, 7 hours

git:master:a8c23061: db_unixodbc: revert tls_threads_mode=1

by S-P Chan

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 day, 7 hours

git:master:7f33c48c: http_async_client: revert tls_threads_mode=1

by S-P Chan

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 day, 7 hours

git:master:ab6d46e6: outbound: revert tls_threads_mode=1

by S-P Chan

Module: kamailio Branch: master Commit: ab6d46e6ab08066021419154045da5c3f2721377 URL: https://github.com/kamailio/kamailio/commit/ab6d46e6ab08066021419154045da5c… 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 outbound: revert tls_threads_mode=1 --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ab6d46e6ab08066021419154045da5c… Patch: https://github.com/kamailio/kamailio/commit/ab6d46e6ab08066021419154045da5c… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f64e2dfbe28..f3c80f18c15 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -42,10 +42,6 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_supported.h" -#define KSR_RTHREAD_SKIP_P -#define KSR_RTHREAD_NEED_V -#include "../../core/rthreads.h" - #include "api.h" #include "config.h" @@ -127,11 +123,7 @@ static int mod_init(void) } ob_key.len = OB_KEY_LEN; -#if OPENSSL_VERSION_NUMBER < 0x010101000L mod_init_openssl(); -#else - run_threadV(mod_init_openssl); -#endif if(cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg, cfg_sizeof(outbound), &outbound_cfg)) {

1 day, 7 hours

git:master:50042a4a: db_mysql: revert tls_threads_mode=1

by S-P Chan

Module: kamailio Branch: master Commit: 50042a4a21318f9b89cd1b5d35c04800ef2cbec5 URL: https://github.com/kamailio/kamailio/commit/50042a4a21318f9b89cd1b5d35c0480… 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_mysql: revert tls_threads_mode=1 --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/50042a4a21318f9b89cd1b5d35c0480… Patch: https://github.com/kamailio/kamailio/commit/50042a4a21318f9b89cd1b5d35c0480… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index b97f0f2cd4b..6e034b689f1 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -41,10 +41,6 @@ #include "../../core/dprint.h" #include "../../core/async_task.h" -#define KSR_RTHREAD_NEED_4PP -#define KSR_RTHREAD_NEED_0P -#define KSR_RTHREAD_NEED_4P5I2P2 -#include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" #include "db_mysql.h" @@ -73,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_impl(const db1_con_t *_h, const str *_s) +static int db_mysql_submit_query(const db1_con_t *_h, const str *_s) { time_t t; int i, code; @@ -133,12 +129,6 @@ static int db_mysql_submit_query_impl(const db1_con_t *_h, const str *_s) return -2; } - -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); -} /** * */ @@ -210,9 +200,8 @@ static char *db_mysql_tquote = "`"; * \param _url URL used for initialization * \return zero on success, negative value on failure * - * Init libssl in a thread */ -static db1_con_t *db_mysql_init0(const str *_url) +db1_con_t *db_mysql_init(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_mysql_new_connection); @@ -221,28 +210,17 @@ static db1_con_t *db_mysql_init0(const str *_url) return c; } - -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 * \param _h handle to the closed connection * \return zero on success, negative value on failure */ -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); + db_do_close(_h, db_mysql_free_connection); } - /** * Retrieve a result set * \param _h handle to the database @@ -290,7 +268,7 @@ static int db_mysql_store_result(const db1_con_t *_h, db1_res_t **_r) * and *_r */ db_mysql_free_result(_h, *_r); *_r = 0; -#if(MYSQL_VERSION_ID >= 40100) +#if (MYSQL_VERSION_ID >= 40100) while(mysql_more_results(CON_CONNECTION(_h)) && mysql_next_result(CON_CONNECTION(_h)) == 0) { MYSQL_RES *res = mysql_store_result(CON_CONNECTION(_h)); @@ -301,7 +279,7 @@ static int db_mysql_store_result(const db1_con_t *_h, db1_res_t **_r) } done: -#if(MYSQL_VERSION_ID >= 40100) +#if (MYSQL_VERSION_ID >= 40100) while(mysql_more_results(CON_CONNECTION(_h)) && mysql_next_result(CON_CONNECTION(_h)) == 0) { MYSQL_RES *res = mysql_store_result(CON_CONNECTION(_h)); @@ -356,7 +334,7 @@ int db_mysql_free_result(const db1_con_t *_h, db1_res_t *_r) * this function observed to invoke SSL_read() under libmysqlclient.so.21 * but not libmariadb.so.3; apply libssl guard */ -static int db_mysql_query_impl(const db1_con_t *_h, const db_key_t *_k, +int db_mysql_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) { @@ -364,15 +342,6 @@ static int db_mysql_query_impl(const db1_con_t *_h, const db_key_t *_k, db_mysql_submit_query, db_mysql_store_result); } -int db_mysql_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_mysql_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 day, 7 hours

git:master:b7694edb: db_postgres: revert tls_threads_mode=1

by S-P Chan

Module: kamailio Branch: master Commit: b7694edb65db852ee5a935fbbfe6f9d8c05fa508 URL: https://github.com/kamailio/kamailio/commit/b7694edb65db852ee5a935fbbfe6f9d… 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_postgres: revert tls_threads_mode=1 --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/b7694edb65db852ee5a935fbbfe6f9d… Patch: https://github.com/kamailio/kamailio/commit/b7694edb65db852ee5a935fbbfe6f9d… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index b816599096a..8cb92a1d1e5 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -45,10 +45,6 @@ #include "../../core/locking.h" #include "../../core/hashes.h" #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" #include "km_val.h" @@ -115,17 +111,12 @@ static void db_postgres_free_query(const db1_con_t *_con); * \return database connection on success, NULL on error * \note this function must be called prior to any database functions * - * Init libssl in a thread */ -static db1_con_t *db_postgres_init0(const str *_url) +db1_con_t *db_postgres_init(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 @@ -135,39 +126,28 @@ db1_con_t *db_postgres_init(const str *_url) * * Init libssl in thread */ -static db1_con_t *db_postgres_init2_impl(const str *_url, db_pooling_t pooling) +db1_con_t *db_postgres_init2(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 * \note free all memory and resources */ -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); + db_do_close(_h, db_postgres_free_connection); } - /*! * \brief Submit_query, run a query * \param _con database connection * \param _s query string * \return 0 on success, negative on failure */ -static int db_postgres_submit_query_impl(const db1_con_t *_con, const str *_s) +static int db_postgres_submit_query(const db1_con_t *_con, const str *_s) { char *s = NULL; int i, retries; @@ -295,12 +275,6 @@ static int db_postgres_submit_query_impl(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 day, 7 hours

git:master:9abe414a: htable: get current time once for pv counting items

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9abe414a186e2a6e9041dd03a1a8968f0efa954d URL: https://github.com/kamailio/kamailio/commit/9abe414a186e2a6e9041dd03a1a8968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-20T08:53:04+01:00 htable: get current time once for pv counting items --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9abe414a186e2a6e9041dd03a1a8968… Patch: https://github.com/kamailio/kamailio/commit/9abe414a186e2a6e9041dd03a1a8968… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 45eda69e359..559ee9784d2 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1576,6 +1576,7 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) str sval; str tval; int ival = 0; + time_t tnow = 0; if(sre == NULL || sre->len <= 0 || ht == NULL) return 0; @@ -1655,12 +1656,13 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) } } + tnow = time(NULL); for(i = 0; i < ht->htsize; i++) { /* free entries */ ht_slot_lock(ht, i); it = ht->entries[i].first; while(it) { - if(ht->htexpire > 0 && it->expire != 0 && it->expire < time(NULL)) { + if(ht->htexpire > 0 && it->expire != 0 && it->expire < tnow) { /* entry has expired, continue */ it = it->next; continue;

1 day, 7 hours

git:master:d92a990a: htable: skip expired items for pv counting them

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d92a990a4040279ed7ee4d71debf2a13fd4d6782 URL: https://github.com/kamailio/kamailio/commit/d92a990a4040279ed7ee4d71debf2a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-20T08:19:14+01:00 htable: skip expired items for pv counting them - GH #4080 --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d92a990a4040279ed7ee4d71debf2a1… Patch: https://github.com/kamailio/kamailio/commit/d92a990a4040279ed7ee4d71debf2a1… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 8655c2bf443..45eda69e359 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1660,6 +1660,11 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) ht_slot_lock(ht, i); it = ht->entries[i].first; while(it) { + if(ht->htexpire > 0 && it->expire != 0 && it->expire < time(NULL)) { + /* entry has expired, continue */ + it = it->next; + continue; + } it0 = it->next; if(op == 5) { if(!(it->flags & AVP_VAL_STR))

1 day, 8 hours

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev