sr-dev

sr-dev@lists.kamailio.org

17 participants
44126 discussions

git:andrei/script_vars: script parsing: support for breaking strings

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 070afdb2165a076fdaa3bded72a1ca5b6c8c18f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=070afdb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 11 19:39:40 2008 +0100 script parsing: support for breaking strings - strings can now be split 'C' style (e.g. "foo_bar" is equivalent with "foo" "_" "bar"). Whitespace and new lines are allowed in-between. --- cfg.lex | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cfg.lex b/cfg.lex index 319445d..7578837 100644 --- a/cfg.lex +++ b/cfg.lex @@ -76,6 +76,7 @@ * LINGER2, KEEPALIVE, KEEPIDLE, KEEPINTVL, KEEPCNT} (andrei) * 2008-01-24 added CFG_DESCRIPTION used by cfg_var (Miklos) * 2008-11-28 added support for kamailio pvars and avp/pvar guessing (andrei) + * 2008-12-11 added support for "string1" "string2" (andrei) */ @@ -101,6 +102,7 @@ #define AVP_PVAR_S 6 /* avp or pvar */ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ #define PVARID_S 8 /* $foo.bar...*/ + #define STR_BETWEEN_S 9 #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -126,7 +128,8 @@ %} /* start conditions */ -%x STRING1 STRING2 COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P PVARID +%x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P +%x PVARID /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ SER_CFG SER @@ -828,7 +831,7 @@ EAT_ABLE [\ \t\b\r] } /* avp prefix detected -> go to avp mode */ <AVP_PVAR>{AVP_PREF} | -<AVP_PVAR>{ID}{LBRACK} { state = ATTR_S; BEGIN(ATTR); yyless(1); +<AVP_PVAR>{ID}{LBRACK} { state = ATTR_S; BEGIN(ATTR); yyless(1); count(); return ATTR_MARK; } <AVP_PVAR>{ID}{LPAREN} { state = PVAR_P_S; p_nest=1; BEGIN(PVAR_P); yymore(); } @@ -886,12 +889,10 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{TICK} { count(); old_initial = YY_START; old_state = state; state=STRING_S; BEGIN(STRING2); } -<STRING1>{QUOTES} { count(); state=old_state; BEGIN(old_initial); +<STRING1>{QUOTES} { count(); yytext[yyleng-1]=0; yyleng--; addstr(&s_buf, yytext, yyleng); - yylval.strval=s_buf.s; - memset(&s_buf, 0, sizeof(s_buf)); - return STRING; + BEGIN(STR_BETWEEN); } <STRING2>{TICK} { count(); state=old_state; BEGIN(old_initial); yytext[yyleng-1]=0; yyleng--; @@ -917,6 +918,14 @@ EAT_ABLE [\ \t\b\r] <STRING1>\\{CR} { count(); } /* eat escaped CRs */ <STRING1>.|{EAT_ABLE}|{CR} { addchar(&s_buf, *yytext); } +<STR_BETWEEN>{EAT_ABLE}|{CR} { count(); /* eat whitespace */ } +<STR_BETWEEN>{QUOTES} { count(); state=STRING_S; BEGIN(STRING1);} +<STR_BETWEEN>. { yyless(0); + state=old_state; BEGIN(old_initial); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + return STRING; + } <INITIAL,COMMENT>{COM_START} { count(); comment_nest++; state=COMMENT_S; BEGIN(COMMENT); } @@ -946,6 +955,12 @@ EAT_ABLE [\ \t\b\r] <<EOF>> { switch(state){ + case STR_BETWEEN_S: + state=old_state; + BEGIN(old_initial); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + return STRING; case STRING_S: LOG(L_CRIT, "ERROR: cfg. parser: unexpected EOF in" " unclosed string\n");

16 years

git:andrei/script_vars: script engine: more rvalue optimizations

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 0b3512af8f5c42bea2e17de6efce9571e85241f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b3512a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 11 19:30:41 2008 +0100 script engine: more rvalue optimizations - optimize: ($v * a) * b -> $v * (a * b) if '*' is associative (a * $v) * b -> (a * b) * $v if '*' is assoc. and commutative a * ($v * b) -> (a * b) * $v if '*' is assoc. and commutative a * (b * $v) -> (a * b) * $v if '*' is associative where a & b are constants, $v is a var (pvar or avp) and '*' is the operator. - special hacks for optimizing '+' ('+' is a special case because in the current form it can work both with strings and ints which combined with the dynamic typed vars make it very hard to optimize) --- rvalue.c | 400 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 366 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0b3…

16 years

git:andrei/script_vars: script engine: better debugging info

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 5377c1fe88a9010c55cdf2b695a25b340518daf7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5377c1f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 11 19:27:24 2008 +0100 script engine: better debugging info --- route.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/route.c b/route.c index a36483b..4164284 100644 --- a/route.c +++ b/route.c @@ -296,13 +296,14 @@ static int exp_optimize_left(struct expr* exp) { struct rval_expr* rve; struct rvalue* rval; - int old_type, old_op; + int old_ltype, old_rtype, old_op; int ret; ret=0; if (exp->type!=ELEM_T) return 0; - old_type=exp->l_type; + old_ltype=exp->l_type; + old_rtype=exp->r_type; old_op=exp->op; if (exp->l_type==RVEXP_O){ rve=exp->l.param; @@ -385,8 +386,8 @@ static int exp_optimize_left(struct expr* exp) } } if (ret>0) - DBG("left EXP optimized succesfully: %d op %d to %d op %d\n", - old_type, old_op, exp->l_type, exp->op); + DBG("left EXP optimized: op%d(_O%d_, ST%d) => op%d(_O%d_, ST%d)\n", + old_op, old_ltype, old_rtype, exp->op, exp->l_type, exp->r_type); return ret; } @@ -399,13 +400,14 @@ static int exp_optimize_right(struct expr* exp) { struct rval_expr* rve; struct rvalue* rval; - int old_type, old_op; + int old_ltype, old_rtype, old_op; int ret; ret=0; if ((exp->type!=ELEM_T) ||(exp->op==NO_OP)) return 0; - old_type=exp->r_type; + old_ltype=exp->l_type; + old_rtype=exp->r_type; old_op=exp->op; if (exp->r_type==RVE_ST){ rve=exp->r.param; @@ -481,8 +483,8 @@ static int exp_optimize_right(struct expr* exp) } } if (ret>0) - DBG("right EXP optimized succesfully: %d op %d to %d op %d\n", - old_type, old_op, exp->r_type, exp->op); + DBG("right EXP optimized: op%d(O%d, _ST%d_) => op%d(O%d, _ST%d_)\n", + old_op, old_ltype, old_rtype, exp->op, exp->l_type, exp->r_type); return ret; }

16 years

git:andrei/script_vars: script engine: rvalue fixes & cleanup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: ce345a5719642ae13602be76b3fa21285c41073a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce345a5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 10 14:50:36 2008 +0100 script engine: rvalue fixes & cleanup - fixed rval_str_add2() - more functions are now "public" - support for optimization levels --- rvalue.c | 22 +++++++--------------- rvalue.h | 5 +++++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/rvalue.c b/rvalue.c index 8dd5c86..742e576 100644 --- a/rvalue.c +++ b/rvalue.c @@ -1099,12 +1099,11 @@ inline static struct rvalue* rval_str_add2(struct run_act_ctx* h, s2=&rv2->v.s; } /* do the actual copy */ - ret->v.s.len=rv1->v.s.len; - memmove(ret->buf+ret->v.s.len, s2->s, s2->len); + memmove(ret->buf+rv1->v.s.len, s2->s, s2->len); if (s1){ memcpy(ret->buf, s1->s, s1->len); } - ret->v.s.len+=s2->len; + ret->v.s.len=rv1->v.s.len+s2->len; ret->v.s.s[ret->v.s.len]=0; /* cleanup if needed */ if (flags & RV_CNT_ALLOCED_F) @@ -1155,17 +1154,6 @@ error: -/* forward decl. */ -inline static int rval_expr_eval_rvint(struct run_act_ctx* h, - struct sip_msg* msg, - struct rvalue** res_rv, - int* res_i, - struct rval_expr* rve, - struct rval_cache* cache - ); - - - /** evals an integer expr to an int. * * *res=(int)eval(rve) @@ -1276,7 +1264,7 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, * modified only if rv_chg_in_place() returns true. * @result 0 on success, -1 on error, sets *res_rv or *res_i. */ -inline static int rval_expr_eval_rvint(struct run_act_ctx* h, +int rval_expr_eval_rvint( struct run_act_ctx* h, struct sip_msg* msg, struct rvalue** res_rv, int* res_i, @@ -1645,6 +1633,8 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, */ static int rve_can_optimize_int(struct rval_expr* rve) { + if (scr_opt_lev<1) + return 0; if (rve->op == RVE_RVAL_OP) return 0; if (rve->left.rve->op != RVE_RVAL_OP) @@ -1671,6 +1661,8 @@ static int rve_can_optimize_int(struct rval_expr* rve) */ static int rve_can_optimize_str(struct rval_expr* rve) { + if (scr_opt_lev<1) + return 0; if (rve->op == RVE_RVAL_OP) return 0; DBG("rve_can_optimize_str: left %d, right %d\n", diff --git a/rvalue.h b/rvalue.h index 22c0cbc..faa6143 100644 --- a/rvalue.h +++ b/rvalue.h @@ -174,6 +174,11 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, /** evals a rval expr.. */ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, struct rval_expr* rve); +/** evals an integer expr to an int or rvalue. */ +int rval_expr_eval_rvint( struct run_act_ctx* h, struct sip_msg* msg, + struct rvalue** rv_res, int* i_res, + struct rval_expr* rve, struct rval_cache* cache); + /** guess the type of an expression. */ enum rval_type rve_guess_type(struct rval_expr* rve);

16 years

git:andrei/script_vars: core: new command line option (debugging)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 5219ecb708daba13749ec8d242129a117449ba9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5219ecb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 10 14:52:12 2008 +0100 core: new command line option (debugging) - new command line option controlling the script optimization level: -O (e.g. -O0 - no optimizations). By default the optimization level is set to maximum (2 for now). - renamed sctp max process number command line option from -O to -Q --- main.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 86c7a2f..802e1f0 100644 --- a/main.c +++ b/main.c @@ -222,7 +222,7 @@ Options:\n\ #endif #ifdef USE_SCTP " -S disable sctp\n\ - -O Number of sctp child processes (default: equal to `-n')\n" + -Q Number of sctp child processes (default: equal to `-n')\n" #endif /* USE_SCTP */ " -V Version number\n\ -h This help message\n\ @@ -234,7 +234,8 @@ Options:\n\ -u uid Change uid \n\ -g gid Change gid \n\ -P file Create a pid file\n\ - -G file Create a pgid file\n" + -G file Create a pgid file\n\ + -O nr Script optimization level (debugging option)\n" #ifdef STATS " -s file File to which statistics is dumped (disabled otherwise)\n" #endif @@ -1502,7 +1503,7 @@ int main(int argc, char** argv) "DBG_MSG_QA enabled, ser may exit abruptly\n"); #endif - options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SO:" + options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:" #ifdef STATS "s:" #endif @@ -1572,6 +1573,14 @@ int main(int argc, char** argv) case 'E': log_stderr=1; break; + case 'O': + scr_opt_lev=strtol(optarg, &tmp, 10); + if (tmp &&(*tmp)){ + fprintf(stderr, "bad optimization level: -O %s\n", + optarg); + goto error; + }; + break; case 'b': case 'l': case 'n': @@ -1589,7 +1598,7 @@ int main(int argc, char** argv) case 'P': case 'G': case 'S': - case 'O': + case 'Q': case 's': break; case '?': @@ -1676,6 +1685,7 @@ try_again: case 'd': case 'V': case 'h': + case 'O': break; case 'E': log_stderr=1; // use in both getopt switches @@ -1762,7 +1772,7 @@ try_again: fprintf(stderr,"WARNING: sctp support not compiled in\n"); #endif break; - case 'O': + case 'Q': #ifdef USE_SCTP sctp_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){

16 years

git:andrei/script_vars: script parsing: fixed wrong operators in expr.

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: bf7485ba70ce40a370e4fd0b66cba358b790053e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf7485b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 10 14:42:08 2008 +0100 script parsing: fixed wrong operators in expr. --- cfg.y | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/cfg.y b/cfg.y index 93c1d06..a17ad4b 100644 --- a/cfg.y +++ b/cfg.y @@ -497,7 +497,7 @@ static void free_socket_id_lst(struct socket_id* i); %type <sockid> phostport %type <sockid> listen_phostport %type <intval> proto port -%type <intval> equalop strop cmpop +%type <intval> equalop strop cmpop rve_cmpop rve_equalop %type <intval> uri_type %type <attr> attr_id %type <attr> attr_id_num_idx @@ -1500,20 +1500,35 @@ exp: rval_expr } ; +/* exp elem operators */ equalop: + EQUAL_T {$$=EQUAL_OP; } + | DIFF {$$=DIFF_OP; } + ; +cmpop: + GT {$$=GT_OP; } + | LT {$$=LT_OP; } + | GTE {$$=GTE_OP; } + | LTE {$$=LTE_OP; } + ; +strop: + equalop {$$=$1; } + | MATCH {$$=MATCH_OP; } + ; + + +/* rve expr. operators */ +rve_equalop: EQUAL_T {$$=RVE_EQ_OP; } | DIFF {$$=RVE_DIFF_OP; } ; -cmpop: +rve_cmpop: GT {$$=RVE_GT_OP; } | LT {$$=RVE_LT_OP; } | GTE {$$=RVE_GTE_OP; } | LTE {$$=RVE_LTE_OP; } ; -strop: - equalop {$$=$1; } - | MATCH {$$=MATCH_OP; } - ; + /* boolean expression uri operands */ @@ -2030,8 +2045,9 @@ rval_expr: rval { $$=$1; | rval_expr SLASH rval_expr {$$=mk_rval_expr2(RVE_DIV_OP, $1, $3); } | rval_expr BIN_OR rval_expr {$$=mk_rval_expr2(RVE_BOR_OP, $1, $3); } | rval_expr BIN_AND rval_expr {$$=mk_rval_expr2(RVE_BAND_OP, $1, $3);} - | rval_expr cmpop %prec GT rval_expr { $$=mk_rval_expr2( $2, $1, $3);} - | rval_expr equalop %prec EQUAL_T rval_expr + | rval_expr rve_cmpop %prec GT rval_expr + { $$=mk_rval_expr2( $2, $1, $3);} + | rval_expr rve_equalop %prec EQUAL_T rval_expr { $$=mk_rval_expr2( $2, $1, $3);} | rval_expr LOG_AND rval_expr { $$=mk_rval_expr2(RVE_LAND_OP, $1, $3);}

16 years

git:andrei/script_vars: script engine: expression optimizations

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 10bb5547fc6718e3d7684be0cba6f638b56a89e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10bb554… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 10 14:43:58 2008 +0100 script engine: expression optimizations - optimizations for logical expressions ( exp(rval(v)) -> exp(v), exp_elem(x, rval(v)) -> exp_elem(x, v) ) - comp_rve() fix --- route.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- route.h | 2 + 2 files changed, 229 insertions(+), 1 deletions(-) diff --git a/route.c b/route.c index f098b0f..a36483b 100644 --- a/route.c +++ b/route.c @@ -93,6 +93,12 @@ struct route_list branch_rt; struct route_list onsend_rt; +/** script optimization level, useful for debugging. + * 0 - no optimization + * 1 - optimize rval expressions + * 2 - optimize expr elems + */ +int scr_opt_lev=9; inline static void destroy_rlist(struct route_list* rt) { @@ -283,6 +289,205 @@ int route_lookup(struct route_list* rt, char* name) int fix_actions(struct action* a); /*fwd declaration*/ +/** optimize the left side of a struct expr. + * @return 1 if optimized, 0 if not and -1 on error + */ +static int exp_optimize_left(struct expr* exp) +{ + struct rval_expr* rve; + struct rvalue* rval; + int old_type, old_op; + int ret; + + ret=0; + if (exp->type!=ELEM_T) + return 0; + old_type=exp->l_type; + old_op=exp->op; + if (exp->l_type==RVEXP_O){ + rve=exp->l.param; + /* rve should be previously fixed/optimized */ + /* optimize exp (rval(val)) -> exp(val) */ + if (rve->op==RVE_RVAL_OP){ + rval=&rve->left.rval; + switch(rval->type){ + case RV_INT: + if (exp->op==NO_OP){ + exp->l_type=NUMBER_O; + exp->l.param=0; + exp->r_type=NUMBER_ST; + exp->r.numval=rval->v.l; + rval_destroy(rval); + pkg_free(rve); + ret=1; + } + break; + case RV_STR: + /* string evaluated in expression context - not + supported */ + break; + case RV_BEXPR: + if (exp->op==NO_OP){ + /* replace the current expr. */ + *exp=*(rval->v.bexpr); + rval_destroy(rval); + pkg_free(rve); + ret=1; + }; + break; + case RV_ACTION_ST: + if (exp->op==NO_OP){ + exp->l_type=ACTION_O; + exp->l.param=0; + exp->r_type=ACTION_ST; + exp->r.param=rval->v.action; + rval_destroy(rval); + pkg_free(rve); + ret=1; + } + break; + case RV_SEL: + exp->l.select=pkg_malloc(sizeof(*exp->l.select)); + if (exp->l.select){ + exp->l_type=SELECT_O; + *exp->l.select=rval->v.sel; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_AVP: + exp->l.attr=pkg_malloc(sizeof(*exp->l.attr)); + if (exp->l.attr){ + exp->l_type=AVP_O; + *exp->l.attr=rval->v.avps; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_PVAR: + exp->l.param=pkg_malloc(sizeof(pv_spec_t)); + if (exp->l.param){ + exp->l_type=PVAR_O; + *((pv_spec_t*)exp->l.param)=rval->v.pvs; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_NONE: + break; + } + } + } + if (ret>0) + DBG("left EXP optimized succesfully: %d op %d to %d op %d\n", + old_type, old_op, exp->l_type, exp->op); + return ret; +} + + + +/** optimize the left side of a struct expr. + * @return 1 if optimized, 0 if not and -1 on error + */ +static int exp_optimize_right(struct expr* exp) +{ + struct rval_expr* rve; + struct rvalue* rval; + int old_type, old_op; + int ret; + + ret=0; + if ((exp->type!=ELEM_T) ||(exp->op==NO_OP)) + return 0; + old_type=exp->r_type; + old_op=exp->op; + if (exp->r_type==RVE_ST){ + rve=exp->r.param; + /* rve should be previously fixed/optimized */ + /* optimize exp (rval(val)) -> exp(val) */ + if (rve->op==RVE_RVAL_OP){ + rval=&rve->left.rval; + switch(rval->type){ + case RV_INT: + exp->r_type=NUMBER_ST; + exp->r.numval=rval->v.l; + rval_destroy(rval); + pkg_free(rve); + ret=1; + break; + case RV_STR: + exp->r.str.s=pkg_malloc(rval->v.s.len+1); + if (exp->r.str.s){ + exp->r.str.len=rval->v.s.len; + memcpy(exp->r.str.s, rval->v.s.s, rval->v.s.len); + exp->r_type=STRING_ST; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_BEXPR: + /* cannot be optimized further, is an exp_elem + which is not constant */ + break; + case RV_ACTION_ST: + /* cannot be optimized further, is not constant and + eval_elem() does not support ACTION_ST for op!=NO_OP*/ + break; + case RV_SEL: + exp->r.select=pkg_malloc(sizeof(*exp->l.select)); + if (exp->r.select){ + exp->r_type=SELECT_ST; + *exp->r.select=rval->v.sel; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_AVP: + exp->r.attr=pkg_malloc(sizeof(*exp->l.attr)); + if (exp->r.attr){ + exp->r_type=AVP_ST; + *exp->r.attr=rval->v.avps; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_PVAR: + exp->r.param=pkg_malloc(sizeof(pv_spec_t)); + if (exp->r.param){ + exp->r_type=PVAR_ST; + *((pv_spec_t*)exp->r.param)=rval->v.pvs; + rval_destroy(rval); + pkg_free(rve); + ret=1; + }else + ret=-1; + break; + case RV_NONE: + ret=-1; + break; + } + } + } + if (ret>0) + DBG("right EXP optimized succesfully: %d op %d to %d op %d\n", + old_type, old_op, exp->r_type, exp->op); + return ret; +} + + + /* traverses an expr tree and compiles the REs where necessary) * returns: 0 for ok, <0 if errors */ int fix_expr(struct expr* exp) @@ -382,12 +587,16 @@ int fix_expr(struct expr* exp) ERR("Unable to fix left rval expression\n"); return ret; } + if (scr_opt_lev>=2) + exp_optimize_left(exp); } if (exp->r_type==RVE_ST){ if ((ret=fix_rval_expr(&exp->r.param))<0){ ERR("Unable to fix right rval expression\n"); return ret; } + if (scr_opt_lev>=2) + exp_optimize_right(exp); } /* PVAR don't need fixing */ ret=0; @@ -934,11 +1143,28 @@ inline static int comp_rve(int op, struct rval_expr* rve, int rtype, struct run_act_ctx* h) { int i; + struct rvalue* rv; + struct rvalue* rv1; + struct rval_cache c1; - if (unlikely(rval_expr_eval_int(h, msg, &i, rve)<0)){ + rval_cache_init(&c1); + if (unlikely(rval_expr_eval_rvint(h, msg, &rv, &i, rve, &c1)<0)){ ERR("failure evaluating expression: bad type\n"); i=0; /* false */ + goto int_expr; + } + if (unlikely(rv)){ + /* no int => str */ + rv1=rval_convert(h, msg, RV_STR, rv, &c1); + i=comp_str(op, &rv1->v.s, rtype, r, msg, h); + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + return i; } + /* expr evaluated to int */ +int_expr: + rval_cache_clean(&c1); if (op==NO_OP) return !(!i); /* transform it into { 0, 1 } */ return comp_num(op, i, rtype, r, msg, h); diff --git a/route.h b/route.h index 31c9785..732d4a9 100644 --- a/route.h +++ b/route.h @@ -59,6 +59,8 @@ extern struct route_list failure_rt; extern struct route_list branch_rt; extern struct route_list onsend_rt; +/* script optimization level */ +extern int scr_opt_lev; int init_routes(); void destroy_routes();

16 years

git:daniel/pv: fix pv&t lookup due to signness

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 0f09145b733ba72c2b0cd5747bf5f2b404bed6fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f09145… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 9 18:12:53 2008 +0200 fix pv&t lookup due to signness - added missing functions from K --- pvapi.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- ut.h | 21 ++++++++++++++++ 2 files changed, 95 insertions(+), 6 deletions(-) diff --git a/pvapi.c b/pvapi.c index 816bbab..9bb1de4 100644 --- a/pvapi.c +++ b/pvapi.c @@ -38,11 +38,11 @@ #include "pvar.h" #define is_in_str(p, in) (p<in->s+in->len && *p) +#define core_hash(in, a, b) get_hash1_raw((in)->s, (in)->len) #define PV_TABLE_SIZE 16 #define TR_TABLE_SIZE 4 -#define core_hash(in, a, b) get_hash1_raw((in)->s, (in)->len); void tr_destroy(trans_t *t); void tr_free(trans_t *t); @@ -57,6 +57,7 @@ typedef struct _pv_item static pv_item_t* _pv_table[PV_TABLE_SIZE]; static int _pv_table_set = 0; + /** * */ @@ -88,7 +89,7 @@ int pv_table_add(pv_export_t *e) pv_item_t *pvj = NULL; pv_item_t *pvn = NULL; int found; - int pvid; + unsigned int pvid; if(e==NULL || e->name.s==NULL || e->getf==NULL || e->type==PVT_NONE) { @@ -239,8 +240,7 @@ int pv_get_sintval(struct sip_msg *msg, pv_param_t *param, if(res==NULL) return -1; - // ch = sint2str(sival, &l); - ch = int2str(sival, &l); + ch = sint2str(sival, &l); res->rs.s = ch; res->rs.len = l; @@ -822,7 +822,8 @@ int pv_get_avp_name(struct sip_msg* msg, pv_param_p ip, int_str *avp_name, *name_type |= AVP_NAME_STR; } else { avp_name->n = ip->pvn.u.isname.name.n; - *name_type = 0; // &= AVP_SCRIPT_MASK; + /* *name_type &= AVP_SCRIPT_MASK; */ + *name_type = 0; } return 0; } @@ -978,6 +979,73 @@ done: return 0; } +/** + * + */ +pvname_list_t* parse_pvname_list(str *in, unsigned int type) +{ + pvname_list_t* head = NULL; + pvname_list_t* al = NULL; + pvname_list_t* last = NULL; + char *p; + pv_spec_t spec; + str s; + + if(in==NULL || in->s==NULL) + { + LM_ERR("bad parameters\n"); + return NULL; + } + + p = in->s; + while(is_in_str(p, in)) + { + while(is_in_str(p, in) && (*p==' '||*p=='\t'||*p==','||*p==';')) + p++; + if(!is_in_str(p, in)) + { + if(head==NULL) + LM_ERR("wrong item name list [%.*s]\n", in->len, in->s); + return head; + } + s.s=p; + s.len = in->s+in->len-p; + p = pv_parse_spec(&s, &spec); + if(p==NULL || (type && spec.type!=type)) + { + LM_ERR("wrong item name list [%.*s]!\n", in->len, in->s); + goto error; + } + al = (pvname_list_t*)pkg_malloc(sizeof(pvname_list_t)); + if(al==NULL) + { + LM_ERR("no more memory!\n"); + goto error; + } + memset(al, 0, sizeof(pvname_list_t)); + memcpy(&al->sname, &spec, sizeof(pv_spec_t)); + + if(last==NULL) + { + head = al; + last = al; + } else { + last->next = al; + last = al; + } + } + + return head; + +error: + while(head) + { + al = head; + head=head->next; + pkg_free(al); + } + return NULL; +} /** * @@ -1259,7 +1327,7 @@ int tr_table_add(tr_export_t *e) tr_item_t *trj = NULL; tr_item_t *trn = NULL; int found; - int trid; + unsigned int trid; if(e==NULL || e->tclass.s==NULL) { diff --git a/ut.h b/ut.h index 45cf559..db2c1f5 100644 --- a/ut.h +++ b/ut.h @@ -297,6 +297,27 @@ static inline char* int2str(unsigned int l, int* len) return &r[i+1]; } +/* Signed INTeger-TO-STRing: convers a long to a string + * returns a pointer to a static buffer containing l in asciiz & sets len */ +static inline char* sint2str(long l, int* len) +{ + int sign; + char *p; + + sign = 0; + if(l<0) { + sign = 1; + l = -l; + } + p = int2str((unsigned long)l, len); + if(sign) { + *(--p) = '-'; + if (len) (*len)++; + } + return p; +} + + #define USHORT2SBUF_MAX_LEN 5 /* 65535*/

16 years

git:andrei/script_vars: script engine: more operators supported

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 68e5b7873ebc060f57afce1ddc4be7de4abfc192 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68e5b78… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 9 16:13:03 2008 +0100 script engine: more operators supported - support for more operators - more helper functions - small fixes --- rvalue.c | 517 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- rvalue.h | 29 +++- 2 files changed, 504 insertions(+), 42 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=68e…

16 years

git:andrei/script_vars: script parsing: rvalues instead of expr.

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 80ae84b96ff8938df0593f60b114ccedec9b8a6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80ae84b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 9 16:18:49 2008 +0100 script parsing: rvalues instead of expr. - expressions are now evaluated in terms of rvalues - more operators - operator precedence - cleanup - NUMBER is now always positive (added intno which can be negative) --- cfg.lex | 2 +- cfg.y | 526 +++++++++++++++++++++++++++------------------------------------ 2 files changed, 224 insertions(+), 304 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=80a…

16 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev