sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
250 discussions

git:master:b2b7ec82: keepalive: check if the destinations list is initialized at runtime use
by Daniel-Constantin Mierla 05 Feb '21

05 Feb '21

Module: kamailio Branch: master Commit: b2b7ec826055fd67ecf5ffb052afa609e0aa9e5b URL: https://github.com/kamailio/kamailio/commit/b2b7ec826055fd67ecf5ffb052afa60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-05T09:55:58+01:00 keepalive: check if the destinations list is initialized at runtime use - do not initialize, because is no longer seen in all processes, initialization must be done in mod init --- Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b2b7ec826055fd67ecf5ffb052afa60… Patch: https://github.com/kamailio/kamailio/commit/b2b7ec826055fd67ecf5ffb052afa60… --- diff --git a/src/modules/keepalive/keepalive_mod.c b/src/modules/keepalive/keepalive_mod.c index 37872b89b1..3146ee6fb8 100644 --- a/src/modules/keepalive/keepalive_mod.c +++ b/src/modules/keepalive/keepalive_mod.c @@ -201,8 +201,10 @@ static int w_add_destination(sip_msg_t *msg, char *uri, char *owner) */ static int ki_add_destination(sip_msg_t *msg, str *uri, str *owner) { - if(ka_alloc_destinations_list() < 0) + if(ka_destinations_list == NULL) { + LM_ERR("destinations list not initialized\n"); return -1; + } return ka_add_dest(uri, owner, 0, ka_ping_interval, 0, 0, 0); }

1 0

git:master:11494de3: keepalive: init 0 allocated keepalive structures
by Daniel-Constantin Mierla 05 Feb '21

05 Feb '21

Module: kamailio Branch: master Commit: 11494de3d9d61df3fc31669c75cbd5ff11b03d0f URL: https://github.com/kamailio/kamailio/commit/11494de3d9d61df3fc31669c75cbd5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-05T09:49:56+01:00 keepalive: init 0 allocated keepalive structures - GH #2618 --- Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11494de3d9d61df3fc31669c75cbd5f… Patch: https://github.com/kamailio/kamailio/commit/11494de3d9d61df3fc31669c75cbd5f… --- diff --git a/src/modules/keepalive/keepalive_mod.c b/src/modules/keepalive/keepalive_mod.c index 6339c3f2ac..37872b89b1 100644 --- a/src/modules/keepalive/keepalive_mod.c +++ b/src/modules/keepalive/keepalive_mod.c @@ -253,7 +253,7 @@ static int ka_mod_add_destination(modparam_t type, void *val) { char *uri = (char *)val; ka_initial_dest_t *current_position = NULL; - ka_initial_dest_t *new_destination = (ka_initial_dest_t *) shm_malloc(sizeof(ka_initial_dest_t)); + ka_initial_dest_t *new_destination = (ka_initial_dest_t *) shm_mallocxz(sizeof(ka_initial_dest_t)); new_destination->uri.s = shm_malloc(sizeof(char) * strlen(uri)); new_destination->owner.s = shm_malloc(sizeof(char) * strlen(owner)); @@ -308,7 +308,7 @@ int ka_alloc_destinations_list() return 1; } - ka_destinations_list = (ka_destinations_list_t *)shm_malloc( + ka_destinations_list = (ka_destinations_list_t *)shm_mallocxz( sizeof(ka_destinations_list_t)); if(ka_destinations_list == NULL) { LM_ERR("no more memory.\n");

1 0

[kamailio/kamailio] rtpengine : add node fallback if node out of port (#2621)
by dvillaume 04 Feb '21

04 Feb '21

When rtpengine answers with error-reason 'Ran out of ports' adopt the same behavor that when node answers 'Parallel session limit reached'   #### Pre-Submission Checklist    - [x ] Commit message has the format required by CONTRIBUTING guide - [x ] Commits are split per component (core, individual modules, libs, utils, ...) - [ x] Each component has a single commit (if not, squash them into one commit) - [ x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Backport of the 'sessions limit' behavor for the 'Ran out of ports' error-reason. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2621 -- Commit Summary -- * rtpengine : add node fallback if node out of port -- File Changes -- M src/modules/rtpengine/rtpengine.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2621.patch https://github.com/kamailio/kamailio/pull/2621.diff -- 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/pull/2621

3 6

git:master:f3d58f77: Merge pull request #2621 from dvillaume/master
by GitHub 04 Feb '21

04 Feb '21

Module: kamailio Branch: master Commit: f3d58f7762abeeb96f8efe26b6538d37a5084569 URL: https://github.com/kamailio/kamailio/commit/f3d58f7762abeeb96f8efe26b6538d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-02-04T16:51:27+01:00 Merge pull request #2621 from dvillaume/master rtpengine : add node fallback if node ran out of ports --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/f3d58f7762abeeb96f8efe26b6538d3… Patch: https://github.com/kamailio/kamailio/commit/f3d58f7762abeeb96f8efe26b6538d3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7eb0843793..00b27be148 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -294,6 +294,9 @@ static pv_spec_t *media_duration_pvar = NULL; #define RTPENGINE_SESS_LIMIT_MSG "Parallel session limit reached" #define RTPENGINE_SESS_LIMIT_MSG_LEN (sizeof(RTPENGINE_SESS_LIMIT_MSG)-1) +#define RTPENGINE_SESS_OUT_OF_PORTS_MSG "Ran out of ports" +#define RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN (sizeof(RTPENGINE_SESS_OUT_OF_PORTS_MSG)-1) + char* force_send_ip_str=""; int force_send_ip_af = AF_UNSPEC; @@ -2632,6 +2635,13 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ LM_WARN("proxy %.*s: %.*s", node->rn_url.len, node->rn_url.s , error.len, error.s); goto select_node; } + if ((RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN == error.len) && + (strncmp(error.s, RTPENGINE_SESS_OUT_OF_PORTS_MSG, RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN) == 0)) + { + LM_WARN("proxy %.*s: %.*s", node->rn_url.len, node->rn_url.s , error.len, error.s); + goto select_node; + } + LM_ERR("proxy replied with error: %.*s\n", error.len, error.s); } goto error;

1 0

git:master:853068a2: rtpengine : add node fallback if node out of port
by GitHub 04 Feb '21

04 Feb '21

Module: kamailio Branch: master Commit: 853068a26c34deff86e17b63f49abea2c8f4403c URL: https://github.com/kamailio/kamailio/commit/853068a26c34deff86e17b63f49abea… Author: dvillaume <david.villaume(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-02-03T10:19:46+01:00 rtpengine : add node fallback if node out of port When rtpengine answers with error-reason 'Ran out of ports' adopt the same behavor that when node answers 'Parallel session limit reached' --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/853068a26c34deff86e17b63f49abea… Patch: https://github.com/kamailio/kamailio/commit/853068a26c34deff86e17b63f49abea… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7eb0843793..00b27be148 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -294,6 +294,9 @@ static pv_spec_t *media_duration_pvar = NULL; #define RTPENGINE_SESS_LIMIT_MSG "Parallel session limit reached" #define RTPENGINE_SESS_LIMIT_MSG_LEN (sizeof(RTPENGINE_SESS_LIMIT_MSG)-1) +#define RTPENGINE_SESS_OUT_OF_PORTS_MSG "Ran out of ports" +#define RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN (sizeof(RTPENGINE_SESS_OUT_OF_PORTS_MSG)-1) + char* force_send_ip_str=""; int force_send_ip_af = AF_UNSPEC; @@ -2632,6 +2635,13 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ LM_WARN("proxy %.*s: %.*s", node->rn_url.len, node->rn_url.s , error.len, error.s); goto select_node; } + if ((RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN == error.len) && + (strncmp(error.s, RTPENGINE_SESS_OUT_OF_PORTS_MSG, RTPENGINE_SESS_OUT_OF_PORTS_MSG_LEN) == 0)) + { + LM_WARN("proxy %.*s: %.*s", node->rn_url.len, node->rn_url.s , error.len, error.s); + goto select_node; + } + LM_ERR("proxy replied with error: %.*s\n", error.len, error.s); } goto error;

1 0

git:master:6b5aa70f: kamctl: added srv debug subcommand
by Daniel-Constantin Mierla 04 Feb '21

04 Feb '21

Module: kamailio Branch: master Commit: 6b5aa70f09e294338a65a0bf2fcae8b92fdc6fae URL: https://github.com/kamailio/kamailio/commit/6b5aa70f09e294338a65a0bf2fcae8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-04T14:02:20+01:00 kamctl: added srv debug subcommand - control server debug level via rpc --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/6b5aa70f09e294338a65a0bf2fcae8b… Patch: https://github.com/kamailio/kamailio/commit/6b5aa70f09e294338a65a0bf2fcae8b… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index b28dfb642e..a2d839b50b 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1790,6 +1790,15 @@ ksr_srv() { mecho "list server rpc commands" ctl_cmd_run system.listMethods ;; + debug) + require_ctlengine + mecho "server debug level command" + if [ $# -lt 2 ] ; then + ctl_cmd_run corex.debug + else + ctl_cmd_run corex.debug $2 + fi + ;; version) require_ctlengine mecho "list server version" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index bc8f212f7b..b088565069 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -554,6 +554,7 @@ cat <<EOF srv sockets ................... show the list of listen sockets srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands + srv debug [<level>] ........... control the server debug level srv version ................... show the server version EOF }

1 0

git:master:351efd29: doc: update manpage for atexit option
by Victor Seva 03 Feb '21

03 Feb '21

Module: kamailio Branch: master Commit: 351efd29d332703e79104a106ade08c9d1df6e20 URL: https://github.com/kamailio/kamailio/commit/351efd29d332703e79104a106ade08c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-03T13:33:32+01:00 doc: update manpage for atexit option --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/351efd29d332703e79104a106ade08c… Patch: https://github.com/kamailio/kamailio/commit/351efd29d332703e79104a106ade08c… --- diff --git a/doc/man/kamailio.8 b/doc/man/kamailio.8 index c5ba986639..a97b43f3c1 100644 --- a/doc/man/kamailio.8 +++ b/doc/man/kamailio.8 @@ -58,6 +58,12 @@ Enable auto-aliases with 'yes' or 'on', disable with 'no' or 'off Add an alias, the value has to be '[proto:]hostname[:port]' (like for 'alias' global parameter) .TP +.BI \-\-atexit\fR=\fIval +Control atexit callbacks execution from external libraries +which may access destroyed shm memory causing crash on shutdown. +Can be y[es] or 1 to enable atexit callbacks, n[o] or 0 to disable, +default is yes. +.TP .BI \-A " pre\-processor\-define" Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"') .TP @@ -160,10 +166,6 @@ Specifies the number of children processes forked to handle tcp incoming connect .BI \-n ). .TP -.BI \-\-no\-atexit -Skip atexit callbacks execution from external libraries -which may access destroyed shm memory causing crash on shutdown. -.TP .BI \-P " pid\-file" Creates a file containing the pid of the main .B kamailio

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021