sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: - allow the configuration of valid response-codes to the pinger ; they can be set through config framework.

by Carsten Bock

Module: sip-router Branch: master Commit: ec903da3a0b0a91dfc4b4236d84e7e145706c994 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec903da… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Sep 29 18:08:41 2010 +0200 - allow the configuration of valid response-codes to the pinger; they can be set through config framework. --- modules_k/dispatcher/config.c | 46 ++++++++ modules_k/dispatcher/config.h | 40 +++++++ modules_k/dispatcher/dispatch.c | 11 +-- modules_k/dispatcher/dispatch.h | 5 + modules_k/dispatcher/dispatcher.c | 154 +++++++++++++++++++++++++ modules_k/dispatcher/doc/dispatcher_admin.xml | 23 ++++- 6 files changed, 270 insertions(+), 9 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ec9…

14 years, 4 months

git:master: - be less verbose

by Carsten Bock

Module: sip-router Branch: master Commit: 3f367560725eaf00f3bc8d8f0d3d047db3c6997a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f36756… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Sep 29 18:12:22 2010 +0200 - be less verbose --- modules_k/dispatcher/dispatcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index ef4bb9a..39258d7 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -782,7 +782,7 @@ static int ds_parse_reply_codes() { list_size += 100; } } - LM_INFO("Should be %d Destinations.\n", list_size); + LM_DBG("Should be %d Destinations.\n", list_size); if (list_size > 0) { /* Allocate Memory for the new list: */ @@ -841,7 +841,7 @@ static int ds_parse_reply_codes() { /* Print the list as INFO: */ for (i =0; i< *ds_ping_reply_codes_cnt; i++) { - LM_INFO("Dispatcher: Now accepting Reply-Code %d (%d/%d) as valid\n", + LM_DBG("Dispatcher: Now accepting Reply-Code %d (%d/%d) as valid\n", (*ds_ping_reply_codes)[i], (i+1), *ds_ping_reply_codes_cnt); } return 0;

14 years, 4 months

git:master: core: return & break are absorbed in expressions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 65b64bca77b18f7ee964119e1b3b363d66189c3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65b64bc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 17:35:25 2010 +0200 core: return & break are absorbed in expressions return & break inside an expression do not cause the current route block or while/switch statement to end. E.g.: $v = { return 1; } will not end the current route, will only set $v to 1. --- lvalue.c | 12 ++++++++---- rvalue.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lvalue.c b/lvalue.c index 47a625f..a8dcbd9 100644 --- a/lvalue.c +++ b/lvalue.c @@ -107,9 +107,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; - if (rv->v.action) + if (rv->v.action) { value.n=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else value.n=-1; ret=value.n; break; @@ -282,9 +284,11 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; - if (rv->v.action) + if (rv->v.action) { pval.ri=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else pval.ri=0; ret=pval.ri; break; diff --git a/rvalue.c b/rvalue.c index 6ef399b..9195972 100644 --- a/rvalue.c +++ b/rvalue.c @@ -900,9 +900,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { *i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else *i=0; break; case RV_SEL: @@ -1099,9 +1101,11 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, *tmpv=rv->v.s; break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else i=0; tmpv->s=sint2strbuf(i, tmp_cache->i2s, sizeof(tmp_cache->i2s), &tmpv->len);

14 years, 4 months

git:master: utils/kamctl: new lcr function: eval_weights

by Ovidiu Sas

Module: sip-router Branch: master Commit: f6673e2930b6c4e28af60f8ed4c2ea233c944ab4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6673e2… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 29 11:11:36 2010 -0400 utils/kamctl: new lcr function: eval_weights - evaluates the probability of a GW being selected based on given weigths --- utils/kamctl/kamctl | 32 ++++++++++++++++++++++++++++++-- utils/kamctl/kamctl.base | 1 + 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index be65363..48db7dd 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1114,15 +1114,15 @@ trusted() { ### LCR management # lcr() { - require_dbengine - require_ctlengine case $1 in show_gws) + require_dbengine mecho "lcr gateways" QUERY="select * FROM $GW_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_GW_GRPID_COLUMN; " $DBROCMD "$QUERY" ;; show_routes) + require_dbengine mecho "lcr routes" QUERY="select * FROM $LCR_TABLE ORDER BY $LCR_ID_COLUMN, $LCR_PREFIX_COLUMN; " $DBROCMD "$QUERY" @@ -1136,6 +1136,34 @@ lcr() { dump_routes) $RPCCMD lcr.dump_lcrs ;; + eval_weights) + shift + $AWK 'BEGIN { + if (ARGC < 2) { + printf("Usage: lcr eval_weights <list of weights (integers 1-254)>\n"); + exit; + } + iters = 100000; + for (i = 1; i < ARGC; i++) { counts[i] = 0; } + for (i = 1; i <= iters; i++) { + for (j = 1; j < ARGC; j++) { + elem[j] = ARGV[j] * rshift(int(2147483647 * rand()), 8); + } + at = 1; + max = elem[at]; + for (j = 2; j < ARGC; j++) { + if (elem[j] > max) { + max = elem[j]; + at = j; + } + } + counts[at] = counts[at] + 1; + } + for (i = 1; i < ARGC; i++) { + printf("weight %d probability %.4f\n", ARGV[i], counts[i]/iters); + } + }' $@ + ;; *) usage_lcr exit 1 diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 1949711..11c398d 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -354,6 +354,7 @@ cat <<EOF lcr dump_gws....... show in memory gateways lcr dump_routes.... show in memory routes lcr reload ........ reload lcr gateways and routes + lcr eval_weights .. evaluates probability for given GW's weights EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_lcr"

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: apply additional var list bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 90003ec474ff23b385c4760336671ae8758d2523 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90003ec… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 28 17:13:28 2010 +0200 cfg framework: apply additional var list bugfix The variable list needs to be applied for each group --- cfg/cfg_struct.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index a736d67..10d8ef7 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -255,11 +255,12 @@ int cfg_shmize(void) group->name_len, group->name); goto error; } + + /* Create the additional group instances with applying + the temporary list. */ + if (apply_add_var_list(block, group)) + goto error; } - /* Create the additional group instances with applying - the temporary list. */ - if (apply_add_var_list(block, group)) - goto error; /* try to fixup the selects that failed to be fixed-up previously */ if (cfg_fixup_selects()) goto error;

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance support in the script

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 9235f7d58df3ec883d4749de3b37bd493bc9bde2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9235f7d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 29 16:40:30 2010 +0200 cfg framework: group instance support in the script Variables within group instances can be set from the script, for example: tm[2].reparse_invite = 0; tm[2].default_reason = "New reason"; Any assignmnet within a group instance creates the entire instance if it does not exist yet. Note: does not work with core variables yet. --- cfg.y | 10 ++++++++++ cfg/cfg.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg.h | 19 +++++++++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index d98372d..c43792b 100644 --- a/cfg.y +++ b/cfg.y @@ -1632,6 +1632,16 @@ cfg_var: | cfg_var_id DOT cfg_var_id EQUAL error { yyerror("number or string expected"); } + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL NUMBER { + if (cfg_ginst_var_int($1, $3, $6, $8)) { + yyerror("variable cannot be added to the group instance"); + } + } + | cfg_var_id LBRACK NUMBER RBRACK DOT cfg_var_id EQUAL STRING { + if (cfg_ginst_var_string($1, $3, $6, $8)) { + yyerror("variable cannot be added to the group instance"); + } + } ; module_stm: diff --git a/cfg/cfg.c b/cfg/cfg.c index 88a34b2..2d0f640 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -227,6 +227,56 @@ int cfg_declare_str(char *group_name, char *var_name, char *val, char *descr) return 0; } +/* Add a varibale to a group instance with integer type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_int(char *group_name, unsigned int group_id, char *var_name, + int val) +{ + str gname, vname; + + gname.s = group_name; + gname.len = strlen(group_name); + vname.s = var_name; + vname.len = strlen(var_name); + + return new_add_var(&gname, group_id, &vname, + (void *)(long)val, CFG_VAR_INT); +} + +/* Add a varibale to a group instance with string type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_string(char *group_name, unsigned int group_id, char *var_name, + char *val) +{ + str gname, vname; + + gname.s = group_name; + gname.len = strlen(group_name); + vname.s = var_name; + vname.len = strlen(var_name); + + return new_add_var(&gname, group_id, &vname, + (void *)val, CFG_VAR_STRING); +} + +/* Create a new group instance. + * wrapper function for new_add_var() + */ +int cfg_new_ginst(char *group_name, unsigned int group_id) +{ + str gname; + + gname.s = group_name; + gname.len = strlen(group_name); + + return new_add_var(&gname, group_id, NULL /* var */, + NULL /* val */, 0 /* type */); +} + /* returns the handle of a cfg group */ void **cfg_get_handle(char *gname) { diff --git a/cfg/cfg.h b/cfg/cfg.h index 8691805..b196d26 100644 --- a/cfg/cfg.h +++ b/cfg/cfg.h @@ -87,6 +87,25 @@ int cfg_declare_int(char *group_name, char *var_name, /* declares a single variable with str type */ int cfg_declare_str(char *group_name, char *var_name, char *val, char *descr); +/* Add a varibale to a group instance with integer type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_int(char *group_name, unsigned int group_id, char *var_name, + int val); + +/* Add a varibale to a group instance with string type. + * The group instance is created if it does not exist. + * wrapper function for new_add_var() + */ +int cfg_ginst_var_string(char *group_name, unsigned int group_id, char *var_name, + char *val); + +/* Create a new group instance. + * wrapper function for new_add_var() + */ +int cfg_new_ginst(char *group_name, unsigned int group_id); + /* returns the handle of a cfg group */ void **cfg_get_handle(char *gname);

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: apply the values in the order they are set

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 675f88e144fdcbe2f776b58e1f890f470e3d4bdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=675f88e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 29 13:58:07 2010 +0200 cfg framework: apply the values in the order they are set Add the value change to the end of the list (within the same group_id) to make sure that the values are changed in the order they are set in the script. This is important when the same variable is changed multiple times, the latest value must be kept in this case. --- cfg/cfg_struct.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 10d8ef7..358e4eb 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -948,7 +948,7 @@ int new_add_var(str *group_name, unsigned int group_id, str *var_name, /* order the list by group_id, it will be easier to count the group instances */ for( add_var_p = &group->add_var; - *add_var_p && ((*add_var_p)->group_id < group_id); + *add_var_p && ((*add_var_p)->group_id <= group_id); add_var_p = &((*add_var_p)->next)); add_var->next = *add_var_p;

14 years, 4 months

git:tirpi/cfg_framework_multivalue: cfg framework: translate_pointer bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: b4e2f2aa59257ef26aeec1558ebd9aa76c61d60d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4e2f2a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 28 17:14:37 2010 +0200 cfg framework: translate_pointer bugfix The parameters of translate_pointer() need to be casted to char*. It would be much more convenient, and also safer, to do this casting within the macro. --- cfg/cfg_ctx.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 8b79197..606ab6b 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -286,7 +286,9 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, /* The array needs to be cloned before the modification */ if (!(array = cfg_clone_array(meta, group))) return -1; - ginst = translate_pointer(array, meta->array, ginst); + ginst = (cfg_group_inst_t *)translate_pointer((char *)array, + (char *)meta->array, + (char *)ginst); /* re-link the array to the meta-data */ meta->array = array; clone_done = 1; @@ -459,9 +461,9 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va * the complete config block and this array is replaced. */ if (!(new_array = cfg_clone_array(CFG_GROUP_META(*cfg_global, group), group))) goto error; - group_inst = translate_pointer(new_array, - CFG_GROUP_META(*cfg_global, group)->array, - group_inst); + group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, + (char *)CFG_GROUP_META(*cfg_global, group)->array, + (char *)group_inst); var_block = group_inst->vars; CFG_GROUP_META(block, group)->array = new_array; } else {

14 years, 4 months

git:master: core: route(dynamic expression) memleak fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c26801f44c260b3989f525bf2b26670d4cc7f651 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c26801f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 16:27:46 2010 +0200 core: route(dynamic expression) memleak fix When using a dynamic expression as argument to route() (e.g. route($foo) or route($foo + "1")), the evaluated rvalue was not freed. --- action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 3768dfa..dd0cfef 100644 --- a/action.c +++ b/action.c @@ -680,11 +680,13 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (unlikely(i < 0)) { ERR("route \"%s\" not found at %s:%d\n", s.s, (a->cfile)?a->cfile:"line", a->cline); + rval_destroy(rv); rval_cache_clean(&c1); s.s = 0; ret = E_SCRIPT; goto error; } + rval_destroy(rv); rval_cache_clean(&c1); s.s = 0; } else {

14 years, 4 months

git:master: core: fix end-script commands in expr. leaks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 28a882873f8a69a189d790e33bcd2017c253a66a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28a8828… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 16:30:40 2010 +0200 core: fix end-script commands in expr. leaks When having commands that end the script immediately in assignments (e.g. $foo = { drop; }) or in expressions (e.g. if ($v + { drop; } > 0)), the script was terminated immediately via longjmp. However this might leave some un-freed variables. This fix introduces a safe version of run_actions() (run_actions_safe()) that will not use longjmp() to immediately end the whole script on drop, returning instead to its caller. --- action.c | 30 +++++++++++++++++++++++++++++- action.h | 8 ++++++++ lvalue.c | 4 ++-- route_struct.h | 1 + rvalue.c | 4 ++-- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/action.c b/action.c index dd0cfef..1716c34 100644 --- a/action.c +++ b/action.c @@ -1564,7 +1564,8 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->rec_lev--; end: /* process module onbreak handlers if present */ - if (unlikely(h->rec_lev==0 && ret==0)) + if (unlikely(h->rec_lev==0 && ret==0 && + !(h->run_flags & IGNORE_ON_BREAK_R_F))) for (mod=modules;mod;mod=mod->next) if (unlikely(mod->exports.onbreak_f)) { mod->exports.onbreak_f( msg ); @@ -1578,6 +1579,33 @@ error: } + +#ifdef USE_LONGJMP +/** safe version of run_actions(). + * It always return (it doesn't longjmp on forced script end). + * @returns 0, or 1 on success, <0 on error + * (0 if drop or break encountered, 1 if not ) */ +int run_actions_safe(struct run_act_ctx* h, struct action* a, + struct sip_msg* msg) +{ + struct run_act_ctx ctx; + int ret; + int ign_on_break; + + /* start with a fresh action context */ + init_run_actions_ctx(&ctx); + ctx.last_retcode = h->last_retcode; + ign_on_break = h->run_flags & IGNORE_ON_BREAK_R_F; + ctx.run_flags = h->run_flags | IGNORE_ON_BREAK_R_F; + ret = run_actions(&ctx, a, msg); + h->last_retcode = ctx.last_retcode; + h->run_flags = (ctx.run_flags & ~IGNORE_ON_BREAK_R_F) | ign_on_break; + return ret; +} +#endif /* USE_LONGJMP */ + + + int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx *c) { struct run_act_ctx ctx; diff --git a/action.h b/action.h index c11baa9..a2a5395 100644 --- a/action.h +++ b/action.h @@ -68,4 +68,12 @@ int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); + +#ifdef USE_LONGJMP +int run_actions_safe(struct run_act_ctx* c, struct action* a, + struct sip_msg* msg); +#else /*! USE_LONGJMP */ +#define run_actions_safe(c, a, m) run_actions(c, a, m) +#endif /* USE_LONGJMP */ + #endif diff --git a/lvalue.c b/lvalue.c index 4610da4..47a625f 100644 --- a/lvalue.c +++ b/lvalue.c @@ -108,7 +108,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; if (rv->v.action) - value.n=run_actions(h, rv->v.action, msg); + value.n=run_actions_safe(h, rv->v.action, msg); else value.n=-1; ret=value.n; @@ -283,7 +283,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; if (rv->v.action) - pval.ri=run_actions(h, rv->v.action, msg); + pval.ri=run_actions_safe(h, rv->v.action, msg); else pval.ri=0; ret=pval.ri; diff --git a/route_struct.h b/route_struct.h index 2d4a643..16733db 100644 --- a/route_struct.h +++ b/route_struct.h @@ -142,6 +142,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define IGNORE_ON_BREAK_R_F 256 struct cfg_pos{ diff --git a/rvalue.c b/rvalue.c index eeac3d5..6ef399b 100644 --- a/rvalue.c +++ b/rvalue.c @@ -901,7 +901,7 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - *i=(run_actions(h, rv->v.action, msg)>0); + *i=(run_actions_safe(h, rv->v.action, msg)>0); else *i=0; break; @@ -1100,7 +1100,7 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - i=(run_actions(h, rv->v.action, msg)>0); + i=(run_actions_safe(h, rv->v.action, msg)>0); else i=0; tmpv->s=sint2strbuf(i, tmp_cache->i2s,

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev