sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
253 discussions

git:master:9b147227: core: replaced --no-atexit with --atexit=val
by Daniel-Constantin Mierla 03 Feb '21

03 Feb '21

Module: kamailio Branch: master Commit: 9b1472275530ed4cc32a65cd247dc9997e8b964b URL: https://github.com/kamailio/kamailio/commit/9b1472275530ed4cc32a65cd247dc99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-03T12:49:29+01:00 core: replaced --no-atexit with --atexit=val - val can be y[es] or 1 to enable execution of atexit callbacks; n[o] or 0 to disable the execution of atexit callbacks - default yes - simplified ksr_exit() macro --- Modified: src/core/daemonize.c Modified: src/core/daemonize.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9b1472275530ed4cc32a65cd247dc99… Patch: https://github.com/kamailio/kamailio/commit/9b1472275530ed4cc32a65cd247dc99…

1 0

git:master:377bb3bd: doc: update options at manpage
by Victor Seva 03 Feb '21

03 Feb '21

Module: kamailio Branch: master Commit: 377bb3bdfd20bedabbe0f92e53bdded44be267e9 URL: https://github.com/kamailio/kamailio/commit/377bb3bdfd20bedabbe0f92e53bdded… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-03T09:42:01+01:00 doc: update options at manpage * put them in order too --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/377bb3bdfd20bedabbe0f92e53bdded… Patch: https://github.com/kamailio/kamailio/commit/377bb3bdfd20bedabbe0f92e53bdded…

1 0

git:master:06aec5a8: core: use macro for exit variants based on --no-atexit
by Daniel-Constantin Mierla 03 Feb '21

03 Feb '21

Module: kamailio Branch: master Commit: 06aec5a81cb22d06ad3bf613a05951f91e7e21bc URL: https://github.com/kamailio/kamailio/commit/06aec5a81cb22d06ad3bf613a05951f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-03T08:29:32+01:00 core: use macro for exit variants based on --no-atexit --- Modified: src/core/daemonize.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/06aec5a81cb22d06ad3bf613a05951f… Patch: https://github.com/kamailio/kamailio/commit/06aec5a81cb22d06ad3bf613a05951f… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index 4eb7e1f25a..8dcf7363e2 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -300,13 +300,13 @@ int daemonize(char* name, int status_wait) }else if (pid!=0){ if (status_wait) { if (daemon_status_wait(&pipe_status) == 0) { - exit((int)pipe_status); + ksr_exit(ksr_no_atexit, (int)pipe_status); } else { LM_ERR("Main process exited before writing to pipe\n"); - exit(-1); + ksr_exit(ksr_no_atexit, -1); } } - exit(0); + ksr_exit(ksr_no_atexit, 0); } if (status_wait) daemon_status_no_wait(); /* clean unused read fd */ @@ -322,7 +322,7 @@ int daemonize(char* name, int status_wait) goto error; }else if (pid!=0){ /*parent process => exit */ - exit(0); + ksr_exit(ksr_no_atexit, 0); } } diff --git a/src/main.c b/src/main.c index 39160f4f4b..3942f5c8c3 100644 --- a/src/main.c +++ b/src/main.c @@ -741,11 +741,7 @@ void handle_sigs(void) LM_NOTICE("Thank you for flying " NAME "!!!\n"); /* shutdown/kill all the children */ shutdown_children(SIGTERM, 1); - if(ksr_no_atexit==1) { - _exit(0); - } else { - exit(0); - } + ksr_exit(ksr_no_atexit, 0); break; case SIGUSR1: @@ -813,17 +809,9 @@ void handle_sigs(void) /* exit */ shutdown_children(SIGTERM, 1); if (WIFSIGNALED(chld_status)) { - if(ksr_no_atexit==1) { - _exit(1); - } else { - exit(1); - } + ksr_exit(ksr_no_atexit, 1); } else { - if(ksr_no_atexit==1) { - _exit(0); - } else { - exit(0); - } + ksr_exit(ksr_no_atexit, 0); } break;

1 0

[kamailio/kamailio] Build warnings (#2619)
by sergey-safarov 02 Feb '21

02 Feb '21

**crypto_mod.c:343:12** ``` make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_sqlite.so] db_sqlite.so CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so CC (gcc) [M systemdops.so] systemdops_mod.o LD (gcc) [M systemdops.so] systemdops.so CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_aes.o CC (gcc) [M crypto.so] crypto_evcb.o CC (gcc) [M crypto.so] crypto_mod.o crypto_mod.c:343:12: warning: 'ki_crypto_hmac_sha256' defined but not used [-Wunused-function] static int ki_crypto_hmac_sha256(sip_msg_t* msg, str *ins, str *keys, str *dpv) ^~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M crypto.so] api.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_locking.o ``` Maybe not related to Kamailio sources ``` LD (gcc) [M usrloc.so] usrloc.so CC (gcc) [M xhttp.so] xhttp_mod.o CC (gcc) [M xhttp.so] xhttp_trans.o In file included from ../../core/str.h:24, from ../../core/pvar.h:30, from xhttp_trans.c:21: In function 'memset', inlined from 'xhttp_tr_eval_xhttpurl' at xhttp_trans.c:69:5: /usr/include/fortify/string.h:72:9: warning: '__builtin_memset' offset [9, 16] from the object at '_httpurl_str' is out of the bounds of referenced subobject 's' with type 'char *' at offset 0 [-Warray-bounds] 72 | return __builtin_memset(__d, __c, __n); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M xhttp.so] xhttp.so CC (gcc) [M xhttp_prom.so] prom.o CC (gcc) [M xhttp_prom.so] prom_metric.o ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2619

3 3

git:master:b886ba5c: crypto: exported hmac_sha256() to KEMI
by Daniel-Constantin Mierla 02 Feb '21

02 Feb '21

Module: kamailio Branch: master Commit: b886ba5ce8bc6788832c79be508e5507a2a7ef08 URL: https://github.com/kamailio/kamailio/commit/b886ba5ce8bc6788832c79be508e550… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-02T21:43:21+01:00 crypto: exported hmac_sha256() to KEMI --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b886ba5ce8bc6788832c79be508e550… Patch: https://github.com/kamailio/kamailio/commit/b886ba5ce8bc6788832c79be508e550… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index b0904d820e..c57c69f783 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -638,6 +638,11 @@ static sr_kemi_t sr_kemi_crypto_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("crypto"), str_init("hmac_sha256"), + SR_KEMIP_INT, ki_crypto_hmac_sha256, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:7ab2e854: core: take in consideration --no-atexit for daemonize()
by Daniel-Constantin Mierla 02 Feb '21

02 Feb '21

Module: kamailio Branch: master Commit: 7ab2e85437482b4dba86937a29da025503450014 URL: https://github.com/kamailio/kamailio/commit/7ab2e85437482b4dba86937a29da025… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-02T21:37:32+01:00 core: take in consideration --no-atexit for daemonize() --- Modified: src/core/daemonize.c Modified: src/core/daemonize.h --- Diff: https://github.com/kamailio/kamailio/commit/7ab2e85437482b4dba86937a29da025… Patch: https://github.com/kamailio/kamailio/commit/7ab2e85437482b4dba86937a29da025… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index d6692523c7..4eb7e1f25a 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -69,6 +69,8 @@ #define MAX_FD 32 /* maximum number of inherited open file descriptors, (normally it shouldn't be bigger than 3) */ +extern int ksr_no_atexit; + /** temporary pipe FDs for sending exit status back to the ancestor process. * This pipe is used to send the desired exit status to the initial process, * that waits for it in the foreground. This way late errors preventing @@ -297,9 +299,9 @@ int daemonize(char* name, int status_wait) goto error; }else if (pid!=0){ if (status_wait) { - if (daemon_status_wait(&pipe_status) == 0) + if (daemon_status_wait(&pipe_status) == 0) { exit((int)pipe_status); - else{ + } else { LM_ERR("Main process exited before writing to pipe\n"); exit(-1); } diff --git a/src/core/daemonize.h b/src/core/daemonize.h index a8ee113a77..481cf0cd83 100644 --- a/src/core/daemonize.h +++ b/src/core/daemonize.h @@ -41,6 +41,14 @@ int daemon_status_send(char status); void daemon_status_no_wait(void); void daemon_status_on_fork_cleanup(void); +#define ksr_exit(exvar, excode) do { \ + if(exvar==1) { \ + _exit(excode); \ + } else { \ + exit(excode); \ + } \ + } while(0) + #endif /*_daemonize_h */ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

git:master:2db88849: xhttp: do not call memset on a null-pointer, related to GH #2619
by Henning Westerholt 02 Feb '21

02 Feb '21

Module: kamailio Branch: master Commit: 2db8884945844e5040dfed2b24fe84de097c0b2b URL: https://github.com/kamailio/kamailio/commit/2db8884945844e5040dfed2b24fe84d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-02-02T18:42:35Z xhttp: do not call memset on a null-pointer, related to GH #2619 --- Modified: src/modules/xhttp/xhttp_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2db8884945844e5040dfed2b24fe84d… Patch: https://github.com/kamailio/kamailio/commit/2db8884945844e5040dfed2b24fe84d… --- diff --git a/src/modules/xhttp/xhttp_trans.c b/src/modules/xhttp/xhttp_trans.c index ff9ff82d9f..e24409a53b 100644 --- a/src/modules/xhttp/xhttp_trans.c +++ b/src/modules/xhttp/xhttp_trans.c @@ -66,7 +66,7 @@ int xhttp_tr_eval_xhttpurl( (char *)pkg_malloc((val->rs.len + 1) * sizeof(char)); if(_httpurl_str.s == NULL) { PKG_MEM_ERROR; - memset(&_httpurl_str.s, 0, sizeof(str)); + memset(&_httpurl_str, 0, sizeof(str)); return -1; } }

1 0

git:master:9f12d314: core: added --no-atexit cli parameter
by Daniel-Constantin Mierla 02 Feb '21

02 Feb '21

Module: kamailio Branch: master Commit: 9f12d314268d1d2cd990cb3c5556f79343869e47 URL: https://github.com/kamailio/kamailio/commit/9f12d314268d1d2cd990cb3c5556f79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-01T23:39:40+01:00 core: added --no-atexit cli parameter - skip atexit callbacks execution from external libraries which may access destroyed shm memory causing crash on shutdown --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9f12d314268d1d2cd990cb3c5556f79… Patch: https://github.com/kamailio/kamailio/commit/9f12d314268d1d2cd990cb3c5556f79… --- diff --git a/src/main.c b/src/main.c index fa18b3221e..39160f4f4b 100644 --- a/src/main.c +++ b/src/main.c @@ -209,7 +209,9 @@ Options:\n\ #ifdef USE_TCP " -N Number of tcp child processes (default: equal to `-n')\n" #endif -" -O nr Script optimization level (debugging option)\n\ +" --no-atexit Skip atexit callbacks execution from external libraries\n\ + which may access destroyed shm memory causing crash on shutdown\n\ + -O nr Script optimization level (debugging option)\n\ -P file Create a pid file\n" #ifdef USE_SCTP " -Q Number of sctp child processes (default: equal to `-n')\n" @@ -535,6 +537,7 @@ char *sr_memmng_shm = NULL; static int *_sr_instance_started = NULL; int ksr_cfg_print_mode = 0; +int ksr_no_atexit = 0; /** * return 1 if all child processes were forked @@ -738,7 +741,11 @@ void handle_sigs(void) LM_NOTICE("Thank you for flying " NAME "!!!\n"); /* shutdown/kill all the children */ shutdown_children(SIGTERM, 1); - exit(0); + if(ksr_no_atexit==1) { + _exit(0); + } else { + exit(0); + } break; case SIGUSR1: @@ -806,9 +813,17 @@ void handle_sigs(void) /* exit */ shutdown_children(SIGTERM, 1); if (WIFSIGNALED(chld_status)) { - exit(1); + if(ksr_no_atexit==1) { + _exit(1); + } else { + exit(1); + } } else { - exit(0); + if(ksr_no_atexit==1) { + _exit(0); + } else { + exit(0); + } } break; @@ -1938,6 +1953,7 @@ int main(int argc, char** argv) {"log-engine", required_argument, 0, KARGOPTVAL + 7}, {"debug", required_argument, 0, KARGOPTVAL + 8}, {"cfg-print", no_argument, 0, KARGOPTVAL + 9}, + {"no-atexit", no_argument, 0, KARGOPTVAL + 10}, {0, 0, 0, 0 } }; @@ -2011,6 +2027,9 @@ int main(int argc, char** argv) case KARGOPTVAL+9: ksr_cfg_print_mode = 1; break; + case KARGOPTVAL+10: + ksr_no_atexit = 1; + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { @@ -2174,6 +2193,7 @@ int main(int argc, char** argv) case KARGOPTVAL+7: case KARGOPTVAL+8: case KARGOPTVAL+9: + case KARGOPTVAL+10: break; /* long options */

1 0

git:5.2:baed04d1: pkg/docker: updated submodule [skip ci]
by Sergey Safarov 02 Feb '21

02 Feb '21

Module: kamailio Branch: 5.2 Commit: baed04d18b3f07dbaeda92faf93c94dc837fc5c0 URL: https://github.com/kamailio/kamailio/commit/baed04d18b3f07dbaeda92faf93c94d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-02-02T12:39:58+03:00 pkg/docker: updated submodule [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/baed04d18b3f07dbaeda92faf93c94d… Patch: https://github.com/kamailio/kamailio/commit/baed04d18b3f07dbaeda92faf93c94d… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..643e06d780 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 643e06d7809ad8150b23c2662be0532868e3f66b

1 0

git:5.3:a9ce71b9: pkg/docker: updated submodule [skip ci]
by Sergey Safarov 02 Feb '21

02 Feb '21

Module: kamailio Branch: 5.3 Commit: a9ce71b9372e9aa8ddc921495f6b97534266a8b6 URL: https://github.com/kamailio/kamailio/commit/a9ce71b9372e9aa8ddc921495f6b975… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-02-02T12:36:17+03:00 pkg/docker: updated submodule [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/a9ce71b9372e9aa8ddc921495f6b975… Patch: https://github.com/kamailio/kamailio/commit/a9ce71b9372e9aa8ddc921495f6b975… --- diff --git a/pkg/docker b/pkg/docker index 9fa73e31e6..643e06d780 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 9fa73e31e6b636148c57a1270692eb8bb967ee77 +Subproject commit 643e06d7809ad8150b23c2662be0532868e3f66b

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021