sr-dev

sr-dev@lists.kamailio.org

15 participants
42810 discussions

git:andrei/script_vars: pvars: silent version for pv_parse_spec

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 15ec6f3c26b83d6123e228d93181e92d1ba1bbc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15ec6f3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 12 14:20:55 2008 +0100 pvars: silent version for pv_parse_spec - added a silent version for pv_parse_spec (pv_parse_spec2()), so that the script parsing fallback from pvars to avps for ambiguous identifiers can happen without a ton of error messages --- cfg.y | 3 +- pvapi.c | 87 ++++++++++++++++++++++++++++++++++++++------------------------ pvar.h | 3 +- 3 files changed, 57 insertions(+), 36 deletions(-) diff --git a/cfg.y b/cfg.y index 6bd5b43..ce6e130 100644 --- a/cfg.y +++ b/cfg.y @@ -1913,6 +1913,7 @@ pvar: PVAR { if (pv_parse_spec(&s_tmp, pv_spec)==0){ yyerror("unknown script pseudo variable"); pkg_free(pv_spec); + pv_spec=0; YYABORT; } $$=pv_spec; @@ -1927,7 +1928,7 @@ avp_pvar: AVP_OR_PVAR { } memset(lval_tmp, 0, sizeof(*lval_tmp)); s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); - if (pv_parse_spec(&s_tmp, &lval_tmp->lv.pvs)==0){ + if (pv_parse_spec2(&s_tmp, &lval_tmp->lv.pvs, 1)==0){ /* not a pvar, try avps */ lval_tmp->lv.avps.type|= AVP_NAME_STR; lval_tmp->lv.avps.name.s.s = s_tmp.s+1; diff --git a/pvapi.c b/pvapi.c index f3d7b58..77c2de2 100644 --- a/pvapi.c +++ b/pvapi.c @@ -352,7 +352,7 @@ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) return NULL; } -char* pv_parse_spec(str *in, pv_spec_p e) +char* pv_parse_spec2(str *in, pv_spec_p e, int silent) { char *p; str s; @@ -364,7 +364,7 @@ char* pv_parse_spec(str *in, pv_spec_p e) if(in==NULL || in->s==NULL || e==NULL || *in->s!=PV_MARKER) { - LM_ERR("bad parameters\n"); + if (!silent) LM_ERR("bad parameters\n"); return NULL; } @@ -411,8 +411,9 @@ char* pv_parse_spec(str *in, pv_spec_p e) p++; pvstate = 4; } else { - LM_ERR("invalid char '%c' in [%.*s] (%d)\n", *p, in->len, in->s, - pvstate); + if (!silent) + LM_ERR("invalid char '%c' in [%.*s] (%d)\n", + *p, in->len, in->s, pvstate); goto error; } } else { @@ -433,21 +434,24 @@ char* pv_parse_spec(str *in, pv_spec_p e) done_inm: if((pte = pv_lookup_spec_name(&pvname, e))==NULL) { - LM_ERR("error searching pvar \"%.*s\"\n", pvname.len, pvname.s); + if (!silent) + LM_ERR("error searching pvar \"%.*s\"\n", pvname.len, pvname.s); goto error; } if(pte->parse_name!=NULL && pvstate!=2 && pvstate!=5) { - LM_ERR("pvar \"%.*s\" expects an inner name\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" expects an inner name\n", + pvname.len, pvname.s); goto error; } if(pvstate==2 || pvstate==5) { if(pte->parse_name==NULL) { - LM_ERR("pvar \"%.*s\" does not get name param\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" does not get name param\n", + pvname.len, pvname.s); goto error; } s.s = p; @@ -470,15 +474,17 @@ done_inm: if(p==s.s) { - LM_ERR("pvar \"%.*s\" does not get empty name param\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" does not get empty name param\n", + pvname.len, pvname.s); goto error; } s.len = p - s.s; if(pte->parse_name(e, &s)!=0) { - LM_ERR("pvar \"%.*s\" has an invalid name param [%.*s]\n", - pvname.len, pvname.s, s.len, s.s); + if (!silent) + LM_ERR("pvar \"%.*s\" has an invalid name param [%.*s]\n", + pvname.len, pvname.s, s.len, s.s); goto error; } if(pvstate==2) @@ -494,8 +500,9 @@ done_inm: p++; pvstate = 4; } else { - LM_ERR("invalid char '%c' in [%.*s] (%d)\n", *p, in->len, in->s, - pvstate); + if (!silent) + LM_ERR("invalid char '%c' in [%.*s] (%d)\n", + *p, in->len, in->s, pvstate); goto error; } } else { @@ -504,8 +511,9 @@ done_inm: p++; goto done_all; } else { - LM_ERR("invalid char '%c' in [%.*s] (%d)\n", *p, in->len, in->s, - pvstate); + if (!silent) + LM_ERR("invalid char '%c' in [%.*s] (%d)\n", + *p, in->len, in->s, pvstate); goto error; } } @@ -515,8 +523,9 @@ done_vnm: { if(pte->parse_index==NULL) { - LM_ERR("pvar \"%.*s\" does not get index param\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" does not get index param\n", + pvname.len, pvname.s); goto error; } s.s = p; @@ -538,15 +547,17 @@ done_vnm: if(p==s.s) { - LM_ERR("pvar \"%.*s\" does not get empty index param\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" does not get empty index param\n", + pvname.len, pvname.s); goto error; } s.len = p - s.s; if(pte->parse_index(e, &s)!=0) { - LM_ERR("pvar \"%.*s\" has an invalid index param [%.*s]\n", - pvname.len, pvname.s, s.len, s.s); + if (!silent) + LM_ERR("pvar \"%.*s\" has an invalid index param [%.*s]\n", + pvname.len, pvname.s, s.len, s.s); goto error; } p++; @@ -557,8 +568,9 @@ done_vnm: p++; pvstate = 4; } else { - LM_ERR("invalid char '%c' in [%.*s] (%d)\n", *p, in->len, in->s, - pvstate); + if (!silent) + LM_ERR("invalid char '%c' in [%.*s] (%d)\n", + *p, in->len, in->s, pvstate); goto error; } } @@ -594,8 +606,9 @@ done_idx: if(p==s.s) { - LM_ERR("pvar \"%.*s\" does not get empty index param\n", - pvname.len, pvname.s); + if (!silent) + LM_ERR("pvar \"%.*s\" does not get empty index param\n", + pvname.len, pvname.s); goto error; } s.len = p - s.s + 1; @@ -603,12 +616,14 @@ done_idx: p = tr_lookup(&s, &tr); if(p==NULL) { - LM_ERR("bad tr in pvar name \"%.*s\"\n", pvname.len, pvname.s); + if (!silent) + LM_ERR("bad tr in pvar name \"%.*s\"\n", pvname.len, pvname.s); goto error; } if(*p!=PV_RNBRACKET) { - LM_ERR("bad pvar name \"%.*s\" (%c)!\n", in->len, in->s, *p); + if (!silent) + LM_ERR("bad pvar name \"%.*s\" (%c)!\n", in->len, in->s, *p); goto error; } e->trans = (void*)tr; @@ -621,11 +636,15 @@ done_all: return p; error: - if(p!=NULL) - LM_ERR("wrong char [%c/%d] in [%.*s] at [%d (%d)]\n", *p, (int)*p, - in->len, in->s, (int)(p-in->s), pvstate); - else - LM_ERR("invalid parsing in [%.*s] at (%d)\n", in->len, in->s, pvstate); + if(p!=NULL){ + if (!silent) + LM_ERR("wrong char [%c/%d] in [%.*s] at [%d (%d)]\n", *p, (int)*p, + in->len, in->s, (int)(p-in->s), pvstate); + }else{ + if (!silent) + LM_ERR("invalid parsing in [%.*s] at (%d)\n", + in->len, in->s, pvstate); + } return NULL; } /* end: pv_parse_spec */ diff --git a/pvar.h b/pvar.h index 811ea34..5eeac62 100644 --- a/pvar.h +++ b/pvar.h @@ -158,7 +158,8 @@ typedef struct _pv_elem struct _pv_elem *next; } pv_elem_t, *pv_elem_p; -char* pv_parse_spec(str *in, pv_spec_p sp); +char* pv_parse_spec2(str *in, pv_spec_p sp, int silent); +#define pv_parse_spec(in, sp) pv_parse_spec2((in), (sp), 0) int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value); int pv_print_spec(struct sip_msg* msg, pv_spec_p sp, char *buf, int *len); int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len);

15 years, 5 months

git:andrei/script_vars: script parsing: better error reporting

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: f65e66ce24a7e4a9a0ff81ee5f5866ef12ed7f9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f65e66c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 12 13:58:37 2008 +0100 script parsing: better error reporting - more informative parse error messages for expression/rvalues - account for the possibility of having a multi line token when reporting an error message - fixed ending column number in error messages --- cfg.y | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/cfg.y b/cfg.y index a17ad4b..6bd5b43 100644 --- a/cfg.y +++ b/cfg.y @@ -2013,9 +2013,9 @@ rval: intno {$$=mk_rval_expr_v(RV_INT, (void*)$1); } | select_id {$$=mk_rval_expr_v(RV_SEL, $1); pkg_free($1); } | fcmd {$$=mk_rval_expr_v(RV_ACTION_ST, $1); } | LBRACE actions RBRACE {$$=mk_rval_expr_v(RV_ACTION_ST, $2); } + | LBRACE error RBRACE { yyerror("bad command block"); } | LPAREN assign_action RPAREN {$$=mk_rval_expr_v(RV_ACTION_ST, $2); } - //| exp {$$=mk_rval_expr_v(RV_BEXPR, $1);} - /* missing/TODO: RV_ACTION_ST */ + | LPAREN error RPAREN { yyerror("bad expression"); } ; @@ -2055,6 +2055,19 @@ rval_expr: rval { $$=$1; { $$=mk_rval_expr2(RVE_LOR_OP, $1, $3);} | LPAREN rval_expr RPAREN { $$=$2; } | exp_elem { $$=mk_rval_expr_v(RV_BEXPR, $1); } + | rve_un_op %prec NOT error { 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 rve_cmpop %prec GT error + { 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"); } ; assign_action: lval assign_op rval_expr { $$=mk_action($2, 2, LVAL_ST, $1, @@ -2498,12 +2511,13 @@ cmd: } $$ = mod_func_action; } + | ID error { yyerror("'('')' expected (function call)");} ; func_params: /* empty */ | func_params COMMA func_param { } | func_param {} - | func_params error { yyerror("call params error\n"); YYABORT; } + | func_params error { yyerror("call params error\n"); } ; func_param: NUMBER { @@ -2532,17 +2546,32 @@ func_param: extern int line; extern int column; extern int startcolumn; +extern int startline; + static void warn(char* s) { - LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", line, startcolumn, - column, s); + if (line!=startline) + LOG(L_WARN, "cfg. warning: (%d,%d-%d,%d): %s\n", + startline, startcolumn, line, column-1, s); + else if (startcolumn!=(column-1)) + LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", startline, startcolumn, + column-1, s); + else + LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", startline, startcolumn, s); cfg_warnings++; } static void yyerror(char* s) { - LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d-%d): %s\n", line, startcolumn, - column, s); + if (line!=startline) + LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d-%d,%d): %s\n", + startline, startcolumn, line, column-1, s); + else if (startcolumn!=(column-1)) + LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d-%d): %s\n", + startline, startcolumn, column-1, s); + else + LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d): %s\n", + startline, startcolumn, s); cfg_errors++; }

15 years, 5 months

git:andrei/script_vars: script parsing: fix line/column counting in strings

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 9c674bfa6e1b60082beb57bd571995ff1cd8208b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c674bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 12 12:55:02 2008 +0100 script parsing: fix line/column counting in strings - added startline which contains the starting line for a token (some tokens can span multiple lines). - string tokens are now correctly reported (startline and startcolumn always point at the beginning) --- cfg.lex | 108 ++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 80 insertions(+), 28 deletions(-) diff --git a/cfg.lex b/cfg.lex index 7578837..6e9d991 100644 --- a/cfg.lex +++ b/cfg.lex @@ -119,10 +119,15 @@ int line=1; int column=1; int startcolumn=1; + int startline=1; + static int ign_lines=0; + static int ign_columns=0; static char* addchar(struct str_buf *, char); static char* addstr(struct str_buf *, char*, int); static void count(); + static void count_more(); + static void count_ignore(); %} @@ -806,7 +811,7 @@ EAT_ABLE [\ \t\b\r] <PVARID>{ID}|'.' {yymore(); } <PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); p_nest=1; yymore(); } -<PVARID>. { count(); state=INITIAL_S; BEGIN(INITIAL); +<PVARID>. { yyless(0); state=INITIAL_S; BEGIN(INITIAL); return PVAR; } @@ -872,7 +877,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{COMMA} { count(); return COMMA; } <INITIAL>{SEMICOLON} { count(); return SEMICOLON; } <INITIAL>{COLON} { count(); return COLON; } -<INITIAL>{STAR} { count(); return STAR; } +<INITIAL>{STAR} { count(); return STAR; } <INITIAL>{RPAREN} { count(); return RPAREN; } <INITIAL>{LPAREN} { count(); return LPAREN; } <INITIAL>{LBRACE} { count(); return LBRACE; } @@ -885,16 +890,19 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{CR} { count();/* return CR;*/ } -<INITIAL,SELECT>{QUOTES} { count(); old_initial = YY_START; old_state = state; state=STRING_S; BEGIN(STRING1); } -<INITIAL>{TICK} { count(); old_initial = YY_START; old_state = state; state=STRING_S; BEGIN(STRING2); } +<INITIAL,SELECT>{QUOTES} { count(); old_initial = YY_START; + old_state = state; state=STRING_S; + BEGIN(STRING1); } +<INITIAL>{TICK} { count(); old_initial = YY_START; old_state = state; + state=STRING_S; BEGIN(STRING2); } -<STRING1>{QUOTES} { count(); +<STRING1>{QUOTES} { count_more(); yytext[yyleng-1]=0; yyleng--; addstr(&s_buf, yytext, yyleng); BEGIN(STR_BETWEEN); } -<STRING2>{TICK} { count(); state=old_state; BEGIN(old_initial); +<STRING2>{TICK} { count_more(); state=old_state; BEGIN(old_initial); yytext[yyleng-1]=0; yyleng--; addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; @@ -903,24 +911,28 @@ EAT_ABLE [\ \t\b\r] } <STRING2>.|{EAT_ABLE}|{CR} { yymore(); } -<STRING1>\\n { count(); addchar(&s_buf, '\n'); } -<STRING1>\\r { count(); addchar(&s_buf, '\r'); } -<STRING1>\\a { count(); addchar(&s_buf, '\a'); } -<STRING1>\\t { count(); addchar(&s_buf, '\t'); } -<STRING1>\\{QUOTES} { count(); addchar(&s_buf, '"'); } -<STRING1>\\\\ { count(); addchar(&s_buf, '\\'); } -<STRING1>\\x{HEX}{1,2} { count(); addchar(&s_buf, +<STRING1>\\n { count_more(); addchar(&s_buf, '\n'); } +<STRING1>\\r { count_more(); addchar(&s_buf, '\r'); } +<STRING1>\\a { count_more(); addchar(&s_buf, '\a'); } +<STRING1>\\t { count_more(); addchar(&s_buf, '\t'); } +<STRING1>\\{QUOTES} { count_more(); addchar(&s_buf, '"'); } +<STRING1>\\\\ { count_more(); addchar(&s_buf, '\\'); } +<STRING1>\\x{HEX}{1,2} { count_more(); addchar(&s_buf, (char)strtol(yytext+2, 0, 16)); } /* don't allow \[0-7]{1}, it will eat the backreferences from subst_uri if allowed (although everybody should use '' in subt_uri) */ -<STRING1>\\[0-7]{2,3} { count(); addchar(&s_buf, +<STRING1>\\[0-7]{2,3} { count_more(); addchar(&s_buf, (char)strtol(yytext+1, 0, 8)); } -<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); +<STRING1>\\{CR} { count_more(); } /* eat escaped CRs */ +<STRING1>.|{EAT_ABLE}|{CR} { count_more(); addchar(&s_buf, *yytext); } + +<STR_BETWEEN>{EAT_ABLE}|{CR} { count_ignore(); } +<STR_BETWEEN>{QUOTES} { count_more(); state=STRING_S; + BEGIN(STRING1);} +<STR_BETWEEN>. { + yyless(0); /* reparse it */ + /* ignore the whitespace now that is + counted, return saved string value */ state=old_state; BEGIN(old_initial); yylval.strval=s_buf.s; memset(&s_buf, 0, sizeof(s_buf)); @@ -1043,26 +1055,66 @@ error: -static void count() +/** helper function for count_*(). */ +static void count_lc(int* l, int* c) { int i; - - startcolumn=column; for (i=0; i<yyleng;i++){ if (yytext[i]=='\n'){ - line++; - column=startcolumn=1; + (*l)++; + (*c)=1; }else if (yytext[i]=='\t'){ - column++; - /*column+=8 -(column%8);*/ + (*c)++; + /*(*c)+=8 -((*c)%8);*/ }else{ - column++; + (*c)++; } } } +/* helper function */ +static void count_restore_ignored() +{ + if (ign_lines) /* ignored line(s) => column has changed */ + column=ign_columns; + else + column+=ign_columns; + line+=ign_lines; + ign_lines=ign_columns=0; +} + + + +/** count/record position for stuff added to the current token. */ +static void count_more() +{ + count_restore_ignored(); + count_lc(&line, &column); +} + + + +/** count/record position for a new token. */ +static void count() +{ + count_restore_ignored(); + startline=line; + startcolumn=column; + count_more(); +} + + + +/** record discarded stuff (not contained in the token) so that + the next token position can be adjusted properly*/ +static void count_ignore() +{ + count_lc(&ign_lines, &ign_columns); +} + + /* replacement yywrap, removes libfl dependency */ int yywrap() {

15 years, 5 months

Re: [SR-Dev] [Serdev] CVS:commitlog: sip_router/modules/tm t_cancel.c t_fwd.c t_reply.c t_reply.h t_suspend.c t_suspend.h tm.c tm_load.c tm_load.h

by Andrei Pelinescu-Onciul

[crossposting since this is of general interest] On Nov 12, 2008 at 00:30, Klaus Darilion <klaus.mailinglists(a)pernau.at> wrote: > Hi Miklos! > > This sounds great. Can you make a sample function which uses the new > feature? We are thinking of doing a dns_prefetch module using this. The sip-router.cfg will look like: route{ ... dns_prefetch("uri", ROUTE_DNS_OK); # end of script } route[ROUTE_DNS_OK]{ if (dns_error){ ... } # continue normal processing # the uri was resolved and is in the dns cache ... t_relay() ... } However don't expect something quickly as everybody is quite busy and we would still need to write a dns resolver process pool (time consuming). Note that this is not the "final" async. solution since it's not transparent for the script writer (scripts would have to be written in a special way), works only with tm and it's also a little inefficient for dns usage. In the long term we will have completely transparent async. support for dns and maybe db lookups (though it's controversial if we really need it for normal db lookups). This will take much longer and will require among other things reviewing all the global variable use (most of the global variables will either need to be registered or allocated in some known special place). If Miklos doesn't beat me to it, I'll probably start working on it only after the core merging is complete. > > Can this also be used for DNS lookups and TCP/TLS connection setup? Yes for DNS (see above) and in general for any route-level async processing involving tm (e.g. lookup some part of the message in a slow DB and execute automatically another route when the DB responds). It cannot be used for TCP/TLS, but it's not needed anyway. In ser TCP connection setup and TCP send is already asynchronous, at least if you have tcp_buf_write=yes in ser.cfg (I agree it's not a very well chosen name :-)). TLS does not support it yet, so if you use TLS you should not set this option (that's why it's not yet the default). TLS support for it requires non-trivial changes in the tcp core and it will probably come after the merge (it's started already but far from finished). (BTW: most of the core new options documentation in ser can be found in NEWS) Andrei > > Further, also for Kamailio cooperation better documentation would be > needed. Thus, instead of writing long CVS commit messages I think it > would be better to write the text into the module documentation, and > then copy/paste it into the CVS commit. > > regards > Klaus > > Miklos Tirpak wrote: > > tirpi 2008/11/10 13:47:03 CET > > > > SER CVS Repository > > > > Modified files: > > modules/tm t_cancel.c t_fwd.c t_reply.c t_reply.h > > tm.c tm_load.c tm_load.h > > Added files: > > modules/tm t_suspend.c t_suspend.h > > Log: > > t_suspend() and t_continue() functions are introduced. > > > > These fuctions can be used by other modules to implement > > asynchronous actions: t_suspend() saves the transaction, returns its > > identifiers, and t_continue() continues the SIP request processing. > > (The transaction processing does not continue from the same point > > in the script, a separate route block defined by the parameter of > > t_continue() is executed instead. The reply lock is held during the > > route block execution.) FR timer is ticking while the > > transaction is suspended, and the transaction's failure route is > > executed if t_continue() is not called in time. > > > > Missing: msg lumps are saved by t_suspend() and are not updated by > > the subsequent t_relay(). This means that the modifications made > > between them are lost. > > > > Revision Changes Path > > 1.32 +7 -2 sip_router/modules/tm/t_cancel.c > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_cance… > > 1.107 +8 -2 sip_router/modules/tm/t_fwd.c > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_fwd.c… > > 1.162 +4 -4 sip_router/modules/tm/t_reply.c > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_reply… > > 1.31 +7 -1 sip_router/modules/tm/t_reply.h > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_reply… > > 1.1 +154 -0 sip_router/modules/tm/t_suspend.c (new) > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_suspe… > > 1.1 +42 -0 sip_router/modules/tm/t_suspend.h (new) > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_suspe… > > 1.177 +3 -1 sip_router/modules/tm/tm.c > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/tm.c.di… > > 1.31 +11 -1 sip_router/modules/tm/tm_load.c > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/tm_load… > > 1.31 +4 -1 sip_router/modules/tm/tm_load.h > > http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/tm_load… > > _______________________________________________ > > Serdev mailing list > > Serdev(a)lists.iptel.org > > http://lists.iptel.org/mailman/listinfo/serdev > > _______________________________________________ > Serdev mailing list > Serdev(a)lists.iptel.org > http://lists.iptel.org/mailman/listinfo/serdev

15 years, 5 months

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");

15 years, 5 months

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…

15 years, 5 months

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; }

15 years, 5 months

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);

15 years, 5 months

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)){

15 years, 5 months

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);}

15 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev