sr-dev

sr-dev@lists.kamailio.org

12 participants
44188 discussions

git:master: script parsing: if (non-int) not any longer an error

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 7f2853ad287f90736dba35d6bc370922a77fbac7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f2853a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 19:19:54 2009 +0200 script parsing: if (non-int) not any longer an error An if expression that does not evaluate to int is not any longer considered a parse error. It will generate a warning, but sr will start. This allows backward compatible if (@select) or if($avp). --- cfg.y | 17 ++++++++++------- route.c | 4 ++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cfg.y b/cfg.y index 21e81a1..5897914 100644 --- a/cfg.y +++ b/cfg.y @@ -1858,13 +1858,13 @@ action: ; if_cmd: IF rval_expr stm { - if (rval_expr_int_check($2)==0){ + if (rval_expr_int_check($2)>=0){ warn_ct_rve($2, "if"); } $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); } | IF rval_expr stm ELSE stm { - if (rval_expr_int_check($2)==0){ + if (rval_expr_int_check($2)>=0){ warn_ct_rve($2, "if"); } $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); @@ -2806,7 +2806,8 @@ static void warn_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_WARN, "warning in config file, from line %d, column %d to line %d, column %d: %s\n", + LOG(L_WARN, "warning in config file, from line %d, column %d to" + " line %d, column %d: %s\n", p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) LOG(L_WARN, "warning in config file, line %d, column %d-%d: %s\n", @@ -2828,7 +2829,8 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_CRIT, "parse error in config file, from line %d, column %d to line %d, column %d: %s\n", + LOG(L_CRIT, "parse error in config file, from line %d, column %d" + " to line %d, column %d: %s\n", p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) LOG(L_CRIT, "parse error in config file, line %d, column %d-%d: %s\n", @@ -2948,7 +2950,7 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, /** check if the expression is an int. * if the expression does not evaluate to an int return -1 and * log an error. - * @return 0 on success, -1 on error */ + * @return 0 success, no warnings; 1 success but warnings; -1 on error */ static int rval_expr_int_check(struct rval_expr *rve) { struct rval_expr* bad_rve; @@ -2967,8 +2969,9 @@ static int rval_expr_int_check(struct rval_expr *rve) yyerror("BUG: unexpected null \"bad\" expression\n"); return -1; }else if (type!=RV_INT && type!=RV_NONE){ - yyerror_at(&rve->fpos, "invalid expression type, int expected\n"); - return -1; + warn_at(&rve->fpos, "non-int expression (you might want to use" + " casts)\n"); + return 1; } return 0; } diff --git a/route.c b/route.c index 4ba116a..8d8c7db 100644 --- a/route.c +++ b/route.c @@ -712,12 +712,16 @@ int fix_actions(struct action* a) rve->fpos.s_line, rve->fpos.s_col); return E_UNSPEC; } + /* it's not an error anymore to have non-int in an if, + only a script warning (to allow backward compat. stuff + like if (@ruri) if (rve_type!=RV_INT && rve_type!=RV_NONE){ LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" " bad type, integer expected\n", rve->fpos.s_line, rve->fpos.s_col); return E_UNSPEC; } + */ if ((ret=fix_rval_expr((void**)&rve))<0) return ret; }

15 years, 8 months

git:master: core expr. eval: support for int & str casts

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0b3019f699dfb999be04572d4c35a613b6032435 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b3019f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 13:51:40 2009 +0200 core expr. eval: support for int & str casts - new internal operators for force-casting to int or str - fix int conversion failure for v1 str_concat v2 --- rvalue.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- rvalue.h | 3 ++ 2 files changed, 92 insertions(+), 19 deletions(-) diff --git a/rvalue.c b/rvalue.c index c332173..db30fda 100644 --- a/rvalue.c +++ b/rvalue.c @@ -28,6 +28,7 @@ * (str)undef="", (int)""=0, (int)"123"=123, (int)"abc"=0 * handle undef == expr, in function of the UNDEF_EQ_* defines. * (andrei) + * 2009-05-05 casts operator for int & string (andrei) */ /* special defines: @@ -480,11 +481,13 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: return RV_INT; case RVE_PLUS_OP: /* '+' evaluates to the type of the left operand */ return rve_guess_type(rve->left.rve); case RVE_CONCAT_OP: + case RVE_STR_OP: return RV_STR; case RVE_NONE_OP: break; @@ -522,6 +525,8 @@ int rve_is_constant(struct rval_expr* rve) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: return rve_is_constant(rve->left.rve); case RVE_MINUS_OP: case RVE_MUL_OP: @@ -579,6 +584,8 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: return 1; case RVE_MINUS_OP: case RVE_MUL_OP: @@ -781,6 +788,14 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, return 1; } break; + case RVE_INT_OP: + *type=RV_INT; + return 1; + break; + case RVE_STR_OP: + *type=RV_STR; + return 1; + break; case RVE_NONE_OP: default: BUG("unexpected rve op %d\n", rve->op); @@ -1726,6 +1741,9 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, break; ret=int_intop1(res, rve->op, i1); break; + case RVE_INT_OP: + ret=rval_expr_eval_int(h, msg, res, rve->left.rve); + break; case RVE_MUL_OP: case RVE_DIV_OP: case RVE_MINUS_OP: @@ -1857,27 +1875,49 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, } } break; -#if 0 - case RVE_MATCH_OP: - if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ - ret=-1; - break; - } - if (unlikely((rv2=rval_expr_eval(h, msg, - rve->right.rve))==0)){ - rval_destroy(rv1); - ret=-1; - break; - } - ret=rval_str_lop2(res, rve->op, rv1, 0, rv2, 0); + case RVE_CONCAT_OP: + /* eval expression => string */ + if (unlikely((rv1=rval_expr_eval(h, msg, rve))==0)){ + ret=-1; + break; + } + /* conver to int */ + ret=rval_get_int(h, msg, res, rv1, 0); /* convert to int */ + rval_destroy(rv1); + break; + case RVE_STR_OP: + /* (str)expr => eval expression */ + rval_cache_init(&c1); + if (unlikely((ret=rval_expr_eval_rvint(h, msg, &rv1, res, + rve->left.rve, &c1))<0)){ + /* error */ + rval_cache_clean(&c1); + break; + } + if (unlikely(rv1)){ + /* expr evaluated to string => (int)(str)v == (int)v */ + ret=rval_get_int(h, msg, res, rv1, &c1); /* convert to int */ rval_destroy(rv1); - rval_destroy(rv2); + rval_cache_clean(&c1); + } /* else (rv1==0) + => expr evaluated to int => + return (int)(str)v == (int)v => do nothing */ break; -#endif - case RVE_CONCAT_OP: - *res=0; - ret=-1; + +#if 0 + /* same thing as above, but in a not optimized, easier to + understand way */ + /* 1. (str) expr => eval expr */ + if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ + ret=-1; + break; + } + /* 2. convert to str and then convert to int + but since (int)(str)v == (int)v skip over (str)v */ + ret=rval_get_int(h, msg, res, rv1, 0); /* convert to int */ + rval_destroy(rv1); break; +#endif case RVE_DEFINED_OP: ret=int_rve_defined(h, msg, res, rve->left.rve); break; @@ -1918,8 +1958,19 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, /** evals a rval expr. into an int or another rv(str). * WARNING: rv result (rv_res) must be rval_destroy()'ed if non-null - * (it might be a reference to another rval). The result can be + * (it might be a reference to another rval). The result can be * modified only if rv_chg_in_place() returns true. + * @param res_rv - pointer to rvalue result, if non-null it means the + * expression evaluated to a non-int (str), which will be + * stored here. + * @param res_i - pointer to int result, if res_rv==0 and the function + * returns success => the result is an int which will be + * stored here. + * @param rve - expression that will be evaluated. + * @param cache - write-only value cache, it might be filled if non-null and + * empty (rval_cache_init()). If non-null, it _must_ be + * rval_cache_clean()'ed when done. + * * @result 0 on success, -1 on error, sets *res_rv or *res_i. */ int rval_expr_eval_rvint( struct run_act_ctx* h, @@ -1986,6 +2037,7 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: /* operator forces integer type */ ret=rval_expr_eval_int(h, msg, res_i, rve); *res_rv=0; @@ -2020,6 +2072,7 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, rval_cache_clean(&c1); break; case RVE_CONCAT_OP: + case RVE_STR_OP: *res_rv=rval_expr_eval(h, msg, rve); ret=-(*res_rv==0); break; @@ -2089,6 +2142,7 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: /* operator forces integer type */ r=rval_expr_eval_int(h, msg, &i, rve); if (likely(r==0)){ @@ -2168,6 +2222,14 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, } ret=rval_str_add2(h, msg, rv1, 0, rv2, 0); break; + case RVE_STR_OP: + rv1=rval_expr_eval(h, msg, rve->left.rve); + if (unlikely(rv1==0)){ + ERR("rval expression evaluation failed\n"); + goto error; + } + ret=rval_convert(h, msg, RV_STR, rv1, 0); + break; case RVE_NONE_OP: /*default:*/ BUG("invalid rval expression operation %d\n", rve->op); @@ -2292,6 +2354,8 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: break; default: BUG("unsupported unary operator %d\n", op); @@ -2374,6 +2438,8 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: /* one operand expression => cannot be assoc. */ return 0; case RVE_DIV_OP: @@ -2422,6 +2488,8 @@ static int rve_op_is_commutative(enum rval_expr_op op) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: /* one operand expression => cannot be commut. */ return 0; case RVE_DIV_OP: @@ -3291,6 +3359,8 @@ int fix_rval_expr(void** p) case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: + case RVE_INT_OP: + case RVE_STR_OP: ret=fix_rval_expr((void**)&rve->left.rve); if (ret<0) return ret; break; diff --git a/rvalue.h b/rvalue.h index c48d1e8..652c902 100644 --- a/rvalue.h +++ b/rvalue.h @@ -25,6 +25,7 @@ * 2008-11-30 initial version (andrei) * 2009-04-28 added string and interger versions for the EQ and DIFF * operators (andrei) + * 2009-05-05 casts operator for int & string (andrei) */ #ifndef _rvalue_h_ @@ -77,6 +78,8 @@ enum rval_expr_op{ RVE_MATCH_OP, /* 2 members, string ~), returns left matches re(right) */ /* avp, pvars a.s.o */ RVE_DEFINED_OP, /* one member, returns is_defined(val) (bool) */ + RVE_INT_OP, /* one member, returns (int)val (int) */ + RVE_STR_OP /* one member, returns (str)val (str) */ };

15 years, 8 months

git:master: core: better config parsing error messages

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 420a756d6bee00d2ad039f68e9689b42eee9240f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=420a756… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 21:04:02 2009 +0200 core: better config parsing error messages - on expression parsing error try to keep the number of parsing error messages low - better if parse error reporting --- cfg.y | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/cfg.y b/cfg.y index 8480434..49608a2 100644 --- a/cfg.y +++ b/cfg.y @@ -1859,16 +1859,18 @@ action: ; if_cmd: IF rval_expr stm { - if (rval_expr_int_check($2)>=0){ + if ($2 && rval_expr_int_check($2)>=0){ warn_ct_rve($2, "if"); - } - $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); + }else + YYERROR; } | IF rval_expr stm ELSE stm { - if (rval_expr_int_check($2)>=0){ + if ($2 && rval_expr_int_check($2)>=0){ warn_ct_rve($2, "if"); - } - $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); + }else + YYERROR; } ; @@ -2263,11 +2265,10 @@ rve_op: PLUS { $$=RVE_PLUS_OP; } */ rval_expr: rval { $$=$1; - /* if ($$==0){ - yyerror("out of memory\n"); - YYABORT; - } - */ + if ($$==0){ + yyerror("out of memory\n"); + YYABORT; + } } | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } | INTCAST rval_expr {$$=mk_rve1(RVE_INT_OP, $2); } @@ -2290,18 +2291,18 @@ rval_expr: rval { $$=$1; | rve_un_op %prec NOT error { $$=0; yyerror("bad expression"); } | INTCAST error { $$=0; yyerror("bad expression"); } | STRCAST error { $$=0; yyerror("bad expression"); } - | rval_expr PLUS error { yyerror("bad expression"); } - | rval_expr MINUS error { yyerror("bad expression"); } - | rval_expr STAR error { yyerror("bad expression"); } - | rval_expr SLASH error { yyerror("bad expression"); } - | rval_expr BIN_OR error { yyerror("bad expression"); } - | rval_expr BIN_AND error { yyerror("bad expression"); } + | rval_expr PLUS error { $$=0; yyerror("bad expression"); } + | rval_expr MINUS error { $$=0; yyerror("bad expression"); } + | rval_expr STAR error { $$=0; yyerror("bad expression"); } + | rval_expr SLASH error { $$=0; yyerror("bad expression"); } + | rval_expr BIN_OR error { $$=0; yyerror("bad expression"); } + | rval_expr BIN_AND error { $$=0; yyerror("bad expression"); } | rval_expr rve_cmpop %prec GT error - { yyerror("bad expression"); } + { $$=0; yyerror("bad expression"); } | rval_expr rve_equalop %prec EQUAL_T error - { yyerror("bad expression"); } - | rval_expr LOG_AND error { yyerror("bad expression"); } - | rval_expr LOG_OR error { yyerror("bad expression"); } + { $$=0; yyerror("bad expression"); } + | rval_expr LOG_AND error { $$=0; yyerror("bad expression"); } + | rval_expr LOG_OR error { $$=0; yyerror("bad expression"); } | STRLEN LPAREN error RPAREN { $$=0; yyerror("bad expression"); } | STREMPTY LPAREN error RPAREN { $$=0; yyerror("bad expression"); } | DEFINED error { $$=0; yyerror("bad expression"); } @@ -2915,6 +2916,8 @@ static struct rval_expr* mk_rve1(enum rval_expr_op op, struct rval_expr* rve1) yyerror_at(&rve1->fpos, "bad expression: type mismatch" " (%s instead of %s)", rval_type_name(bad_t), rval_type_name(exp_t)); + rve_destroy(ret); + ret=0; } return ret; } @@ -2947,6 +2950,8 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, bad_rve->fpos.s_line, bad_rve->fpos.s_col); else yyerror("BUG: unexpected null \"bad\" expression\n"); + rve_destroy(ret); + ret=0; } return ret; }

15 years, 8 months

git:master: core expr eval: string == fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: dae8ea836d838279dcb5be69c0e1eec7e9409129 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dae8ea8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 19:17:12 2009 +0200 core expr eval: string == fix - fixed typo which made == the same as != for strings - minor optimizations debugging messages fixes --- rvalue.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rvalue.c b/rvalue.c index 46dd330..5bc7ca8 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2792,6 +2792,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) enum rval_expr_op op; struct cfg_pos pos; int right; /* debugging msg */ + int dbg; /* debugging msg on/off */ /* helper macro: replace in-place a <ctype> type rve with v (another rve). * if type_of(v)== <ctype> => rve:=*v (copy v contents into rve and free v) @@ -2827,6 +2828,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) rv=0; ret=0; right=0; + dbg=1; if (rve_is_constant(rve->right.rve)){ ct_rve=rve->right.rve; @@ -2967,7 +2969,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) break; } /* debugging messages */ - if (ret==1){ + if (ret==1 && dbg){ if (right){ if (rve->op==RVE_RVAL_OP){ if (rve->left.rval.type==RV_INT) @@ -3062,11 +3064,13 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) rve->left.rve=v_rve; rve->right.rve=0; ret=1; - DBG("FIXUP RVE: (%d,%d-%d,%d) optimized" + if (dbg) + DBG("FIXUP RVE: (%d,%d-%d,%d) optimized" " op%d($v, \"\") -> strempty($v)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col, op); + dbg=0; } break; default: @@ -3078,7 +3082,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) can be determined only at runtime => we cannot optimize */ /* debugging messages */ - if (ret==1){ + if (ret==1 && dbg){ if (right){ if (rve->op==RVE_RVAL_OP){ if (rve->left.rval.type==RV_STR) @@ -3259,12 +3263,11 @@ static int rve_optimize(struct rval_expr* rve) l_type=rve_guess_type(rve->left.rve); if (l_type==RV_INT){ rve->op=(rve->op==RVE_EQ_OP)?RVE_IEQ_OP:RVE_IDIFF_OP; - DBG("FIXUP RVE (%d,%d-%d,%d): changed ==/!= into interger" + DBG("FIXUP RVE (%d,%d-%d,%d): changed ==/!= into integer" " ==/!=\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); }else if (l_type==RV_STR){ - rve->op=RVE_CONCAT_OP; rve->op=(rve->op==RVE_EQ_OP)?RVE_STREQ_OP:RVE_STRDIFF_OP; DBG("FIXUP RVE (%d,%d-%d,%d): changed ==/!= into string" " ==/!=\n",

15 years, 8 months

New wiki pages

by Jan Janak

Hello, Before the merge we started working on the admin's guide and the reference manual to SER. I have migrated what we had to our shared wiki and I'll eventually update the text for use with the sip-router project. Some pages that might be useful for k. folks are: http://sip-router.org/wiki/ref_manual/transport/tls http://sip-router.org/wiki/ref_manual/selects http://sip-router.org/wiki/ref_manual/timers Jan.

15 years, 8 months

git:master: core expr. eval: fix fixup/optimization bug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c1111cb2ca9f5782c06158c8d57884ef65dfef38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1111cb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 22:23:59 2009 +0200 core expr. eval: fix fixup/optimization bug In some cases some ref'ed rvals were replaced in-place, messing up the refcnt. --- rvalue.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rvalue.c b/rvalue.c index 976945a..c332173 100644 --- a/rvalue.c +++ b/rvalue.c @@ -3002,7 +3002,7 @@ static int rve_optimize(struct rval_expr* rve) if (rve->op == RVE_RVAL_OP) /* if rval, nothing to do */ return 0; if (rve_is_constant(rve)){ - if ((rv=rval_expr_eval(0, 0, rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, rve))==0){ ERR("optimization failure, bad expression\n"); goto error; } @@ -3035,7 +3035,7 @@ static int rve_optimize(struct rval_expr* rve) } /* $v - a => $v + (-a) (easier to optimize)*/ if ((rve->op==RVE_MINUS_OP) && (rve_is_constant(rve->right.rve))){ - if ((rv=rval_expr_eval(0, 0, rve->right.rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, rve->right.rve))==0){ ERR("optimization failure, bad expression\n"); goto error; } @@ -3114,7 +3114,7 @@ static int rve_optimize(struct rval_expr* rve) " +(+($v, a), b) when typeof(a)==INT\n"); return 0; } - if ((rv=rval_expr_eval(0, 0, &tmp_rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, &tmp_rve))==0){ ERR("optimization failure, bad expression\n"); goto error; } @@ -3146,7 +3146,7 @@ static int rve_optimize(struct rval_expr* rve) cases are caught by rve_op_is_commutative() (in this case type will be typeof(a)) => ok only if typeof(a) is int) */ - if ((rv=rval_expr_eval(0, 0, &tmp_rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, &tmp_rve))==0){ ERR("optimization failure, bad expression\n"); goto error; } @@ -3188,7 +3188,7 @@ static int rve_optimize(struct rval_expr* rve) cases are caught by rve_op_is_commutative() (in this case type will be typeof(a)) => ok only if typeof(a) is int) */ - if ((rv=rval_expr_eval(0, 0, &tmp_rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, &tmp_rve))==0){ ERR("optimization failure, bad expression\n"); goto error; } @@ -3224,7 +3224,7 @@ static int rve_optimize(struct rval_expr* rve) " +(a, +(b, $v)) when typeof(a)!=typeof(b)\n"); return 0; } - if ((rv=rval_expr_eval(0, 0, &tmp_rve))==0){ + if ((rv=rval_expr_eval_new(0, 0, &tmp_rve))==0){ ERR("optimization failure, bad expression\n"); goto error; }

15 years, 8 months

git:master: core expr. eval: support for =~

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bd5099b65baa2e57afa299e8fc6a5f758763d650 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd5099b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 21:09:23 2009 +0200 core expr. eval: support for =~ The match regular expression operator (=~) is now supported in rval_exprs. --- cfg.y | 1 + rvalue.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- rvalue.h | 9 +++ 3 files changed, 229 insertions(+), 16 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd5…

15 years, 8 months

git:master: core script engine: if switched to rval_expr

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8637f3408456dcc4e2df2cf6b2530cc7f1588042 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8637f34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 21:58:40 2009 +0200 core script engine: if switched to rval_expr - switched if to use directly rval_expr - warn on startup if "if" expression is constant - fail to start if "if" expression evaluates to non-int --- action.c | 23 +++++++-------------- cfg.y | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- route.c | 42 +++++++++++++++++++++++++++++++++------ 3 files changed, 104 insertions(+), 26 deletions(-) diff --git a/action.c b/action.c index ffc0051..f99079a 100644 --- a/action.c +++ b/action.c @@ -49,6 +49,7 @@ * 2008-11-18 support for variable parameter module functions (andrei) * 2008-12-03 use lvalues/rvalues for assignments (andrei) * 2008-12-17 added UDP_MTU_TRY_PROTO_T (andrei) + * 2009-05-04 switched IF_T to rval_expr (andrei) */ @@ -813,21 +814,14 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; break; case IF_T: - /* if null expr => ignore if? */ - if ((a->val[0].type==EXPR_ST)&&a->val[0].u.data){ - v=eval_expr(h, (struct expr*)a->val[0].u.data, msg); -#if 0 - if (v<0){ - if (v==EXPR_DROP){ /* hack to quit on DROP*/ - ret=0; - break; - }else{ - LOG(L_WARN,"WARNING: do_action:" - "error in expression\n"); - } + rve=(struct rval_expr*)a->val[0].u.data; + if (unlikely(rval_expr_eval_int(h, msg, &v, rve) != 0)){ + ERR("if expression evaluation failed (%d,%d-%d,%d)\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + v=0; /* false */ } -#endif - if (h->run_flags & EXIT_R_F){ + if (unlikely(h->run_flags & EXIT_R_F)){ ret=0; break; } @@ -843,7 +837,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=run_actions(h, (struct action*)a->val[2].u.data, msg); } - } break; case MODULE_T: if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && diff --git a/cfg.y b/cfg.y index 5c0c3f2..21e81a1 100644 --- a/cfg.y +++ b/cfg.y @@ -95,6 +95,7 @@ * NUMBER is now always positive; cleanup (andrei) * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) + * 2009-05-04 switched if to rval_expr (andrei) */ %{ @@ -212,6 +213,8 @@ static struct rval_expr* mk_rve_rval(enum rval_type, void* v); static struct rval_expr* mk_rve1(enum rval_expr_op op, struct rval_expr* rve1); static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, struct rval_expr* rve2); +static int rval_expr_int_check(struct rval_expr *rve); +static int warn_ct_rve(struct rval_expr *rve, char* name); static struct socket_id* mk_listen_id(char*, int, int); static struct name_lst* mk_name_lst(char* name, int flags); static struct socket_id* mk_listen_id2(struct name_lst*, int, int); @@ -520,7 +523,8 @@ static int case_check_default(struct case_stms* stms); /*non-terminals */ -%type <expr> exp exp_elem +/*%type <expr> exp */ +%type <expr> exp_elem %type <intval> intno eint_op eint_op_onsend %type <intval> eip_op eip_op_onsend %type <action> action actions cmd fcmd if_cmd stm /*exp_stm*/ assign_action @@ -1566,7 +1570,7 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; -exp: rval_expr +/*exp: rval_expr { if ($1==0){ yyerror("invalid expression"); @@ -1581,6 +1585,7 @@ exp: rval_expr $$=mk_elem(NO_OP, RVEXP_O, $1, 0, 0); } ; +*/ /* exp elem operators */ equalop: @@ -1852,8 +1857,18 @@ action: | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } ; if_cmd: - IF exp stm { $$=mk_action( IF_T, 3, EXPR_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); } - | IF exp stm ELSE stm { $$=mk_action( IF_T, 3, EXPR_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); } + IF rval_expr stm { + if (rval_expr_int_check($2)==0){ + warn_ct_rve($2, "if"); + } + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); + } + | IF rval_expr stm ELSE stm { + if (rval_expr_int_check($2)==0){ + warn_ct_rve($2, "if"); + } + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); + } ; ct_rval: rval_expr { @@ -2930,6 +2945,48 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, } +/** check if the expression is an int. + * if the expression does not evaluate to an int return -1 and + * log an error. + * @return 0 on success, -1 on error */ +static int rval_expr_int_check(struct rval_expr *rve) +{ + struct rval_expr* bad_rve; + enum rval_type type, bad_t, exp_t; + + if (rve==0){ + yyerror("invalid expression"); + return -1; + }else if (!rve_check_type(&type, rve, &bad_rve, &bad_t ,&exp_t)){ + if (bad_rve) + yyerror_at(&rve->fpos, "bad expression: type mismatch:" + " %s instead of %s at (%d,%d)", + rval_type_name(bad_t), rval_type_name(exp_t), + bad_rve->fpos.s_line, bad_rve->fpos.s_col); + else + yyerror("BUG: unexpected null \"bad\" expression\n"); + return -1; + }else if (type!=RV_INT && type!=RV_NONE){ + yyerror_at(&rve->fpos, "invalid expression type, int expected\n"); + return -1; + } + return 0; +} + + +/** warn if the expression is constant. + * @return 0 on success (no warning), 1 when warning */ +static int warn_ct_rve(struct rval_expr *rve, char* name) +{ + if (rve && rve_is_constant(rve)){ + warn_at(&rve->fpos, "constant value in %s%s", + name?name:"expression", name?"(...)":""); + return 1; + } + return 0; +} + + static struct name_lst* mk_name_lst(char* host, int flags) { struct name_lst* l; diff --git a/route.c b/route.c index 7b831e2..4ba116a 100644 --- a/route.c +++ b/route.c @@ -49,6 +49,7 @@ * 2008-04-23 errors are treated as false during expression evaluation * unless the operator is DIFF_OP (Miklos) * 2008-12-03 fixups for rvalues in assignments (andrei) + * 2009-05-04 switched IF_T to rval_expr (andrei) */ @@ -674,24 +675,50 @@ int fix_actions(struct action* a) } break; case IF_T: - if (t->val[0].type!=EXPR_ST){ + if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for if (should be expr)\n", + "%d for if (should be rval expr)\n", t->val[0].type); return E_BUG; - }else if( (t->val[1].type!=ACTIONS_ST)&&(t->val[1].type!=NOSUBTYPE) ){ + }else if( (t->val[1].type!=ACTIONS_ST) && + (t->val[1].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {...} (should be action)\n", t->val[1].type); return E_BUG; - }else if( (t->val[2].type!=ACTIONS_ST)&&(t->val[2].type!=NOSUBTYPE) ){ + }else if( (t->val[2].type!=ACTIONS_ST) && + (t->val[2].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {} else{...}(should be action)\n", t->val[2].type); return E_BUG; } - if (t->val[0].u.data){ - if ((ret=fix_expr((struct expr*)t->val[0].u.data))<0) + rve=(struct rval_expr*)t->val[0].u.data; + if (rve){ + err_rve=0; + if (!rve_check_type(&rve_type, rve, &err_rve, + &err_type, &expected_type)){ + if (err_rve) + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): subexpression (%d,%d) has type" + " %s, but %s is expected\n", + rve->fpos.s_line, rve->fpos.s_col, + err_rve->fpos.s_line, err_rve->fpos.s_col, + rval_type_name(err_type), + rval_type_name(expected_type) ); + else + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): type mismatch?", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if (rve_type!=RV_INT && rve_type!=RV_NONE){ + LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" + " bad type, integer expected\n", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if ((ret=fix_rval_expr((void**)&rve))<0) return ret; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ @@ -699,7 +726,8 @@ int fix_actions(struct action* a) return ret; } if ( (t->val[2].type==ACTIONS_ST)&&(t->val[2].u.data) ){ - if ((ret=fix_actions((struct action*)t->val[2].u.data))<0) + if ((ret=fix_actions((struct action*)t->val[2].u.data)) + <0) return ret; } break;

15 years, 8 months

git:master: core expr. eval: added bug catcher

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 087be8daf0bc279450732973618cec7fa719efde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=087be8d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 22:02:49 2009 +0200 core expr. eval: added bug catcher Added code for catching an easy to overlook bug (replacing in-line a referenced rval during optimizing). --- rvalue.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rvalue.c b/rvalue.c index 7bfff5c..976945a 100644 --- a/rvalue.c +++ b/rvalue.c @@ -47,6 +47,8 @@ #include "rvalue.h" +#include <stdlib.h> /* abort() */ + /* minimum size alloc'ed for STR RVs (to accomodate * strops without reallocs) */ #define RV_STR_EXTRA 80 @@ -2577,6 +2579,13 @@ static int rve_replace_with_val(struct rval_expr* rve, enum rval_type type, if (rve_op_unary(rve->op)==0) rve_destroy(rve->right.rve); }else{ + if (rve->left.rval.refcnt!=1){ + BUG("trying to replace a referenced rval! (refcnt=%d)\n", + rve->left.rval.refcnt); + /* try to recover */ + refcnt=rve->left.rval.refcnt; + abort(); /* find bugs quicker -- andrei */ + } rval_destroy(&rve->left.rval); } rval_init(&rve->left.rval, type, v, flags);

15 years, 8 months

git:master: Merge commit 'origin/andrei/type_conversion'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c5e6955692fb6f7803fa7550a92a7e727cabf31f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e6955… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 23:38:12 2009 +0200 Merge commit 'origin/andrei/type_conversion' * commit 'origin/andrei/type_conversion': script parsing: fix bug in expression error checking core expr eval: various fixes news: update (new operators, expr. eval behaviour a.s.o.) core: new script operators: eq, ne, ieq, ine core expr eval: fix assoc., commut and 0 adding for +, == core expr eval: minor ==/!= optimization core expr eval: internal == & != int and str only versions core expr eval: special handling for undef cmp expr core eval expr: cache undefined results too core expr eval: str automatic conversion to int core expr eval: undef conversion to int and str core expr eval: defined @select ---

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev