sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
194 discussions

git:master:570db90c: modules: readme files regenerated - app_python3 ... [skip ci]
by Kamailio Dev 22 Apr '25

22 Apr '25

Module: kamailio Branch: master Commit: 570db90ccacbe02419fdc9d7c4b8b115f6fb1540 URL: https://github.com/kamailio/kamailio/commit/570db90ccacbe02419fdc9d7c4b8b11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-22T02:01:10+02:00 modules: readme files regenerated - app_python3 ... [skip ci] --- Modified: src/modules/app_python3/README Modified: src/modules/app_python3s/README --- Diff: https://github.com/kamailio/kamailio/commit/570db90ccacbe02419fdc9d7c4b8b11… Patch: https://github.com/kamailio/kamailio/commit/570db90ccacbe02419fdc9d7c4b8b11… --- diff --git a/src/modules/app_python3/README b/src/modules/app_python3/README index 5a012417df5..98d7c3725bc 100644 --- a/src/modules/app_python3/README +++ b/src/modules/app_python3/README @@ -177,6 +177,10 @@ modparam("app_python3", "child_init_method", "my_child_init") If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). + If set to 1, Python threading Thread objects created in the KEMI script + will be scheduled. Otherwise, additional Python threads will not be + scheduled (no release of GIL). + Default value is “0”. Example 1.4. Set threads_mode parameter diff --git a/src/modules/app_python3s/README b/src/modules/app_python3s/README index af38af3e8e0..cf79c7fed56 100644 --- a/src/modules/app_python3s/README +++ b/src/modules/app_python3s/README @@ -174,6 +174,10 @@ def ksr_script_child_init(): If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). + If set to 1, Python threading Thread objects created in the KEMI script + will be scheduled. Otherwise, additional Python threads will not be + scheduled (no release of GIL). + Default value is “0”. Example 1.4. Set threads_mode parameter

1 0

git:6.0:265e0f78: app_python3s: update docs for threads_mode parameter
by S-P Chan 22 Apr '25

22 Apr '25

Module: kamailio Branch: 6.0 Commit: 265e0f78bd0ecf34c0356ad4ffe8a9d9cf4a9594 URL: https://github.com/kamailio/kamailio/commit/265e0f78bd0ecf34c0356ad4ffe8a9d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:59:01+08:00 app_python3s: update docs for threads_mode parameter (cherry picked from commit fcedbd7099a15e09d1dd21c933f3ebfe3c55f5c5) --- Modified: src/modules/app_python3s/doc/app_python3s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/265e0f78bd0ecf34c0356ad4ffe8a9d… Patch: https://github.com/kamailio/kamailio/commit/265e0f78bd0ecf34c0356ad4ffe8a9d… --- diff --git a/src/modules/app_python3s/doc/app_python3s_admin.xml b/src/modules/app_python3s/doc/app_python3s_admin.xml index 8381dda274f..bb9e86c8c5c 100644 --- a/src/modules/app_python3s/doc/app_python3s_admin.xml +++ b/src/modules/app_python3s/doc/app_python3s_admin.xml @@ -160,6 +160,10 @@ def ksr_script_child_init(): v6.0.x). If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). </para> + <para> + If set to 1, Python threading Thread objects created in the KEMI script will be scheduled. Otherwise, + additional Python threads will not be scheduled (no release of GIL). + </para> <para> <emphasis> Default value is <quote>0</quote>.

1 0

git:6.0:5406da9c: app_python3: update docs for threads_mode parameter
by S-P Chan 22 Apr '25

22 Apr '25

Module: kamailio Branch: 6.0 Commit: 5406da9cf265f6dc80beeb9bea642bf8dd87be32 URL: https://github.com/kamailio/kamailio/commit/5406da9cf265f6dc80beeb9bea642bf… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:58:43+08:00 app_python3: update docs for threads_mode parameter (cherry picked from commit 168d289ebd6daadf58199f4461ef7cd30dc7442a) --- Modified: src/modules/app_python3/doc/app_python3_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5406da9cf265f6dc80beeb9bea642bf… Patch: https://github.com/kamailio/kamailio/commit/5406da9cf265f6dc80beeb9bea642bf… --- diff --git a/src/modules/app_python3/doc/app_python3_admin.xml b/src/modules/app_python3/doc/app_python3_admin.xml index 87b97f0824d..20eeae6ffce 100644 --- a/src/modules/app_python3/doc/app_python3_admin.xml +++ b/src/modules/app_python3/doc/app_python3_admin.xml @@ -168,6 +168,10 @@ modparam("app_python3", "child_init_method", "my_child_init") v6.0.x). If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). </para> + <para> + If set to 1, Python threading Thread objects created in the KEMI script will be scheduled. Otherwise, + additional Python threads will not be scheduled (no release of GIL). + </para> <para> <emphasis> Default value is <quote>0</quote>.

1 0

git:6.0:9e8e6efc: app_python3s: fix threads_mode = 1
by S-P Chan 22 Apr '25

22 Apr '25

Module: kamailio Branch: 6.0 Commit: 9e8e6efc812795498d6d540c9f4afcae30965e35 URL: https://github.com/kamailio/kamailio/commit/9e8e6efc812795498d6d540c9f4afca… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:58:18+08:00 app_python3s: fix threads_mode = 1 - fixes gh #4153 - commit 62b4ee4: incorrect use of thread-local storage to save python thread state (cherry picked from commit 779cb229ba9a693ac241f4b359c596c0ed46bb7b) --- Modified: src/modules/app_python3s/app_python3s_mod.c Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9e8e6efc812795498d6d540c9f4afca… Patch: https://github.com/kamailio/kamailio/commit/9e8e6efc812795498d6d540c9f4afca… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index a99154366ad..876bd3c2a20 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -60,7 +60,7 @@ int _apy3s_process_rank = 0; int _ksr_apy3s_threads_mode = 0; PyThreadState *myThreadState = NULL; -__thread PyThreadState *_save = NULL; +PyThreadState *_save = NULL; static int apy3s_script_init_exec(PyObject *pModule, str *fname, int *vparam); diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index c25ccfdc91a..48ee1c46b67 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -52,7 +52,7 @@ extern str _sr_python_load_file; extern int _apy3s_process_rank; extern int _ksr_apy3s_threads_mode; -extern __thread PyThreadState *_save; +extern PyThreadState *_save; int apy_reload_script(void); @@ -69,8 +69,6 @@ sr_apy_env_t *sr_apy_env_get() /** * */ -extern __thread PyThreadState *_save; - int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) { PyObject *pFunc, *pArgs, *pValue;

1 0

git:6.0:24b095d8: app_python3: fix threads_mode = 1
by S-P Chan 22 Apr '25

22 Apr '25

Module: kamailio Branch: 6.0 Commit: 24b095d86ae3288dac2e703dc865f9b43a7c40c6 URL: https://github.com/kamailio/kamailio/commit/24b095d86ae3288dac2e703dc865f9b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:57:46+08:00 app_python3: fix threads_mode = 1 - fixes gh #4153 - commit 0ffe157: incorrect use of thread-local storage to save python thread state (cherry picked from commit 9c746b26bf7ecb4922f445318de7756d21e0d041) --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/24b095d86ae3288dac2e703dc865f9b… Patch: https://github.com/kamailio/kamailio/commit/24b095d86ae3288dac2e703dc865f9b… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 7436d528f26..a25a0e354af 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -59,7 +59,7 @@ int _apy_process_rank = 0; int _ksr_apy3_threads_mode = 0; PyThreadState *myThreadState = NULL; -__thread PyThreadState *_save = NULL; +PyThreadState *_save = NULL; /* clang-format off */ /** module parameters */ diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 3c62265abf6..d4c0f519d1c 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -49,7 +49,7 @@ sr_apy_env_t *sr_apy_env_get() return &_sr_apy_env; } -extern __thread PyThreadState *_save; +extern PyThreadState *_save; extern int _ksr_apy3_threads_mode; #define LOCK_RELEASE \

1 0

git:master:fcedbd70: app_python3s: update docs for threads_mode parameter
by S-P Chan 21 Apr '25

21 Apr '25

Module: kamailio Branch: master Commit: fcedbd7099a15e09d1dd21c933f3ebfe3c55f5c5 URL: https://github.com/kamailio/kamailio/commit/fcedbd7099a15e09d1dd21c933f3ebf… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:34:29+08:00 app_python3s: update docs for threads_mode parameter --- Modified: src/modules/app_python3s/doc/app_python3s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fcedbd7099a15e09d1dd21c933f3ebf… Patch: https://github.com/kamailio/kamailio/commit/fcedbd7099a15e09d1dd21c933f3ebf… --- diff --git a/src/modules/app_python3s/doc/app_python3s_admin.xml b/src/modules/app_python3s/doc/app_python3s_admin.xml index 8381dda274f..bb9e86c8c5c 100644 --- a/src/modules/app_python3s/doc/app_python3s_admin.xml +++ b/src/modules/app_python3s/doc/app_python3s_admin.xml @@ -160,6 +160,10 @@ def ksr_script_child_init(): v6.0.x). If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). </para> + <para> + If set to 1, Python threading Thread objects created in the KEMI script will be scheduled. Otherwise, + additional Python threads will not be scheduled (no release of GIL). + </para> <para> <emphasis> Default value is <quote>0</quote>.

1 0

git:master:168d289e: app_python3: update docs for threads_mode parameter
by S-P Chan 21 Apr '25

21 Apr '25

Module: kamailio Branch: master Commit: 168d289ebd6daadf58199f4461ef7cd30dc7442a URL: https://github.com/kamailio/kamailio/commit/168d289ebd6daadf58199f4461ef7cd… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:34:29+08:00 app_python3: update docs for threads_mode parameter --- Modified: src/modules/app_python3/doc/app_python3_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/168d289ebd6daadf58199f4461ef7cd… Patch: https://github.com/kamailio/kamailio/commit/168d289ebd6daadf58199f4461ef7cd… --- diff --git a/src/modules/app_python3/doc/app_python3_admin.xml b/src/modules/app_python3/doc/app_python3_admin.xml index 87b97f0824d..20eeae6ffce 100644 --- a/src/modules/app_python3/doc/app_python3_admin.xml +++ b/src/modules/app_python3/doc/app_python3_admin.xml @@ -168,6 +168,10 @@ modparam("app_python3", "child_init_method", "my_child_init") v6.0.x). If set to 0, use PyGILState_Ensure()/PyGILState_Release() (the mode implemented initially). </para> + <para> + If set to 1, Python threading Thread objects created in the KEMI script will be scheduled. Otherwise, + additional Python threads will not be scheduled (no release of GIL). + </para> <para> <emphasis> Default value is <quote>0</quote>.

1 0

git:master:779cb229: app_python3s: fix threads_mode = 1
by S-P Chan 21 Apr '25

21 Apr '25

Module: kamailio Branch: master Commit: 779cb229ba9a693ac241f4b359c596c0ed46bb7b URL: https://github.com/kamailio/kamailio/commit/779cb229ba9a693ac241f4b359c596c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:34:29+08:00 app_python3s: fix threads_mode = 1 - fixes gh #4153 - commit 62b4ee4: incorrect use of thread-local storage to save python thread state --- Modified: src/modules/app_python3s/app_python3s_mod.c Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/779cb229ba9a693ac241f4b359c596c… Patch: https://github.com/kamailio/kamailio/commit/779cb229ba9a693ac241f4b359c596c… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index a99154366ad..876bd3c2a20 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -60,7 +60,7 @@ int _apy3s_process_rank = 0; int _ksr_apy3s_threads_mode = 0; PyThreadState *myThreadState = NULL; -__thread PyThreadState *_save = NULL; +PyThreadState *_save = NULL; static int apy3s_script_init_exec(PyObject *pModule, str *fname, int *vparam); diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index c25ccfdc91a..48ee1c46b67 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -52,7 +52,7 @@ extern str _sr_python_load_file; extern int _apy3s_process_rank; extern int _ksr_apy3s_threads_mode; -extern __thread PyThreadState *_save; +extern PyThreadState *_save; int apy_reload_script(void); @@ -69,8 +69,6 @@ sr_apy_env_t *sr_apy_env_get() /** * */ -extern __thread PyThreadState *_save; - int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) { PyObject *pFunc, *pArgs, *pValue;

1 0

git:master:9c746b26: app_python3: fix threads_mode = 1
by S-P Chan 21 Apr '25

21 Apr '25

Module: kamailio Branch: master Commit: 9c746b26bf7ecb4922f445318de7756d21e0d041 URL: https://github.com/kamailio/kamailio/commit/9c746b26bf7ecb4922f445318de7756… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2025-04-22T07:34:29+08:00 app_python3: fix threads_mode = 1 - fixes gh #4153 - commit 0ffe157: incorrect use of thread-local storage to save python thread state --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/9c746b26bf7ecb4922f445318de7756… Patch: https://github.com/kamailio/kamailio/commit/9c746b26bf7ecb4922f445318de7756… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 7436d528f26..a25a0e354af 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -59,7 +59,7 @@ int _apy_process_rank = 0; int _ksr_apy3_threads_mode = 0; PyThreadState *myThreadState = NULL; -__thread PyThreadState *_save = NULL; +PyThreadState *_save = NULL; /* clang-format off */ /** module parameters */ diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 3c62265abf6..d4c0f519d1c 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -49,7 +49,7 @@ sr_apy_env_t *sr_apy_env_get() return &_sr_apy_env; } -extern __thread PyThreadState *_save; +extern PyThreadState *_save; extern int _ksr_apy3_threads_mode; #define LOCK_RELEASE \

1 0

git:master:47aa53eb: cdp: free in case of errors inside load_certificates()
by Daniel-Constantin Mierla 21 Apr '25

21 Apr '25

Module: kamailio Branch: master Commit: 47aa53ebd55eba4b36c38329f8619d9f7d20c076 URL: https://github.com/kamailio/kamailio/commit/47aa53ebd55eba4b36c38329f8619d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-21T08:24:18+02:00 cdp: free in case of errors inside load_certificates() --- Modified: src/modules/cdp/cdp_tls.c --- Diff: https://github.com/kamailio/kamailio/commit/47aa53ebd55eba4b36c38329f8619d9… Patch: https://github.com/kamailio/kamailio/commit/47aa53ebd55eba4b36c38329f8619d9… --- diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index a3cfdfa9252..f2c7c7b8b63 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -149,16 +149,20 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) } if(pkg_str_dup(&key_fixed, key) < 0) { LM_ERR("Failed to copy key parameter\n"); + pkg_free(cert_fixed.s); return -1; } if(!SSL_CTX_use_certificate_chain_file(ctx, cert_fixed.s)) { LM_ERR("Unable to load certificate file\n"); TLS_LM_ERR("load_cert:", ctx); + pkg_free(key_fixed.s); + pkg_free(cert_fixed.s); return -1; } if(SSL_CTX_use_PrivateKey_file(ctx, key_fixed.s, SSL_FILETYPE_PEM) <= 0) { LM_ERR("Unable to load private key file\n"); TLS_LM_ERR("load_private_key:", ctx); + pkg_free(key_fixed.s); return -1; } if(!SSL_CTX_check_private_key(ctx)) {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2025