sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
313 discussions

[kamailio/kamailio] sigabrt on kamailio 5.5.6 (Issue #3593)
by descartin 09 Jan '24

09 Jan '24

version: kamailio 5.5.6 (x86_64/linux) 21a9bc Operating System: Debian GNU/Linux 11 (bullseye) Kernel: Linux 5.10.0-22-amd64 we see this core it has repeated some times in different days ``` (gdb) bt #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007fde2329f537 in __GI_abort () at abort.c:79 #2 0x000055d5fab45995 in sig_alarm_abort (signo=14) at main.c:699 #3 <signal handler called> #4 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:37 #5 0x00007fde1c80a015 in futex_get (lock=0x7fdd9f9c9ca4) at ../../core/mem/../futexlock.h:108 #6 0x00007fde1c80c526 in destroy_linkers (linker=0x0) at dlg_profile.c:275 #7 0x00007fde1c7f87b3 in destroy_dlg (dlg=0x7fddad479ea0) at dlg_hash.c:377 #8 0x00007fde1c7f8ca0 in destroy_dlg_table () at dlg_hash.c:438 #9 0x00007fde1c790286 in mod_destroy () at dialog.c:809 #10 0x000055d5fad76dd8 in destroy_modules () at core/sr_module.c:842 #11 0x000055d5fab440e2 in cleanup (show_status=1) at main.c:575 #12 0x000055d5fab45d45 in shutdown_children (sig=15, show_status=1) at main.c:718 #13 0x000055d5fab49129 in handle_sigs () at main.c:816 #14 0x000055d5fab56959 in main_loop () at main.c:1903 #15 0x000055d5fab602e9 in main (argc=15, argv=0x7ffd9451bbb8) at main.c:3061 (gdb) bt full #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 set = {__val = {8192, 0 <repeats 15 times>}} pid = <optimized out> tid = <optimized out> ret = <optimized out> #1 0x00007fde2329f537 in __GI_abort () at abort.c:79 save_stage = 1 act = {__sigaction_handler = {sa_handler = 0x0, sa_sigaction = 0x0}, sa_mask = {__val = {0 <repeats 16 times>}}, sa_flags = 0, sa_restorer = 0x55d5faf6b088} sigs = {__val = {32, 0 <repeats 15 times>}} #2 0x000055d5fab45995 in sig_alarm_abort (signo=14) at main.c:699 __func__ = "sig_alarm_abort" #3 <signal handler called> No locals. #4 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:37 No locals. #5 0x00007fde1c80a015 in futex_get (lock=0x7fdd9f9c9ca4) at ../../core/mem/../futexlock.h:108 v = 2 i = 1024 #6 0x00007fde1c80c526 in destroy_linkers (linker=0x0) at dlg_profile.c:275 p_entry = 0x7fdd9f9c9d88 l = 0x7fddd2aca430 lh = 0x55d5faf81a03 __func__ = "destroy_linkers" #7 0x00007fde1c7f87b3 in destroy_dlg (dlg=0x7fddad479ea0) at dlg_hash.c:377 ret = 1 var = 0x7fde1c719a44 <mod_destroy+859> --Type <RET> for more, q to quit, c to continue without paging-- __func__ = "destroy_dlg" #8 0x00007fde1c7f8ca0 in destroy_dlg_table () at dlg_hash.c:438 dlg = 0x0 l_dlg = 0x7fddad479ea0 i = 0 __func__ = "destroy_dlg_table" #9 0x00007fde1c790286 in mod_destroy () at dialog.c:809 No locals. #10 0x000055d5fad76dd8 in destroy_modules () at core/sr_module.c:842 t = 0x7fde1f328018 foo = 0x7fde1f327838 __func__ = "destroy_modules" #11 0x000055d5fab440e2 in cleanup (show_status=1) at main.c:575 memlog = 0 __func__ = "cleanup" #12 0x000055d5fab45d45 in shutdown_children (sig=15, show_status=1) at main.c:718 __func__ = "shutdown_children" #13 0x000055d5fab49129 in handle_sigs () at main.c:816 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 0 __func__ = "handle_sigs" #14 0x000055d5fab56959 in main_loop () at main.c:1903 i = 14 pid = 3845341 --Type <RET> for more, q to quit, c to continue without paging-- si = 0x0 si_desc = "udp receiver child=13 sock=87.237.87.28:5060\000\000\000\000\300\272Q\224\375\177\000\000\000\000\000\000\000\000\000\000\003\032\370\372\325U\000\000-\000\000\000\000\000\000\000\200\003\062\037\336\177\000\000F\034\067#\336\177\000\000\060\000\000\000\060\000\000\000x\266Q\224\375\177\000\000\220\265Q\224\375\177\000\000\000\230\026︾\314\"" nrprocs = 14 woneinit = 1 __func__ = "main_loop" #15 0x000055d5fab602e9 in main (argc=15, argv=0x7ffd9451bbb8) at main.c:3061 cfg_stream = 0x55d5fbd3f2e0 c = -1 r = 0 tmp = 0x7ffd9451ce7c "" tmp_len = 832 port = 832 proto = 832 ahost = 0x0 aport = 0 options = 0x55d5faf6e0b8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4110196155 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x98000000980 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 23, st_ino = 946, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 998, __pad0 = 0, st_rdev = 0, st_size = 140, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1696021490, tv_nsec = 675255852}, --Type <RET> for more, q to quit, c to continue without paging-- st_mtim = {tv_sec = 1696418622, tv_nsec = 168794592}, st_ctim = {tv_sec = 1696418622, tv_nsec = 168794592}, __glibc_reserved = {0, 0, 0}} tbuf = "P\267Q\224\375\177\000\000\310e)#\336\177\000\000\020\204]#\336\177\000\000\000\000\000\000\000\000\000\000зQ\224\375\177\000\000\000\000\000\000\000\000\000\000зQ\224\375\177", '\000' <repeats 18 times>, "`g^#\336\177\000\000\350$a#\336\177\000\000\204i^#\336\177\000\000\060d^#\336\177\000\000H\020a#\336\177\000\000\000`^#\336\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000@\"(#\336\177", '\000' <repeats 66 times>... option_index = 0 long_options = {{name = 0x55d5faf70526 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55d5faf6b51c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55d5faf7052b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55d5faf70531 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55d5faf70537 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55d5faf70540 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55d5faf7054a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55d5faf70554 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55d5faf7055f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55d5faf70568 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55d5faf70573 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55d5faf70579 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55d5faf70583 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) ``` could it be related to any type of message that is making the kamailio crush? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3593 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3593(a)github.com>

4 7

[kamailio/kamailio] janssonrpcc: No failover to lower prio server (Issue #3378)
by Alex Hermann 09 Jan '24

09 Jan '24

### Description I have 2 jsonrpc servers configured with different prio's. For testing, I have the servers configured to always delay the response to any request by more than the module's timout setting. The (initial) request is sent to the first server. As this one times out, I would expect a retry to go to the second servers, but instead, all retries are sent to the same server. The backup server is never contacted. This makes the whole "prio" system seem a bit useless.  ### Troubleshooting #### Reproduction ``` modparam("janssonrpcc", "server", "conn=test;addr=pc1;port=8081;priority=5;weight=10") modparam("janssonrpcc", "server", "conn=test;addr=pc1;port=8082;priority=5;weight=10") ``` ``` janssonrpc_request("test", "Test.Timeout", '[ { "Timout": 1000} ]', "route=JSONRPC_RESPONSE;retry=10;timeout=1000"); ```  #### Log Messages No useful logs are produced. I verified the described behavior on the jsonrpc server.  ``` 2023-02-23T16:59:34.585346+01:00 pc1 proxy1[340870]: INFO: janssonrpcc [janssonrpc_connect.c:361]: bev_connect(): Connecting to server pc1:8081 for conn rating. 2023-02-23T16:59:34.585420+01:00 pc1 proxy1[340870]: INFO: janssonrpcc [janssonrpc_connect.c:361]: bev_connect(): Connecting to server pc1:8082 for conn rating. 2023-02-23T16:59:34.585446+01:00 pc1 proxy1[340870]: INFO: janssonrpcc [janssonrpc_connect.c:290]: bev_connect_cb(): Connected to host pc1:8081 2023-02-23T16:59:34.585462+01:00 pc1 proxy1[340870]: INFO: janssonrpcc [janssonrpc_connect.c:290]: bev_connect_cb(): Connected to host pc1:8082 2023-02-23T17:05:10.903398+01:00 pc1 proxy1[340870]: WARNING: janssonrpcc [janssonrpc_request.c:247]: schedule_retry(): Number of retries exceeded. Failing request. ``` ### Possible Solutions  Retry in combination with a timeout and prio's is a bit tricky. When do what? Just retrying on the first prio makes the lower prio servers completely useless, while going to the next prio on every retry skips possibly useful high-prio servers and may exhaust the number of candidate servers very fast. Best solution IMHO would be to first try every server in the highest prio, before going to the next prio. Do not do (exponential) backoff between these steps. If there are still retries remaining after that, wrap around to the highest prio with the exponentional backoff delay. With the above, failover considers all servers and failover between servers is fast while not overloading a single server. BTW. If I configure multiple servers per prio, it seems to randomly select one of them for every (re)try. It never selects one form the next prio. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.6.1 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3378 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3378(a)github.com>

4 10

git:5.7:1eb1d50e: outbound: build, fix missing argument name
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: 1eb1d50e676fe8f81521c209f37ffe907fa9cf94 URL: https://github.com/kamailio/kamailio/commit/1eb1d50e676fe8f81521c209f37ffe9… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 outbound: build, fix missing argument name (cherry-pick from 4708f537d7f5d28123b48cd89474a4931dd698ad) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb1d50e676fe8f81521c209f37ffe9… Patch: https://github.com/kamailio/kamailio/commit/1eb1d50e676fe8f81521c209f37ffe9… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index a797eb8132e..32f10f6cdb9 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -75,7 +75,7 @@ struct module_exports exports = { destroy /* destroy function */ }; -static void *mod_init_openssl(void *) { +static void *mod_init_openssl(void *arg) { if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key");

1 0

git:5.7:fe096868: outbound: OpenSSL 1.1.1 thread-local, init libssl in thread
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: fe0968687d5ee7918f6a18591623fcb1b5fe2004 URL: https://github.com/kamailio/kamailio/commit/fe0968687d5ee7918f6a18591623fcb… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 outbound: OpenSSL 1.1.1 thread-local, init libssl in thread (cherry-pick from 689de2736f5c92f11860e5854ccd95c84239f032) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe0968687d5ee7918f6a18591623fcb… Patch: https://github.com/kamailio/kamailio/commit/fe0968687d5ee7918f6a18591623fcb… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 00c0a66f73b..a797eb8132e 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -110,7 +110,7 @@ static int mod_init(void) } ob_key.len = OB_KEY_LEN; -#if OPENSSL_VERSION_NUMBER < 0x030000000L +#if OPENSSL_VERSION_NUMBER < 0x010101000L mod_init_openssl(NULL); #else pthread_t tid;

1 0

git:5.7:31e42aad: outbound: OpenSSL 3.x thread-local, init libssl in thread
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: 31e42aade0a42aac8a128a4af3f37edb23bb3ab8 URL: https://github.com/kamailio/kamailio/commit/31e42aade0a42aac8a128a4af3f37ed… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 outbound: OpenSSL 3.x thread-local, init libssl in thread (cherry-pick from 4742c8131aba878c4fc954e42b656b9d4bafdd24) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31e42aade0a42aac8a128a4af3f37ed… Patch: https://github.com/kamailio/kamailio/commit/31e42aade0a42aac8a128a4af3f37ed… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 4e408e22356..00c0a66f73b 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -75,6 +75,23 @@ struct module_exports exports = { destroy /* destroy function */ }; +static void *mod_init_openssl(void *) { + if(flow_token_secret.s) { + assert(ob_key.len == SHA_DIGEST_LENGTH); + LM_DBG("flow_token_secret mod param set. use persistent ob_key"); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, + (unsigned char *)ob_key.s); + } else { + if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", + ob_key.len); + } + } + + return NULL; +} + static int mod_init(void) { if(ob_force_flag != -1 && !flag_in_range(ob_force_flag)) { @@ -93,18 +110,14 @@ static int mod_init(void) } ob_key.len = OB_KEY_LEN; - if(flow_token_secret.s) { - assert(ob_key.len == SHA_DIGEST_LENGTH); - LM_DBG("flow_token_secret mod param set. use persistent ob_key"); - SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, - (unsigned char *)ob_key.s); - } else { - if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", - ob_key.len); - } - } +#if OPENSSL_VERSION_NUMBER < 0x030000000L + mod_init_openssl(NULL); +#else + pthread_t tid; + void *retval; + pthread_create(&tid, NULL, mod_init_openssl, NULL); + pthread_join(tid, &retval); +#endif if(cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg, cfg_sizeof(outbound), &outbound_cfg)) {

1 0

git:5.7:7060ad2b: tls: OpenSSL 3.x/1.1.1 thread-local, clean-up dead code and preprocessor blocks
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: 7060ad2b0ebf90288be9d8d7e9d789ccbb3aebdc URL: https://github.com/kamailio/kamailio/commit/7060ad2b0ebf90288be9d8d7e9d789c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 tls: OpenSSL 3.x/1.1.1 thread-local, clean-up dead code and preprocessor blocks (cherry-pick from 798cc26908395d2ba21015684ad6f0ac4f012b2e) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7060ad2b0ebf90288be9d8d7e9d789c… Patch: https://github.com/kamailio/kamailio/commit/7060ad2b0ebf90288be9d8d7e9d789c… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 58289c626c4..65f5ae72c65 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -783,12 +783,7 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); -#if OPENSSL_VERSION_NUMBER >= 0x030000000L - // skip init for 3.x -#elif OPENSSL_VERSION_NUMBER >= 0x010101000L - //not needed on Linux - //OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); -#else +#if OPENSSL_VERSION_NUMBER < 0x010100000L OPENSSL_init_ssl(0, NULL); #endif #else diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 03874edabba..7cad1b046e4 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -438,20 +438,9 @@ static int mod_child(int rank) if(tls_disable || (tls_domains_cfg == 0)) return 0; - /* fix tls config only from the main proc/PROC_INIT., when we know - * the exact process number and before any other process starts*/ - if(rank == PROC_INIT) { -#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ - && OPENSSL_VERSION_NUMBER < 0x030000000L - if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { - // not needed on Linux: OPENSSL_fork_prepare(); - } -#endif - } - #if OPENSSL_VERSION_NUMBER >= 0x010101000L /* - * OpenSSL 3.x: create shared SSL_CTX* in worker to avoid init of + * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in worker to avoid init of * libssl in rank 0(thread#1) */ if(rank == PROC_SIPINIT) { @@ -471,22 +460,6 @@ static int mod_child(int rank) return 0; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ - && OPENSSL_VERSION_NUMBER < 0x030000000L - if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { - if(rank == PROC_POSTCHILDINIT) { - /* - * this is called after forking of all child processes - */ - // not needed on Linux: OPENSSL_fork_parent(); - return 0; - } - if(!_ksr_is_main) { - // not needed on Linux: OPENSSL_fork_child(); - } - } -#endif - #ifndef OPENSSL_NO_ENGINE /* * after the child is fork()ed we go through the TLS domains @@ -514,6 +487,11 @@ static void mod_destroy(void) * => nothing to do here */ } +/* + * GH #3695: OpenSSL 1.1.1: it is no longer necessary to replace RAND + * - early init in rank 0 causes workers to inherit public_drbg/private_drbg + * which are not thread-safe + */ int ksr_rand_engine_param(modparam_t type, void *val) { @@ -690,12 +668,10 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ - && OPENSSL_VERSION_NUMBER < 0x030000000L - LM_DBG("setting cryptorand random engine\n"); - // RAND_set_rand_method(RAND_ksr_cryptorand_method()); -#endif - + /* + * GH #3695: OpenSSL 1.1.1 historical note: it is no longer + * needed to replace RAND with cryptorand + */ sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

1 0

git:5.7:e73b07e9: tls: thread-local, revert 1a9b0b6361 as double-layer locking is redundant
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: e73b07e9835ba5f0b89065616d8cd6390898d700 URL: https://github.com/kamailio/kamailio/commit/e73b07e9835ba5f0b89065616d8cd63… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 tls: thread-local, revert 1a9b0b6361 as double-layer locking is redundant - the 2nd lock was put in place as defensive programming for shm contention - GH #3695: the underlying issue is early init of thread-locals (cherry-pick from 1c70775530b1a3a905e8a983610cb0d092b0d240) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/e73b07e9835ba5f0b89065616d8cd63… Patch: https://github.com/kamailio/kamailio/commit/e73b07e9835ba5f0b89065616d8cd63… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 2d5a9e19420..58289c626c4 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -259,9 +259,6 @@ static void *ser_malloc(size_t size, const char *file, int line) static ticks_t st = 0; #endif - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); - #ifdef RAND_NULL_MALLOC /* start random null returns only after * NULL_GRACE_PERIOD from first call */ @@ -289,8 +286,6 @@ static void *ser_malloc(size_t size, const char *file, int line) size, file, line, bt_buf); } #endif - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); return p; } @@ -304,9 +299,6 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) static ticks_t st = 0; #endif - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); - #ifdef RAND_NULL_MALLOC /* start random null returns only after * NULL_GRACE_PERIOD from first call */ @@ -335,21 +327,14 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) } #endif - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); - return p; } static void ser_free(void *ptr, const char *fname, int fline) { - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); if(ptr) { shm_free(ptr); } - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); } #endif /* LIBRESSL_VERSION_NUMBER */ @@ -363,11 +348,7 @@ static void *ser_malloc(size_t size) { void *p; - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); p = shm_malloc(size); - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); return p; } @@ -375,22 +356,14 @@ static void *ser_malloc(size_t size) static void *ser_realloc(void *ptr, size_t size) { void *p; - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); p = shm_realloc(ptr, size); - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); return p; } #else static void *ser_malloc(size_t size, const char *fname, int fline) { void *p; - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); p = shm_malloc(size); - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); return p; } @@ -398,11 +371,7 @@ static void *ser_malloc(size_t size, const char *fname, int fline) static void *ser_realloc(void *ptr, size_t size, const char *fname, int fline) { void *p; - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); p = shm_realloc(ptr, size); - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); return p; } #endif @@ -419,24 +388,16 @@ static void ser_free(void *ptr) * As shm_free() aborts on null pointers, we have to check for null pointer * here in the wrapper function. */ - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); if(ptr) { shm_free(ptr); } - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); } #else static void ser_free(void *ptr, const char *fname, int fline) { - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_lock(ksr_tls_lock_shm); if(ptr) { shm_free(ptr); } - if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) - pthread_mutex_unlock(ksr_tls_lock_shm); } #endif

1 0

git:5.7:c011f518: tls: OpenSSL 1.1.1 thread-local, init libssl in thread
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: c011f518b083fc2f7da3a08a2c1a306c6122b04c URL: https://github.com/kamailio/kamailio/commit/c011f518b083fc2f7da3a08a2c1a306… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 tls: OpenSSL 1.1.1 thread-local, init libssl in thread - no need for RAND workaround; default is OpenSSL 1.1.1 RAND - linux/pthreads will handle forking (cherry-pick from 7b531cfe038fae5e3414ac74c4e076c10e32b86c) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c011f518b083fc2f7da3a08a2c1a306… Patch: https://github.com/kamailio/kamailio/commit/c011f518b083fc2f7da3a08a2c1a306… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 872fdb206dc..2d5a9e19420 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -825,7 +825,8 @@ int tls_h_mod_pre_init_f(void) #if OPENSSL_VERSION_NUMBER >= 0x030000000L // skip init for 3.x #elif OPENSSL_VERSION_NUMBER >= 0x010101000L - OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); + //not needed on Linux + //OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); #else OPENSSL_init_ssl(0, NULL); #endif @@ -833,7 +834,7 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); #endif -#if OPENSSL_VERSION_NUMBER < 0x030000000L +#if OPENSSL_VERSION_NUMBER < 0x010101000L SSL_load_error_strings(); #endif diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 1e74ba0e309..03874edabba 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -440,8 +440,16 @@ static int mod_child(int rank) /* fix tls config only from the main proc/PROC_INIT., when we know * the exact process number and before any other process starts*/ + if(rank == PROC_INIT) { +#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L + if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { + // not needed on Linux: OPENSSL_fork_prepare(); + } +#endif + } -#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#if OPENSSL_VERSION_NUMBER >= 0x010101000L /* * OpenSSL 3.x: create shared SSL_CTX* in worker to avoid init of * libssl in rank 0(thread#1) @@ -460,12 +468,6 @@ static int mod_child(int rank) < 0) return -1; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ - && OPENSSL_VERSION_NUMBER < 0x030000000L - if(ksr_tls_init_mode & TLS_MODE_FORK_PREPARE) { - OPENSSL_fork_prepare(); - } -#endif return 0; } @@ -476,11 +478,11 @@ static int mod_child(int rank) /* * this is called after forking of all child processes */ - OPENSSL_fork_parent(); + // not needed on Linux: OPENSSL_fork_parent(); return 0; } if(!_ksr_is_main) { - OPENSSL_fork_child(); + // not needed on Linux: OPENSSL_fork_child(); } } #endif @@ -691,7 +693,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L LM_DBG("setting cryptorand random engine\n"); - RAND_set_rand_method(RAND_ksr_cryptorand_method()); + // RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif sr_kemi_modules_add(sr_kemi_tls_exports);

1 0

git:5.7:90ea4120: tls: fix compilation with OpenSSL <= 1.1.1
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: 90ea4120c04cb70f858f417309ee4fab71a070e7 URL: https://github.com/kamailio/kamailio/commit/90ea4120c04cb70f858f417309ee4fa… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:18:55+08:00 tls: fix compilation with OpenSSL <= 1.1.1 (cherry-pick from 7111687e1107261bcdd7a9f8cc90959754c93272) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/90ea4120c04cb70f858f417309ee4fa… Patch: https://github.com/kamailio/kamailio/commit/90ea4120c04cb70f858f417309ee4fa… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 0bc12d31b4a..872fdb206dc 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -769,6 +769,7 @@ int tls_pre_init(void) * tls mod pre-init function * - executed before any mod_init() */ +#if OPENSSL_VERSION_NUMBER >= 0x030000000L long tls_h_mod_randctx(void *) { do { OSSL_LIB_CTX *osslglobal = NULL; @@ -806,6 +807,7 @@ long tls_h_mod_randctx(void *) { return 0L; } +#endif int tls_h_mod_pre_init_f(void) {

1 0

git:5.7:ed2d7035: tls: OpenSSL 3.x thread-local, init libssl in thread or PROC_SIPINIT
by Richard Chan 09 Jan '24

09 Jan '24

Module: kamailio Branch: 5.7 Commit: ed2d70359723458089dd8a62fe1e37a60dd83869 URL: https://github.com/kamailio/kamailio/commit/ed2d70359723458089dd8a62fe1e37a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Richard Chan <richard(a)treeboxsolutions.com> Date: 2024-01-09T10:12:59+08:00 tls: OpenSSL 3.x thread-local, init libssl in thread or PROC_SIPINIT - avoid initialising ERR_STATE in rank 0(thread#1) (cherry-pick from e49a60e1052c6c1dcebe7f78f2ac970338eabe2e) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed2d70359723458089dd8a62fe1e37a… Patch: https://github.com/kamailio/kamailio/commit/ed2d70359723458089dd8a62fe1e37a… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 57be9cad814..0bc12d31b4a 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -769,6 +769,44 @@ int tls_pre_init(void) * tls mod pre-init function * - executed before any mod_init() */ +long tls_h_mod_randctx(void *) { + do { + OSSL_LIB_CTX *osslglobal = NULL; + EVP_RAND_CTX *randctx = NULL; + + LM_DBG("enabling locking for rand ctx\n"); + + osslglobal = OSSL_LIB_CTX_get0_global_default(); + if(osslglobal == NULL) { + LM_ERR("failed to get lib ssl global ctx\n"); + return -1L; + } + + randctx = RAND_get0_primary(osslglobal); + if(randctx == NULL) { + LM_ERR("primary rand ctx is null\n"); + return -1L; + } + EVP_RAND_enable_locking(randctx); + + randctx = RAND_get0_public(osslglobal); + if(randctx == NULL) { + LM_ERR("public rand ctx is null\n"); + return -1L; + } + EVP_RAND_enable_locking(randctx); + + randctx = RAND_get0_private(osslglobal); + if(randctx == NULL) { + LM_ERR("private rand ctx is null\n"); + return -1L; + } + EVP_RAND_enable_locking(randctx); + } while(0); + + return 0L; +} + int tls_h_mod_pre_init_f(void) { if(tls_mod_preinitialized == 1) { @@ -782,7 +820,9 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); -#if OPENSSL_VERSION_NUMBER >= 0x010101000L +#if OPENSSL_VERSION_NUMBER >= 0x030000000L + // skip init for 3.x +#elif OPENSSL_VERSION_NUMBER >= 0x010101000L OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); #else OPENSSL_init_ssl(0, NULL); @@ -791,42 +831,17 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); #endif +#if OPENSSL_VERSION_NUMBER < 0x030000000L SSL_load_error_strings(); +#endif #if OPENSSL_VERSION_NUMBER >= 0x030000000L - do { - OSSL_LIB_CTX *osslglobal = NULL; - EVP_RAND_CTX *randctx = NULL; - - LM_DBG("enabling locking for rand ctx\n"); - - osslglobal = OSSL_LIB_CTX_get0_global_default(); - if(osslglobal == NULL) { - LM_ERR("failed to get lib ssl global ctx\n"); - return -1; - } - - randctx = RAND_get0_primary(osslglobal); - if(randctx == NULL) { - LM_ERR("primary rand ctx is null\n"); - return -1; - } - EVP_RAND_enable_locking(randctx); - - randctx = RAND_get0_public(osslglobal); - if(randctx == NULL) { - LM_ERR("public rand ctx is null\n"); - return -1; - } - EVP_RAND_enable_locking(randctx); - - randctx = RAND_get0_private(osslglobal); - if(randctx == NULL) { - LM_ERR("private rand ctx is null\n"); - return -1; - } - EVP_RAND_enable_locking(randctx); - } while(0); + pthread_t tid; + long rl; + pthread_create(&tid, NULL, (void *(*)(void *))tls_h_mod_randctx, NULL); + pthread_join(tid, (void **)&rl); + if ((int)rl) + return (int)rl; #endif tls_mod_preinitialized = 1; diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 3a047769ca4..1e74ba0e309 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -440,7 +440,16 @@ static int mod_child(int rank) /* fix tls config only from the main proc/PROC_INIT., when we know * the exact process number and before any other process starts*/ - if(rank == PROC_INIT) { + +#if OPENSSL_VERSION_NUMBER >= 0x030000000L + /* + * OpenSSL 3.x: create shared SSL_CTX* in worker to avoid init of + * libssl in rank 0(thread#1) + */ + if(rank == PROC_SIPINIT) { +#else + if(rank == PROC_INIT) { +#endif if(cfg_get(tls, tls_cfg, config_file).s) { if(tls_fix_domains_cfg( *tls_domains_cfg, &srv_defaults, &cli_defaults)

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024