sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

[kamailio/kamailio] dialplan: dp_match() does substitution and replace (#1952)

by Victor Seva

### Description dialplan ``dp_match()`` fails with a substitution error when subst_exp doesn't match the string. I was expecting to only match the rule to get the attrs no matter what is defined in ``subst_exp/repl_exp`` ### Troubleshooting #### Reproduction ``` => select * from dialplan where id = 24; ─[ RECORD 1 ]────────────────────────────────────── id │ 24 dpid │ 101000 pr │ 1 match_op │ 1 match_exp │ ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ match_len │ 0 subst_exp │ ^([1-9][0-9]{8})$ repl_exp │ +34\1 attrs │ cli=+34654205682;action=0 ``` ``` route[SET_DST] { if($var(dpid_team)==0){ xdbg("SET_DST no $$var(dpid_team) - ci='$ci'"); return; } xinfo("SET_DST trying to get dialplan from dpid:$var(dpid_team) - ci'$ci'"); if(dp_translate("$(var(dpid_team){s.int})", "$rU/$var(dst)")){ if($rU != $var(dst)){ xinfo("SET_DST change from $$rU:'$rU' to '$var(dst)' - ci='$ci'"); $rU = $var(dst); } } else { xinfo("SET_DST no valid subst_exp for '$rU' trying to match - ci='$ci'"); dp_match("$(var(dpid_team){s.int})", "$rU"); } if($var(dp_attrs)!=0) { xdbg("SET_DST $$var(dp_attrs):$var(dp_attrs) " "action:$(var(dp_attrs){param.value,action}) - ci='$ci'"); $var(action) = $(var(dp_attrs){param.value,action}); if($var(action)=='1'){ xalert("Dialing rule group for '$rU' set to 'deny' - ci='$ci'"); route(ERROR_DEST_DENY); } } return; } ``` ``` INFO: <script>: SET_DST trying to get dialplan from dpid:101000 - ci'57f955434e6ca1e57727367e4abcff1f(a)PBX-2797.xpbx.foehn.co.uk' ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:727]: dp_translate_helper(): could not build the output INFO: <script>: SET_DST no valid subst_exp for '0034654205681' trying to match - ci='57f955434e6ca1e57727367e4abcff1f(a)PBX-2797.xpbx.foehn.co.uk' ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:727]: dp_translate_helper(): could not build the output ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.4 ``` -- 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/1952

5 years

[kamailio/kamailio] dialplan: don't try to translate on dp_match() (#1953)

by Victor Seva

``` INFO: <script>: SET_DST trying to get dialplan from dpid:101000 - ci'1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' DEBUG: dialplan [dialplan.c:232]: dp_get_ivalue(): searching 15 DEBUG: dialplan [dialplan.c:240]: dp_get_ivalue(): dpid is 101000 from pv argument DEBUG: dialplan [dialplan.c:249]: dp_get_svalue(): searching 7 DEBUG: dialplan [dialplan.c:345]: dp_translate_f(): input is 0034654205681 DEBUG: dialplan [dp_repl.c:606]: dp_translate_helper(): regex operator testing over [0034654205681] DEBUG: dialplan [dp_repl.c:681]: dp_translate_helper(): found a matching rule 0x7f065c2818d0: pr 1, match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ DEBUG: dialplan [dp_repl.c:688]: dp_translate_helper(): the rule's attrs are cli=+34654205682;action=0 DEBUG: dialplan [dp_repl.c:699]: dp_translate_helper(): the copied attributes are: cli=+34654205682;action=0 ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:730]: dp_translate_helper(): could not build the output DEBUG: dialplan [dialplan.c:350]: dp_translate_f(): could not translate 0034654205681 with dpid 101000 INFO: <script>: SET_DST no valid subst_exp for '0034654205681' trying to match - ci='1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' DEBUG: dialplan [dp_repl.c:606]: dp_translate_helper(): regex operator testing over [0034654205681] DEBUG: dialplan [dp_repl.c:681]: dp_translate_helper(): found a matching rule 0x7f065c2818d0: pr 1, match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ DEBUG: dialplan [dp_repl.c:688]: dp_translate_helper(): the rule's attrs are cli=+34654205682;action=0 DEBUG: dialplan [dp_repl.c:699]: dp_translate_helper(): the copied attributes are: cli=+34654205682;action=0 DEBUG: <script>: SET_DST $var(dp_attrs):cli=+34654205682;action=0 action:0 - ci='1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' ``` #### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1952 #### Description changing ``dp_replace_helper()`` to pass a NULL value indicating no output is needed ( no need to do subst ) to ``dp_translate_helper()`` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1953 -- Commit Summary -- * dialplan: don't try to translate on dp_match() -- File Changes -- M src/modules/dialplan/dialplan.c (14) M src/modules/dialplan/dp_repl.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1953.patch https://github.com/kamailio/kamailio/pull/1953.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/1953

5 years

git:master:cced2379: dialplan: don't try to translate on dp_match()

by Victor Seva

Module: kamailio Branch: master Commit: cced23795582d9f4cc2bae545ea1c24664303036 URL: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:37:41+02:00 dialplan: don't try to translate on dp_match() fix #1952 --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… Patch: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 20b7744e21..7770679a45 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -481,8 +481,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, pv_spec_t *pvd) { dpl_id_p idp; - str output = STR_NULL; + str tmp = STR_NULL; str attrs = STR_NULL; + str *output = NULL; str *outattrs = NULL; if ((idp = select_dpid(dpid)) ==0) { @@ -491,16 +492,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, } outattrs = (!attr_pvar)?NULL:&attrs; - if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) { + output = (!pvd)?NULL:&tmp; + if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) { LM_DBG("could not translate %.*s " "with dpid %i\n", input->len, input->s, idp->dp_id); return -1; } - LM_DBG("input %.*s with dpid %i => output %.*s\n", - input->len, input->s, idp->dp_id, output.len, output.s); + if (output) { + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input->len, input->s, idp->dp_id, output->len, output->s); + } /* set the output */ - if (dp_update(msg, pvd, &output, outattrs) !=0){ + if (dp_update(msg, pvd, output, outattrs) !=0){ LM_ERR("cannot set the output\n"); return -1; } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06534a9dab..05949c8289 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, attrs->len, attrs->s); } } + if(!output) { + return 0; + } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp); if(re_list==NULL) {

5 years

git:master:61b67197: janssonrpcc: remove compilation warning

by Victor Seva

Module: kamailio Branch: master Commit: 61b67197ba8b996abdaff1388362469563ba2202 URL: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:13:17+02:00 janssonrpcc: remove compilation warning > janssonrpcc_mod.c:345:25: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] > if (jsonrpc_keep_alive < 0) { > ~~~~~~~~~~~~~~~~~~ ^ ~ > 1 warning generated. --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… Patch: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 9076f4a543..bad41ca2c5 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -342,9 +342,7 @@ int parse_keep_alive_param(modparam_t type, void* val) return -1; } jsonrpc_keep_alive = (int)(long)val; - if (jsonrpc_keep_alive < 0) { - jsonrpc_keep_alive = 0; - } + INFO("jsonrpc_keep_alive set to %d\n", jsonrpc_keep_alive); return 0; }

5 years

git:master:5f71e746: core: added command line parameter to set subst preprocessor directive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f71e7460fabe839f57ee1c42434e986a823ab9d URL: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T17:09:13+02:00 core: added command line parameter to set subst preprocessor directive * --subst="expression" - like: #!subst "expression" --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… Patch: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… --- diff --git a/src/main.c b/src/main.c index e124f6857e..959602ebb3 100644 --- a/src/main.c +++ b/src/main.c @@ -204,7 +204,8 @@ Options:\n\ #ifdef STATS " -s file File where to write internal statistics on SIGUSR1\n" #endif -" --substdef=exp set a substdef preprocessor directive\n\ +" --subst=exp set a subst preprocessor directive\n\ + --substdef=exp set a substdef preprocessor directive\n\ --substdefs=exp set a substdefs preprocessor directive\n" #ifdef USE_SCTP " -S disable sctp\n" @@ -1902,8 +1903,9 @@ int main(int argc, char** argv) {"version", no_argument, 0, 'v'}, /* long options without short variant */ {"alias", required_argument, 0, KARGOPTVAL}, - {"substdef", required_argument, 0, KARGOPTVAL + 1}, - {"substdefs", required_argument, 0, KARGOPTVAL + 2}, + {"subst", required_argument, 0, KARGOPTVAL + 1}, + {"substdef", required_argument, 0, KARGOPTVAL + 2}, + {"substdefs", required_argument, 0, KARGOPTVAL + 3}, {0, 0, 0, 0 } }; @@ -2138,14 +2140,20 @@ int main(int argc, char** argv) } break; case KARGOPTVAL+1: - if(pp_substdef_add(optarg, 0)<0) { - LM_ERR("failed to add substdef: %s\n", optarg); + if(pp_subst_add(optarg)<0) { + LM_ERR("failed to add subst expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+2: + if(pp_substdef_add(optarg, 0)<0) { + LM_ERR("failed to add substdef expression: %s\n", optarg); + goto error; + } + break; + case KARGOPTVAL+3: if(pp_substdef_add(optarg, 1)<0) { - LM_ERR("failed to add substdefs: %s\n", optarg); + LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } break;

5 years

git:master:38d61e4c: core: command line parameters for adding substdef and substdefs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38d61e4c7cc35f0b0b8fffc7725a882bff3e79b1 URL: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T17:00:07+02:00 core: command line parameters for adding substdef and substdefs * --substdef="expression" - like a #!substdef "expression" * --substdefis="expression" - like a #!substdefs "expression" --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… Patch: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… --- diff --git a/src/main.c b/src/main.c index a97fb6dba0..e124f6857e 100644 --- a/src/main.c +++ b/src/main.c @@ -204,6 +204,8 @@ Options:\n\ #ifdef STATS " -s file File where to write internal statistics on SIGUSR1\n" #endif +" --substdef=exp set a substdef preprocessor directive\n\ + --substdefs=exp set a substdefs preprocessor directive\n" #ifdef USE_SCTP " -S disable sctp\n" #endif @@ -1899,7 +1901,9 @@ int main(int argc, char** argv) {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, /* long options without short variant */ - {"alias", required_argument, 0, KARGOPTVAL}, + {"alias", required_argument, 0, KARGOPTVAL}, + {"substdef", required_argument, 0, KARGOPTVAL + 1}, + {"substdefs", required_argument, 0, KARGOPTVAL + 2}, {0, 0, 0, 0 } }; @@ -2133,6 +2137,18 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+1: + if(pp_substdef_add(optarg, 0)<0) { + LM_ERR("failed to add substdef: %s\n", optarg); + goto error; + } + break; + case KARGOPTVAL+2: + if(pp_substdef_add(optarg, 1)<0) { + LM_ERR("failed to add substdefs: %s\n", optarg); + goto error; + } + break; /* special cases */ case '?':

5 years

git:master:e648fd5e: core: return negative on error adding pre-processor substdef

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e648fd5e10a6ec694129be5fab0a84c2c90aa916 URL: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T16:36:08+02:00 core: return negative on error adding pre-processor substdef - expected by the checks when executing the functions --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… Patch: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a06795f760..3b026f9978 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -164,7 +164,7 @@ int pp_substdef_add(char *data, int mode) return 0; error: - return 1; + return -1; } int pp_subst_run(char **data)

5 years

git:master:3619432d: siptrace: use the str for null values from pv core api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3619432d8bc27abde97081ba223d19f86b0932a7 URL: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T11:04:49+02:00 siptrace: use the str for null values from pv core api --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… Patch: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dfdbdcd409..642526f63f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -68,7 +68,7 @@ MODULE_VERSION || ((_msg->flags & trace_flag) == 0)) #define is_null_pv(_str) \ - (!str_strcmp(&_str, &null_pv_value_str)) + (!str_strcmp(&_str, pv_get_null_str())) struct tm_binds tmb; struct dlg_binds dlgb; @@ -136,8 +136,6 @@ static str totag_column = str_init("totag"); /* 11 */ static str siptrace_info_dlgkey = str_init("__siptrace_info_dlg_key__"); static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); -static str null_pv_value_str = str_init("<null>"); - #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4

5 years

git:master:c84a89a3: core: pv - define the string printed for null value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c84a89a3ab5b3f3174203753e51926143b0309f8 URL: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T11:02:49+02:00 core: pv - define the string printed for null value - added function to return the str null value --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Patch: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 27a23612c7..bd0d3c2e98 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -674,7 +674,8 @@ static char pv_str_empty_buf[2]; static char pv_str_null_buf[8]; static str pv_str_empty = { "", 0 }; -static str pv_str_null = { "<null>", 6 }; +#define PV_STR_NULL_VAL "<null>" +static str pv_str_null = { PV_STR_NULL_VAL, sizeof(PV_STR_NULL_VAL)-1 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -686,6 +687,14 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +str *pv_get_null_str(void) +{ + return &pv_str_null; +} + /** * */ @@ -2007,7 +2016,7 @@ int pv_init_api(void) pv_str_empty_buf[0] = '\0'; pv_str_empty_buf[1] = '\0'; pv_str_empty.s = pv_str_empty_buf; - strcpy(pv_str_null_buf, "<null>"); + strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; if(register_pvars_mod("core", _core_pvs)<0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 3e838e20f8..564bc03d90 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -209,6 +209,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); +str *pv_get_null_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

5 years

git:master:c37e0032: siptrace: free trace_to_database_flag on module destroy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c37e00326969c4be565a030708778a64714926e5 URL: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T10:48:44+02:00 siptrace: free trace_to_database_flag on module destroy --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Patch: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 92e2019917..dfdbdcd409 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -495,13 +495,16 @@ static int child_init(int rank) static void destroy(void) { - if(trace_to_database_flag != NULL && *trace_to_database_flag != 0) { - if(db_con != NULL) + if(trace_to_database_flag != NULL) { + if(db_con != NULL) { db_funcs.close(db_con); + } + shm_free(trace_to_database_flag); } - if(trace_on_flag) + if(trace_on_flag) { shm_free(trace_on_flag); + } } static inline str *siptrace_get_table(void)

5 years

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019