sr-dev

sr-dev@lists.kamailio.org

20 participants
45158 discussions

Re: Fwd: git:master:5c90e6e2: DMQ: dmq_notification_address_list is initialized to NULL
by Daniel-Constantin Mierla 21 Dec '22

21 Dec '22

It is unlikely that this patch solves any eventual issues that you had. You changed the comparison of a pointer with NULL to 0 and, in C, NULL and 0 are the same in context of pointers: - https://c-faq.com/null/nullor0.html So practically there is not change in behaviour. Cheers, Daniel On 21.12.22 15:41, Olle E. Johansson wrote: > I suggest that this patch be backported :-) > > Cheers, > /O > >> Begin forwarded message: >> >> *From: *Olle E. Johansson <oej(a)edvina.net> >> *Subject: **[sr-dev] git:master:5c90e6e2: DMQ: >> dmq_notification_address_list is initialized to NULL* >> *Date: *21 December 2022 at 15:27:49 CET >> *To: *sr-dev(a)lists.kamailio.org >> *Reply-To: *"Kamailio (SER) - Development Mailing List" >> <sr-dev(a)lists.kamailio.org> >> >> Module: kamailio >> Branch: master >> Commit: 5c90e6e2885a60a1dc5de5ff697c93d6fe59a9cb >> URL: >> https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… >> >> Author: Olle E. Johansson <oej(a)edvina.net> >> Committer: Olle E. Johansson <oej(a)edvina.net> >> Date: 2022-12-21T15:27:28+01:00 >> >> DMQ: dmq_notification_address_list is initialized to NULL >> >> This code led to random and unpredictable behaviour when loading a >> configuration with >> multiple notification nodes. >> >> --- >> >> Modified: src/modules/dmq/dmq.c >> >> --- >> >> Diff: >> https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… >> Patch: >> https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… >> >> --- >> >> diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c >> index 843b7e3e4d2..f4a66c3d847 100644 >> --- a/src/modules/dmq/dmq.c >> +++ b/src/modules/dmq/dmq.c >> @@ -379,7 +379,7 @@ static int >> dmq_add_notification_address(modparam_t type, void * val) >> } >> >> /* initial allocation */ >> -if (dmq_notification_address_list == 0) { >> +if (dmq_notification_address_list == NULL) { >> dmq_notification_address_list = pkg_malloc(sizeof(str_list_t)); >> if (dmq_notification_address_list == NULL) { >> PKG_MEM_ERROR; >> >> _______________________________________________ >> Kamailio (SER) - Development Mailing List >> To unsubscribe send an email to sr-dev-leave(a)lists.kamailio.org > -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 1

git:master:c1813625: DMQ: Add debug line when creating list and adding first notification address
by Olle E. Johansson 21 Dec '22

21 Dec '22

Module: kamailio Branch: master Commit: c181362533ca2c7178218aa5b3724219d5deb58c URL: https://github.com/kamailio/kamailio/commit/c181362533ca2c7178218aa5b372421… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-12-21T15:27:28+01:00 DMQ: Add debug line when creating list and adding first notification address --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/c181362533ca2c7178218aa5b372421… Patch: https://github.com/kamailio/kamailio/commit/c181362533ca2c7178218aa5b372421… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index f4a66c3d84..45d92d8400 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -388,6 +388,8 @@ static int dmq_add_notification_address(modparam_t type, void * val) dmq_tmp_list = dmq_notification_address_list; dmq_tmp_list->s = tmp_str; dmq_tmp_list->next = NULL; + LM_DBG("Created list and added new notification address to the list %.*s\n", + dmq_tmp_list->s.len, dmq_tmp_list->s.s); } else { dmq_tmp_list = append_str_list(tmp_str.s, tmp_str.len, &dmq_tmp_list, &total_list); if (dmq_tmp_list == NULL) {

1 0

git:master:507a6ce2: http_client: Add SPDX identifiers
by Olle E. Johansson 21 Dec '22

21 Dec '22

Module: kamailio Branch: master Commit: 507a6ce2206cf31129fc0cb64a115b2e68493a2d URL: https://github.com/kamailio/kamailio/commit/507a6ce2206cf31129fc0cb64a115b2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-12-21T15:27:28+01:00 http_client: Add SPDX identifiers --- Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/curlcon.h Modified: src/modules/http_client/curlrpc.c Modified: src/modules/http_client/curlrpc.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/507a6ce2206cf31129fc0cb64a115b2… Patch: https://github.com/kamailio/kamailio/commit/507a6ce2206cf31129fc0cb64a115b2…

1 0

git:master:5c90e6e2: DMQ: dmq_notification_address_list is initialized to NULL
by Olle E. Johansson 21 Dec '22

21 Dec '22

Module: kamailio Branch: master Commit: 5c90e6e2885a60a1dc5de5ff697c93d6fe59a9cb URL: https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-12-21T15:27:28+01:00 DMQ: dmq_notification_address_list is initialized to NULL This code led to random and unpredictable behaviour when loading a configuration with multiple notification nodes. --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… Patch: https://github.com/kamailio/kamailio/commit/5c90e6e2885a60a1dc5de5ff697c93d… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 843b7e3e4d2..f4a66c3d847 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -379,7 +379,7 @@ static int dmq_add_notification_address(modparam_t type, void * val) } /* initial allocation */ - if (dmq_notification_address_list == 0) { + if (dmq_notification_address_list == NULL) { dmq_notification_address_list = pkg_malloc(sizeof(str_list_t)); if (dmq_notification_address_list == NULL) { PKG_MEM_ERROR;

1 0

git:master:7712a856: app_ruby_proc: new function to handle error from ruby
by Daniel-Constantin Mierla 21 Dec '22

21 Dec '22

Module: kamailio Branch: master Commit: 7712a856776d5cd9edec62bccc4b37bfd2ec2b8b URL: https://github.com/kamailio/kamailio/commit/7712a856776d5cd9edec62bccc4b37b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-21T15:21:03+01:00 app_ruby_proc: new function to handle error from ruby --- Modified: src/modules/app_ruby_proc/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/7712a856776d5cd9edec62bccc4b37b… Patch: https://github.com/kamailio/kamailio/commit/7712a856776d5cd9edec62bccc4b37b… --- diff --git a/src/modules/app_ruby_proc/app_ruby_api.c b/src/modules/app_ruby_proc/app_ruby_api.c index 4b4a7e3abf..f747da697e 100644 --- a/src/modules/app_ruby_proc/app_ruby_api.c +++ b/src/modules/app_ruby_proc/app_ruby_api.c @@ -77,6 +77,32 @@ sr_ruby_env_t *app_ruby_sr_env_get(void) } +static void ksr_ruby_error(int error) +{ + VALUE lasterr; + VALUE inclass; + VALUE message; + VALUE ary; + long c; + + if (error == 0) + return; + + lasterr = rb_gv_get("$!"); /* NOTRANSLATE */ + inclass = rb_class_path(CLASS_OF(lasterr)); + message = rb_obj_as_string(lasterr); + LM_ERR("error ruby script: class=%s, message=%s\n", + RSTRING_PTR(inclass), RSTRING_PTR(message)); + + if (!NIL_P(rb_errinfo())) { + ary = rb_funcall(rb_errinfo(), rb_intern("backtrace"), 0); + for (c=0; c<RARRAY_LEN(ary); ++c) { + LM_ERR("backtrace from %s\n", + RSTRING_PTR(RARRAY_PTR(ary)[c])); + } + } +} + static int app_ruby_print_last_exception() { VALUE rException, rExceptStr; @@ -108,7 +134,8 @@ int app_ruby_kemi_load_script(void) if (state) { /* got exception */ - app_ruby_print_last_exception(); + //app_ruby_print_last_exception(); + ksr_ruby_error(state); LM_ERR("failed to load rb script file: %.*s (%d)\n", _app_ruby_proc_load_file.len, _app_ruby_proc_load_file.s, state); // return -1; @@ -168,7 +195,8 @@ int app_ruby_proc_init_child(void) if (state) { /* handle exception */ - app_ruby_print_last_exception(); + // app_ruby_print_last_exception(); + ksr_ruby_error(state); LM_ERR("test execution with error (res type: %d)\n", TYPE(rbres)); return -1; } else {

1 0

git:master:a33c9bb2: core: utils/tmrec - removed unused function
by Daniel-Constantin Mierla 20 Dec '22

20 Dec '22

Module: kamailio Branch: master Commit: a33c9bb24f01195c5654e9699079eb3d4548692e URL: https://github.com/kamailio/kamailio/commit/a33c9bb24f01195c5654e9699079eb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-20T11:17:07+01:00 core: utils/tmrec - removed unused function --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/a33c9bb24f01195c5654e9699079eb3… Patch: https://github.com/kamailio/kamailio/commit/a33c9bb24f01195c5654e9699079eb3… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 609aa78b434..1b468acc42c 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -57,33 +57,6 @@ static inline int tr_strz_to_int(char *_bp) } -static inline char* tr_trim(char* _s) -{ - int len; - char* end; - - /* Null pointer, there is nothing to do */ - if (!_s) return _s; - - /* Remove spaces and tabs from the beginning of string */ - while ((*_s == ' ') || (*_s == '\t')) _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while ((*end == ' ') || (*end == '\t')) end--; - if (end != (_s + len - 1)) { - *(end+1) = '\0'; - } - - return _s; -} - - - - /** * ===== imported from "ac_tm.c" */

1 0

git:master:0f3ce402: cplc: removed unused function
by Daniel-Constantin Mierla 20 Dec '22

20 Dec '22

Module: kamailio Branch: master Commit: 0f3ce4029ee1f52804566dc945c7e0914f01405d URL: https://github.com/kamailio/kamailio/commit/0f3ce4029ee1f52804566dc945c7e09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-20T11:15:30+01:00 cplc: removed unused function --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/0f3ce4029ee1f52804566dc945c7e09… Patch: https://github.com/kamailio/kamailio/commit/0f3ce4029ee1f52804566dc945c7e09… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index eed253b165..f3604bc7f4 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -36,7 +36,7 @@ /************************ imported from "utils.h" ***************************/ -static inline int strz2int(char *_bp) +static inline int cpl_strz2int(char *_bp) { int _v; char *_p; @@ -53,33 +53,6 @@ static inline int strz2int(char *_bp) } -static inline char* trim(char* _s) -{ - int len; - char* end; - - /* Null pointer, there is nothing to do */ - if (!_s) return _s; - - /* Remove spaces and tabs from the beginning of string */ - while ((*_s == ' ') || (*_s == '\t')) _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while ((*end == ' ') || (*end == '\t')) end--; - if (end != (_s + len - 1)) { - *(end+1) = '\0'; - } - - return _s; -} - - - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system @@ -444,7 +417,7 @@ int cpl_tr_parse_interval(cpl_tmrec_p _trp, char *_in) { if(!_trp || !_in) return -1; - _trp->interval = strz2int(_in); + _trp->interval = cpl_strz2int(_in); return 0; }

1 0

git:master:5fedf169: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 20 Dec '22

20 Dec '22

Module: kamailio Branch: master Commit: 5fedf169d256e7e24fe2ce2b593af9a865ac9578 URL: https://github.com/kamailio/kamailio/commit/5fedf169d256e7e24fe2ce2b593af9a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-12-20T10:46:41+01:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/5fedf169d256e7e24fe2ce2b593af9a… Patch: https://github.com/kamailio/kamailio/commit/5fedf169d256e7e24fe2ce2b593af9a… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 7d68583ccd..2554a990f8 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -135,15 +135,15 @@ modparam("app_ruby", "load", "/usr/local/etc/kamailio/ruby/myscript.rb") internal functions from the app_ruby module, otherwise the ones from core are used. - Note: when set to 1, there were crashing reports that are under - investigation, this option being provided as intermediary solution to - preserve the behaviour from older versions. + Note: upt to version 5.7, when set to 1, there were crashing reports + that are under investigation, this option being provided as + intermediary solution to preserve the behaviour from older versions. - Default value is ��0��. + Default value is ��1��. Example 1.2. Set xval_mode parameter ... -modparam("app_ruby", "xval_mode", 1) +modparam("app_ruby", "xval_mode", 0) ... 3.3. modproc (str)

1 0

git:master:4b5cdf18: app_ruby: docs updated for xval_mode param
by Daniel-Constantin Mierla 20 Dec '22

20 Dec '22

Module: kamailio Branch: master Commit: 4b5cdf184a77e60d75f1ddf1cd666c6f36a76d48 URL: https://github.com/kamailio/kamailio/commit/4b5cdf184a77e60d75f1ddf1cd666c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-19T21:36:11+01:00 app_ruby: docs updated for xval_mode param --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b5cdf184a77e60d75f1ddf1cd666c6… Patch: https://github.com/kamailio/kamailio/commit/4b5cdf184a77e60d75f1ddf1cd666c6… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index ff957c6646..ae81a2a961 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -98,20 +98,20 @@ modparam("app_ruby", "load", "/usr/local/etc/kamailio/ruby/myscript.rb") core are used. </para> <para> - Note: when set to 1, there were crashing reports that are under - investigation, this option being provided as intermediary - solution to preserve the behaviour from older versions. + Note: upt to version 5.7, when set to 1, there were crashing + reports that are under investigation, this option being provided + as intermediary solution to preserve the behaviour from older versions. </para> <para> <emphasis> - Default value is <quote>0</quote>. + Default value is <quote>1</quote>. </emphasis> </para> <example> <title>Set <varname>xval_mode</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("app_ruby", "xval_mode", 1) +modparam("app_ruby", "xval_mode", 0) ... </programlisting> </example>

1 0

git:master:599c75a5: app_ruby: xval_mode set to 1
by Daniel-Constantin Mierla 20 Dec '22

20 Dec '22

Module: kamailio Branch: master Commit: 599c75a5d0988ee0dd78f524cd348900d1ee5448 URL: https://github.com/kamailio/kamailio/commit/599c75a5d0988ee0dd78f524cd34890… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-19T21:33:15+01:00 app_ruby: xval_mode set to 1 --- Modified: src/modules/app_ruby/app_ruby_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/599c75a5d0988ee0dd78f524cd34890… Patch: https://github.com/kamailio/kamailio/commit/599c75a5d0988ee0dd78f524cd34890… --- diff --git a/src/modules/app_ruby/app_ruby_mod.c b/src/modules/app_ruby/app_ruby_mod.c index 3eb3bc56d8..fc1673c546 100644 --- a/src/modules/app_ruby/app_ruby_mod.c +++ b/src/modules/app_ruby/app_ruby_mod.c @@ -57,7 +57,7 @@ static int w_app_ruby_run3(sip_msg_t *msg, char *func, char *p1, char *p2, static int fixup_ruby_run(void** param, int param_no); static str _app_ruby_load_file = STR_NULL; -static int _app_ruby_xval_mode = 0; +static int _app_ruby_xval_mode = 1; static int *_app_ruby_reload_version = NULL; static str _app_ruby_modproc = str_init("app_ruby_proc.so");

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