- sr-dev - kamailio.org

Heads-up: master/libssl - going to revert tls_threads_mode=1
by Richard Chan 20 Dec '24

20 Dec '24

HI devs, In trying to solve the libssl3 issue the original attempt with tls_threads_mode=1 turns out to be not quite correct. Since the release of 5.8 we have consistently recommended tls_threads_mode=2 for users of libssl 1.1.1 and 3. For master/6.0.0-pre I will start to revert the changes of tls_threads_mode=1. I will also add a new simpler mode tls_threads_mode=3 based on the diff by Ondrej Jirman <megi(a)xff.cz> (@meengu). Regards Richard

2 4

git:master:003a9294: cmake/utills: Config all files for build and install
by Xenofon Karamanos 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 003a92942aeefd6611f9a2754f71b293ac73caaf URL: https://github.com/kamailio/kamailio/commit/003a92942aeefd6611f9a2754f71b29… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-20T11:04:53Z cmake/utills: Config all files for build and install - Config and install all kamctl related files - Config and install all kamdb related files - Format file --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/003a92942aeefd6611f9a2754f71b29… Patch: https://github.com/kamailio/kamailio/commit/003a92942aeefd6611f9a2754f71b29…

1 0

git:master:ea96d46a: cmake/utils: Fix double kamctl lib path
by Xenofon Karamanos 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: ea96d46a6ab4d60614a1f1cb86bcc1d983811b06 URL: https://github.com/kamailio/kamailio/commit/ea96d46a6ab4d60614a1f1cb86bcc1d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-20T11:04:53Z cmake/utils: Fix double kamctl lib path --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ea96d46a6ab4d60614a1f1cb86bcc1d… Patch: https://github.com/kamailio/kamailio/commit/ea96d46a6ab4d60614a1f1cb86bcc1d… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index e71af919240..5893aa79308 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) set(BIN_DIR "${CMAKE_INSTALL_FULL_SBINDIR}") -set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") +set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}") set(CFG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}")

1 0

master: kamctl MYLIBDIR has a doubled path segment kamctl/kamctl/
by Richard Chan 20 Dec '24

20 Dec '24

Hi devs, I am seeing a doubled path segment kamctl/ in MYLIBDIR in kamctl MYLIBDIR="/usr/local/kamailio/lib64/kamailio/kamctl/kamctl" kamctl.base is actually installed to /usr/local/kamailio/lib64/kamailio/kamctl/kamctl.base. This is the lastest master on debian 12. Anyone else seeing this? My compilation command is cmake -DCMAKE_INSTALL_PREFIX-/usr/local/kamailio -DCMAKE_INSTALL_LOCALSTATEDIR=/var -S . -B build/ cmake --build build/ cmake --install build/ Regards Richard

2 2

git:master:13c3f133: github: remove extra info from nightly jobs [skip ci]
by Victor Seva 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 13c3f133ffd1f158593d2aa4b3b61d88c2009a6a URL: https://github.com/kamailio/kamailio/commit/13c3f133ffd1f158593d2aa4b3b61d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-20T11:26:30+01:00 github: remove extra info from nightly jobs [skip ci] * is causing problems with multiline commit messages --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/13c3f133ffd1f158593d2aa4b3b61d8… Patch: https://github.com/kamailio/kamailio/commit/13c3f133ffd1f158593d2aa4b3b61d8… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 54a3681380a..4486d11fa70 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -33,9 +33,6 @@ jobs: - name: Show last execution info run: | echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" - echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" - echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" - echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} x86_64: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 64b24dea4cf..9cdeafc77ff 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -23,10 +23,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Show last execution info run: | - echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} - echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" - echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" - echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" + echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} analyze:

1 0

git:master:e36b2d60: github: remove extra info from nightly jobs [skip ci]
by Victor Seva 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: e36b2d60de5c8ea6831e174bb3e690c374a755b3 URL: https://github.com/kamailio/kamailio/commit/e36b2d60de5c8ea6831e174bb3e690c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-20T11:23:53+01:00 github: remove extra info from nightly jobs [skip ci] * is causing problems with multiline commit messages --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/e36b2d60de5c8ea6831e174bb3e690c… Patch: https://github.com/kamailio/kamailio/commit/e36b2d60de5c8ea6831e174bb3e690c… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 54a3681380a..4486d11fa70 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -33,9 +33,6 @@ jobs: - name: Show last execution info run: | echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" - echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" - echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" - echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} x86_64: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 64b24dea4cf..a0574dede56 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,9 +24,6 @@ jobs: - name: Show last execution info run: | echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} - echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" - echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" - echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} analyze:

1 0

git:master:852d1794: github: add step name on check [skip ci]
by Victor Seva 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 852d17946e8857056572a03f3b5bff6438bed29c URL: https://github.com/kamailio/kamailio/commit/852d17946e8857056572a03f3b5bff6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-20T10:53:52+01:00 github: add step name on check [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/852d17946e8857056572a03f3b5bff6… Patch: https://github.com/kamailio/kamailio/commit/852d17946e8857056572a03f3b5bff6… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index b9456f319fd..54a3681380a 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -30,7 +30,8 @@ jobs: repo: kamailio env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: | + - name: Show last execution info + run: | echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6c6ff54843f..64b24dea4cf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -21,7 +21,8 @@ jobs: repo: kamailio env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: | + - name: Show last execution info + run: | echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}"

1 0

git:master:4133f24f: github: fix check step for nightly jobs [skip ci]
by Victor Seva 20 Dec '24

20 Dec '24

Module: kamailio Branch: master Commit: 4133f24fde0ade54a5454baf045f774a73434cef URL: https://github.com/kamailio/kamailio/commit/4133f24fde0ade54a5454baf045f774… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-20T10:39:16+01:00 github: fix check step for nightly jobs [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/4133f24fde0ade54a5454baf045f774… Patch: https://github.com/kamailio/kamailio/commit/4133f24fde0ade54a5454baf045f774… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index caaabfa3987..b9456f319fd 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -31,10 +31,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - echo Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} - echo commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }} - echo display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }} - echo conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }} + echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" + echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" + echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" + echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} x86_64: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9c2d7f84024..6c6ff54843f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,10 +22,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - echo Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} - echo commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }} - echo display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }} - echo conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }} + echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} + echo "commit_message: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_commit.message }}" + echo "display_title: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].display_title }}" + echo "conclusion: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].conclusion }}" outputs: last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} analyze:

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

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

1 0

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

20 Dec '24

Module: kamailio Branch: master Commit: a8c23061bf2b9ce2240cd52e554b440cb996bc9e URL: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T16:27:07+08:00 db_unixodbc: revert tls_threads_mode=1 --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… Patch: https://github.com/kamailio/kamailio/commit/a8c23061bf2b9ce2240cd52e554b440… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index 0637a1f6afd..11724a28b23 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -27,10 +27,6 @@ #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" -#define KSR_RTHREAD_NEED_4PP -#define KSR_RTHREAD_NEED_4P5I2P2 -#define KSR_RTHREAD_NEED_0P -#include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" #include "connection.h" @@ -86,7 +82,7 @@ static int reconnect(const db1_con_t *_h) /* * Send an SQL query to the server */ -static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) +static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) { int ret = 0; SQLCHAR sqlstate[7]; @@ -160,11 +156,6 @@ static int db_unixodbc_submit_query_impl(const db1_con_t *_h, const str *_s) return ret; } -static int db_unixodbc_submit_query(const db1_con_t *_h, const str *_s) -{ - return run_thread4PP((_thread_proto4PP)db_unixodbc_submit_query_impl, - (void *)_h, (void *)_s); -} /** * */ @@ -238,9 +229,8 @@ extern char *db_unixodbc_tquote; * Initialize database module * No function should be called before this * - * Init libssl in a thread - */ -static db1_con_t *db_unixodbc_init0(const str *_url) + */ +db1_con_t *db_unixodbc_init(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_unixodbc_new_connection); @@ -249,23 +239,13 @@ static db1_con_t *db_unixodbc_init0(const str *_url) return c; } -db1_con_t *db_unixodbc_init(const str *_url) -{ - return run_threadP((_thread_proto)&db_unixodbc_init0, (void *)_url); -} - /* * Shut down database module * No function should be called after this */ -static void db_unixodbc_close_impl(db1_con_t *_h) -{ - return db_do_close(_h, db_unixodbc_free_connection); -} - void db_unixodbc_close(db1_con_t *_h) { - run_thread0P((_thread_proto0P)db_unixodbc_close_impl, _h); + return db_do_close(_h, db_unixodbc_free_connection); } /* @@ -308,7 +288,7 @@ static int db_unixodbc_store_result(const db1_con_t *_h, db1_res_t **_r) /* * Release a result set from memory */ -static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) +int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) { if((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -324,12 +304,6 @@ static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) return 0; } -int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) -{ - return run_thread4PP( - (_thread_proto4PP)db_unixodbc_free_result_impl, _h, _r); -} - /* * Query table for specified rows * _h: structure representing database connection @@ -341,7 +315,7 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) * _nc: number of columns to return * _o: order by the specified column */ -static int db_unixodbc_query_impl(const db1_con_t *_h, const db_key_t *_k, +int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) { @@ -350,15 +324,6 @@ static int db_unixodbc_query_impl(const db1_con_t *_h, const db_key_t *_k, db_unixodbc_store_result); } -int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, - const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, - const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) -{ - return run_thread4P5I2P2((_thread_proto4P5I2P2)db_unixodbc_query_impl, - (void *)_h, (void *)_k, (void *)_op, (void *)_v, (void *)_c, _n, - _nc, (void *)_o, (void *)_r); -} - /*! * \brief Gets a partial result set, fetch rows from a result *

1 0

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

20 Dec '24

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 0

git:master:50042a4a: db_mysql: revert tls_threads_mode=1
by S-P Chan 20 Dec '24

20 Dec '24

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 0

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

20 Dec '24

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 0

git:master:9abe414a: htable: get current time once for pv counting items
by Daniel-Constantin Mierla 20 Dec '24

20 Dec '24

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 0

git:master:d92a990a: htable: skip expired items for pv counting them
by Daniel-Constantin Mierla 20 Dec '24

20 Dec '24

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 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bullseye #2889
by kamailio＠sipwise.com 20 Dec '24

20 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 66.92 KiB...] I: new cache content 'autotools-dev_20180224.1+nmu1_all.deb' added I: new cache content 'libicu67_67.1-7_amd64.deb' added I: new cache content 'libltdl7_2.4.6-15_amd64.deb' added I: new cache content 'dwz_0.13+20210201-1_amd64.deb' added I: new cache content 'libmaxminddb0_1.5.2-1_amd64.deb' added I: new cache content 'ruby_1%3a2.7+2_amd64.deb' added I: new cache content 'sgml-data_2.0.11+nmu1_all.deb' added I: new cache content 'autopoint_0.21-4_all.deb' added I: new cache content 'libncurses6_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'libjson-c-dev_0.15-2+deb11u1_amd64.deb' added I: new cache content 'ruby-net-telnet_0.1.1-2_all.deb' added I: new cache content 'python3-dev_3.9.2-3_amd64.deb' added I: new cache content 'libprotobuf-dev_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libpsl5_0.21.0-1.2_amd64.deb' added I: new cache content 'libphonenumber8_8.12.16-4_amd64.deb' added I: new cache content 'libjs-jquery_3.5.1+dfsg+~3.5.5-7_all.deb' added I: new cache content 'libsecsipid1_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'libruby2.7_2.7.4-1+deb11u2_amd64.deb' added I: new cache content 'icu-devtools_67.1-7_amd64.deb' added I: new cache content 'libboost-system1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libelf1_0.183-1_amd64.deb' added I: new cache content 'libpython3.9-stdlib_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libevent-core-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libmnl0_1.0.4-3_amd64.deb' added I: new cache content 'libjs-underscore_1.9.1~dfsg-3_all.deb' added I: new cache content 'libreadline-dev_8.1-1_amd64.deb' added I: new cache content 'ruby-dev_1%3a2.7+2_amd64.deb' added I: new cache content 'libradcli4_1.2.11-1+b2_amd64.deb' added I: new cache content 'pkg-config_0.29.2-1_amd64.deb' added I: new cache content 'libpython2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libsigsegv2_2.13-1_amd64.deb' added I: new cache content 'm4_1.4.18-5_amd64.deb' added I: new cache content 'libmongoc-dev_1.17.6-1_amd64.deb' added I: new cache content 'librabbitmq-dev_0.10.0-1_amd64.deb' added I: new cache content 'libsqlite3-dev_3.34.1-3+deb11u1_amd64.deb' added I: new cache content 'python3-lib2to3_3.9.2-1_all.deb' added I: new cache content 'libreadline8_8.1-1_amd64.deb' added I: new cache content 'python2_2.7.18-3_amd64.deb' added I: new cache content 'default-libmysqlclient-dev_1.0.7_amd64.deb' added I: new cache content 'librdkafka-dev_1.6.0-1_amd64.deb' added I: new cache content 'libuv1-dev_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'libprotobuf23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libjs-sphinxdoc_3.4.3-2_all.deb' added I: new cache content 'libboost-atomic1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libpython3-dev_3.9.2-3_amd64.deb' added I: new cache content 'docbook-xml_4.5-9_all.deb' added I: new cache content 'ruby-power-assert_1.1.7-2_all.deb' added I: new cache content 'libjansson4_2.13.1-1.1_amd64.deb' added I: new cache content 'libudev-dev_247.3-7+deb11u6_amd64.deb' added I: new cache content 'libpython3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libedit2_3.1-20191231-2+b1_amd64.deb' added I: new cache content 'libpci3_1%3a3.7.0-5_amd64.deb' added I: new cache content 'automake_1%3a1.16.3-2_all.deb' added I: new cache content 'flex_2.6.4-8_amd64.deb' added I: new cache content 'libdebhelper-perl_13.3.4_all.deb' added I: new cache content 'libldap2-dev_2.4.57+dfsg-3+deb11u1_amd64.deb' added I: new cache content 'libpq5_13.18-0+deb11u1_amd64.deb' added I: new cache content 'libsub-override-perl_0.09-2_all.deb' added I: new cache content 'librabbitmq4_0.10.0-1_amd64.deb' added I: new cache content 'libmemcached11_1.0.18-4.2_amd64.deb' added I: new cache content 'libgnutls28-dev_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'python3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libxml2-dev_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'libpcre2-posix2_10.36-2+deb11u1_amd64.deb' added I: new cache content 'python-is-python2_2.7.18-9_all.deb' added I: new cache content 'libmariadb-dev-compat_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'odbcinst1debian2_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libbson-dev_1.17.6-1_amd64.deb' added I: new cache content 'libjansson-dev_2.13.1-1.1_amd64.deb' added I: new cache content 'libgmpxx4ldbl_2%3a6.2.1+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libsnmp-dev_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libmongocrypt0_1.1.0-1_amd64.deb' added I: new cache content 'libboost-serialization1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libzstd-dev_1.4.8+dfsg-2.1_amd64.deb' added I: new cache content 'libsnmp40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libsctp-dev_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libhashkit-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'libcap-dev_1%3a2.44-1_amd64.deb' added I: new cache content 'libboost-date-time1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'xml-core_0.18+nmu1_all.deb' added I: new cache content 'libmpdec3_2.5.1-1_amd64.deb' added I: new cache content 'libsasl2-2_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libboost-system1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libperl-dev_5.32.1-4+deb11u4_amd64.deb' added I: new cache content 'ruby-rubygems_3.2.5-2_all.deb' added I: new cache content 'libevent-extra-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'ruby-minitest_5.13.0-1_all.deb' added I: new cache content 'libwrap0-dev_7.6.q-31_amd64.deb' added I: new cache content 'libexpat1_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'python2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libboost-date-time1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'librdkafka++1_1.6.0-1_amd64.deb' added I: new cache content 'bsdextrautils_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'libmongocrypt-dev_1.1.0-1_amd64.deb' added I: new cache content 'python3-distutils_3.9.2-1_all.deb' added I: new cache content 'mariadb-common_1%3a10.5.26-0+deb11u2_all.deb' added I: new cache content 'libcurl4_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libyaml-0-2_0.2.2-1_amd64.deb' added I: new cache content 'libgnutls-openssl27_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'rake_13.0.3-1_all.deb' added I: new cache content 'libunbound8_1.13.1-1+deb11u4_amd64.deb' added I: new cache content 'libboost-thread-dev_1.74.0.3_amd64.deb' added I: new cache content 'erlang-base_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libprocps8_2%3a3.3.17-5_amd64.deb' added I: new cache content 'libtool_2.4.6-15_all.deb' added I: new cache content 'python2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'debhelper_13.3.4_all.deb' added I: new cache content 'libarchive-zip-perl_1.68-1_all.deb' added I: new cache content 'libnetsnmptrapd40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libcap2_1%3a2.44-1_amd64.deb' added I: new cache content 'libwebsockets-dev_4.0.20-2_amd64.deb' added I: new cache content 'libunistring-dev_0.9.10-4_amd64.deb' added I: new cache content 'bison_2%3a3.7.5+dfsg-1_amd64.deb' added I: new cache content 'libevent-dev_2.1.12-stable-1_amd64.deb' added I: new cache content 'libpcre2-32-0_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libmagic1_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libwebsockets16_4.0.20-2_amd64.deb' added I: new cache content 'libphonenumber-dev_8.12.16-4_amd64.deb' added I: new cache content 'libdb5.3-dev_5.3.28+dfsg1-0.8_amd64.deb' added I: new cache content 'libprotobuf-lite23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libevent-openssl-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libsasl2-dev_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libdb-dev_5.3.1+nmu1_amd64.deb' added I: new cache content 'python3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'liblua5.1-0_5.1.5-8.1+b3_amd64.deb' added I: new cache content 'libhiredis-dev_0.14.1-1_amd64.deb' added I: new cache content 'libsctp1_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libmaxminddb-dev_1.5.2-1_amd64.deb' added I: new cache content 'python2-minimal_2.7.18-3_amd64.deb' added I: new cache content 'libbrotli1_1.0.9-2+b2_amd64.deb' added I: new cache content 'libnghttp2-14_1.43.0-1+deb11u2_amd64.deb' added I: new cache content 'libhashkit2_1.0.18-4.2_amd64.deb' added I: new cache content 'libsensors-dev_1%3a3.6.0-7_amd64.deb' added I: new cache content 'libidn2-dev_2.3.0-5_amd64.deb' added I: new cache content 'man-db_2.9.4-2_amd64.deb' added I: new cache content 'media-types_4.0.0_all.deb' added I: new cache content 'libboost-chrono1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'po-debconf_1.0.21+nmu1_all.deb' added I: new cache content 'mailcap_3.69_all.deb' added I: new cache content 'libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libboost-thread1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'dh-autoreconf_20_all.deb' added I: new cache content 'openssl_1.1.1w-0+deb11u2_amd64.deb' added I: new cache content 'libboost1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libboost-serialization1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libmosquitto-dev_2.0.11-1+deb11u1_amd64.deb' added I: new cache content 'groff-base_1.22.4-6_amd64.deb' added I: new cache content 'libsecsipid-dev_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'libexpat1-dev_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'uuid-dev_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'unixodbc-dev_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libuchardet0_0.0.7-1_amd64.deb' added I: new cache content 'libsasl2-modules-db_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'ca-certificates_20210119_all.deb' added I: new cache content 'libuv1_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'python3-minimal_3.9.2-3_amd64.deb' added I: new cache content 'python3.9-dev_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'pci.ids_0.0~2021.02.08-1_all.deb' added I: new cache content 'libgnutlsxx28_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpcre2-dev_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libgnutls-dane0_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'xsltproc_1.1.34-4+deb11u1_amd64.deb' added I: new cache content 'libev-dev_1%3a4.33-1_amd64.deb' added I: new cache content 'libjson-c5_0.15-2+deb11u1_amd64.deb' added I: new cache content 'libmariadb3_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'libsensors-config_1%3a3.6.0-7_all.deb' added I: new cache content 'gettext-base_0.21-4_amd64.deb' added I: new cache content 'libncurses-dev_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'ruby-xmlrpc_0.3.0-2_all.deb' added I: new cache content 'autoconf_2.69-14_all.deb' added I: new cache content 'libboost-chrono1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libbson-1.0-0_1.17.6-1_amd64.deb' added I: new cache content 'mysql-common_5.8+1.0.7_all.deb' added I: new cache content 'libgeocoding8_8.12.16-4_amd64.deb' added I: new cache content 'libevent-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'python2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'mime-support_3.66_all.deb' added I: new cache content 'libboost-thread1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'python3_3.9.2-3_amd64.deb' added I: new cache content 'libpython2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libev4_1%3a4.33-1_amd64.deb' added I: new cache content 'odbcinst_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libmicrohttpd12_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libtasn1-6-dev_4.16.0-2+deb11u1_amd64.deb' added I: new cache content 'libmnl-dev_1.0.4-3_amd64.deb' added I: new cache content 'libpython3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libglib2.0-0_2.66.8-1+deb11u5_amd64.deb' added I: new cache content 'libmariadb-dev_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'file_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libcurl4-openssl-dev_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libmd0_1.0.3-3_amd64.deb' added I: new cache content 'erlang-dev_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libmemcached-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'dh-strip-nondeterminism_1.12.0-1_all.deb' added I: new cache content 'libsnmp-base_5.9+dfsg-4+deb11u1_all.deb' added I: new cache content 'libmicrohttpd-dev_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libfile-stripnondeterminism-perl_1.12.0-1_all.deb' added I: new cache content 'rubygems-integration_1.18_all.deb' added I: new cache content 'libhiredis0.14_0.14.1-1_amd64.deb' added I: new cache content 'libsnappy1v5_1.1.8-1_amd64.deb' added I: new cache content 'libpipeline1_1.5.3-1_amd64.deb' added I: new cache content 'libradcli-dev_1.2.11-1+b2_amd64.deb' added I: new cache content 'libicu-dev_67.1-7_amd64.deb' added I: new cache content 'libpci-dev_1%3a3.7.0-5_amd64.deb' added I: new cache content 'libxml2_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'python2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'librtmp1_2.4+20151223.gitfa8646d.1-2+b2_amd64.deb' added I: unmounting /tmp/apt-jdg_WVBQLg filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.3101 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bullseye-amd64.building.2752 + '[' -r /run/lock/bullseye-amd64.update.2752 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.7wHwHO3XpA ']' + rm -rf /tmp/tmp.7wHwHO3XpA + '[' -n /tmp/apt-jdg_WVBQLg ']' + sudo rm -rf /tmp/apt-jdg_WVBQLg + '[' -n 364 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=15 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Thu Dec 19 01:04:24 UTC 2024 [running 15 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Thu Dec 19 01:04:24 UTC 2024 [running 15 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:5.8:1e6738e7: tls_wolfssl: update internal submodule to v5.7.4-stable tag
by S-P Chan 20 Dec '24

20 Dec '24

Module: kamailio Branch: 5.8 Commit: 1e6738e7f2c554ffa16e11125673c7ea4e092935 URL: https://github.com/kamailio/kamailio/commit/1e6738e7f2c554ffa16e11125673c7e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-20T09:02:49+08:00 tls_wolfssl: update internal submodule to v5.7.4-stable tag --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/1e6738e7f2c554ffa16e11125673c7e… Patch: https://github.com/kamailio/kamailio/commit/1e6738e7f2c554ffa16e11125673c7e… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 66596ad9e1d..bdd62314f00 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e +Subproject commit bdd62314f00fca0e216bf8c963c8eeff6327e0cb

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev