sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:andrei/switch: script parsing: while support
by Andrei Pelinescu-Onciul 10 Feb '09

10 Feb '09

Module: sip-router Branch: andrei/switch Commit: d14a718fbaf2f737ea9206dc1d63ea8b3bdba294 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d14a718… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 10 22:39:01 2009 +0100 script parsing: while support - while() support - improved config warning functions --- NEWS | 4 ++++ cfg.lex | 6 +++++- cfg.y | 61 ++++++++++++… [View More]++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 03852ee..bede08a 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ config script changes: #!MAXCOMPAT where #!KAMAILIO is equivalent with #!OPENSER and #!ALL with #!MAXCOMPAT - support for kamailio style pvars + - C-like switch()/case (integer only) + - while() + - max_while_loops - maximum iterations allowed for a while, can be changed + at runtime. Default 100. diff --git a/cfg.lex b/cfg.lex index 13767b1..1323303 100644 --- a/cfg.lex +++ b/cfg.lex @@ -190,6 +190,7 @@ FORCE_SEND_SOCKET "force_send_socket" SWITCH "switch" CASE "case" DEFAULT "default" +WHILE "while" /*ACTION LVALUES*/ URIHOST "uri:host" @@ -375,6 +376,7 @@ MCAST_TTL "mcast_ttl" TOS "tos" PMTU_DISCOVERY "pmtu_discovery" KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" +MAX_WLOOPS "max_while_loops" /* stun config variables */ STUN_REFRESH_INTERVAL "stun_refresh_interval" @@ -501,7 +503,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{SWITCH} { count(); yylval.strval=yytext; return SWITCH; } <INITIAL>{CASE} { count(); yylval.strval=yytext; return CASE; } <INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } - +<INITIAL>{WHILE} { count(); yylval.strval=yytext; return WHILE; } <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } @@ -717,6 +719,8 @@ EAT_ABLE [\ \t\b\r] return PMTU_DISCOVERY; } <INITIAL>{KILL_TIMEOUT} { count(); yylval.strval=yytext; return KILL_TIMEOUT; } +<INITIAL>{MAX_WLOOPS} { count(); yylval.strval=yytext; + return MAX_WLOOPS; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } diff --git a/cfg.y b/cfg.y index 42f068a..e1758bf 100644 --- a/cfg.y +++ b/cfg.y @@ -184,6 +184,7 @@ extern int yylex(); static void yyerror(char* s, ...); +static void yyerror_at(struct cfg_pos* pos, char* s, ...); static char* tmp; static int i_tmp; static unsigned u_tmp; @@ -201,7 +202,8 @@ static struct action *mod_func_action; static struct lvalue* lval_tmp; static struct rvalue* rval_tmp; -static void warn(char* s); +static void warn(char* s, ...); +static void warn_at(struct cfg_pos* pos, char* s, ...); static void get_cpos(struct cfg_pos* pos); 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); @@ -280,6 +282,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %token SWITCH %token CASE %token DEFAULT +%token WHILE %token URIHOST %token URIPORT %token MAX_LEN @@ -436,6 +439,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %token TOS %token PMTU_DISCOVERY %token KILL_TIMEOUT +%token MAX_WLOOPS %token CFG_DESCRIPTION %token SERVER_ID @@ -501,7 +505,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %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 -%type <action> switch_cmd +%type <action> switch_cmd while_cmd %type <case_stms> single_case case_stms %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet @@ -1283,6 +1287,8 @@ assign_stm: | PMTU_DISCOVERY error { yyerror("number expected"); } | KILL_TIMEOUT EQUAL NUMBER { ser_kill_timeout=$3; } | KILL_TIMEOUT EQUAL error { yyerror("number expected"); } + | MAX_WLOOPS EQUAL NUMBER { default_core_cfg.max_while_loops=$3; } + | MAX_WLOOPS EQUAL error { yyerror("number expected"); } | STUN_REFRESH_INTERVAL EQUAL NUMBER { IF_STUN(stun_refresh_interval=$3); } | STUN_REFRESH_INTERVAL EQUAL error{ yyerror("number expected"); } | STUN_ALLOW_STUN EQUAL NUMBER { IF_STUN(stun_allow_stun=$3); } @@ -1773,6 +1779,7 @@ action: fcmd SEMICOLON {$$=$1;} | if_cmd {$$=$1;} | switch_cmd {$$=$1;} + | while_cmd { $$=$1; } | assign_action SEMICOLON {$$=$1;} | SEMICOLON /* null action */ {$$=0;} | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } @@ -1873,6 +1880,17 @@ switch_cmd: {$$=0; yyerror ("bad switch body"); } ; +while_cmd: + WHILE rval_expr stm { + if ($2){ + if (rve_is_constant($2)) + warn_at(&$2->fpos, "constant value in while(...)"); + }else + yyerror_at(&$2->fpos, "bad while(...) expression"); + $$=mk_action( WHILE_T, 2, RVE_ST, $2, ACTIONS_ST, $3); + } +; + /* class_id: LBRACK ATTR_USER RBRACK { $$ = AVP_CLASS_USER; } | LBRACK ATTR_DOMAIN RBRACK { $$ = AVP_CLASS_DOMAIN; } @@ -2665,19 +2683,28 @@ static void get_cpos(struct cfg_pos* pos) } -static void warn(char* s) +static void warn_at(struct cfg_pos* p, char* format, ...) { - if (line!=startline) + va_list ap; + char s[256]; + + va_start(ap, format); + vsnprintf(s, sizeof(s), format, ap); + va_end(ap); + if (p->e_line!=p->s_line) 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); + p->s_line, p->s_col, p->e_line, p->e_col, s); + else if (p->s_col!=p->e_col) + LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", + p->s_line, p->s_col, p->e_col, s); else - LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", startline, startcolumn, s); + LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", + p->s_line, p->s_col, s); cfg_warnings++; } + + static void yyerror_at(struct cfg_pos* p, char* format, ...) { va_list ap; @@ -2699,6 +2726,22 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) } + +static void warn(char* format, ...) +{ + va_list ap; + char s[256]; + struct cfg_pos pos; + + get_cpos(&pos); + va_start(ap, format); + vsnprintf(s, sizeof(s), format, ap); + va_end(ap); + warn_at(&pos, s); +} + + + static void yyerror(char* format, ...) { va_list ap; [View Less]

1 0

git:andrei/switch: script engine: while() support
by Andrei Pelinescu-Onciul 10 Feb '09

10 Feb '09

Module: sip-router Branch: andrei/switch Commit: dfda974cfb1c073fb751f74fab18a66f4bb341ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfda974… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 10 22:21:12 2009 +0100 script engine: while() support - support the same while() loops as kamailio (the only difference being that max_while_loops can be changed at runtime): while(… [View More]<int expr>) { .... } with break exiting the while. --- action.c | 27 +++++++++++++++++++++++++- cfg_core.c | 3 ++ cfg_core.h | 1 + config.h | 3 ++ route.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- route_struct.h | 2 +- 6 files changed, 89 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 82e187c..079bbfe 100644 --- a/action.c +++ b/action.c @@ -112,9 +112,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct sip_uri *u; unsigned short port; str* dst_host; - int i; + int i, flags; struct switch_cond_table* sct; struct switch_jmp_table* sjt; + struct rval_expr* rve; /* reset the value of error to E_UNSPEC so avoid unknowledgable @@ -906,6 +907,30 @@ sw_jt_def: returns passthrough */ } break; + case WHILE_T: + i=0; + flags=0; + rve=(struct rval_expr*)a->val[0].u.data; + ret=1; + while(!(flags & BREAK_R_F) && + (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ + i++; + if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ + LOG(L_ERR, "ERROR: runaway while (%d, %d): more then" + " %d loops\n", + rve->fpos.s_line, rve->fpos.s_col, + cfg_get(core, core_cfg, max_while_loops)); + ret=-1; + break; + } + if (likely(a->val[1].u.data)){ + ret=run_actions(h, (struct action*)a->val[1].u.data, msg); + flags|=h->run_flags; + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + } + break; case FORCE_RPORT_T: msg->msg_flags|=FL_FORCE_RPORT; ret=1; /* continue processing */ diff --git a/cfg_core.c b/cfg_core.c index f3c511e..9a2b0b2 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -88,6 +88,7 @@ struct cfg_group_core default_core_cfg = { #ifdef SHM_MEM 0, /* mem_dump_shm */ #endif + DEFAULT_MAX_WHILE_LOOPS, /* max_while_loops */ }; void *core_cfg = &default_core_cfg; @@ -177,5 +178,7 @@ cfg_def_t core_cfg_def[] = { {"mem_dump_shm", CFG_VAR_INT, 0, 0, mem_dump_shm_fixup, 0, "dump shared memory status"}, #endif + {"max_while_loops", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "maximum iterations allowed for a while loop" }, {0, 0, 0, 0, 0, 0} }; diff --git a/cfg_core.h b/cfg_core.h index d916563..8e5457a 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -85,6 +85,7 @@ struct cfg_group_core { #ifdef SHM_MEM int mem_dump_shm; #endif + int max_while_loops; }; extern struct cfg_group_core default_core_cfg; diff --git a/config.h b/config.h index 393d1f3..0832eb0 100644 --- a/config.h +++ b/config.h @@ -208,4 +208,7 @@ #define DEFAULT_DID "_default" +/* maximum allowed iterations for a while (to catch runaways) */ +#define DEFAULT_MAX_WHILE_LOOPS 100 + #endif diff --git a/route.c b/route.c index 5587f12..54e3236 100644 --- a/route.c +++ b/route.c @@ -623,6 +623,10 @@ int fix_actions(struct action* a) struct ip_addr ip; struct socket_info* si; struct lvalue* lval; + struct rval_expr* rve; + struct rval_expr* err_rve; + enum rval_type rve_type, err_type, expected_type; + char buf[30]; /* tmp buffer needed for module param fixups */ @@ -701,12 +705,12 @@ int fix_actions(struct action* a) case SWITCH_T: if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for if (should be expr)\n", + "%d for switch() (should be expr)\n", t->val[0].type); return E_BUG; }else if (t->val[1].type!=CASE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for switch(...){...}(should be action)\n", + "%d for switch(...){...}(should be case)\n", t->val[1].type); return E_BUG; } @@ -721,6 +725,55 @@ int fix_actions(struct action* a) if ((ret=fix_switch(t))<0) return ret; break; + case WHILE_T: + if (t->val[0].type!=RVE_ST){ + LOG(L_CRIT, "BUG: fix_actions: invalid subtype" + "%d for while() (should be expr)\n", + t->val[0].type); + return E_BUG; + }else if (t->val[1].type!=ACTIONS_ST){ + LOG(L_CRIT, "BUG: fix_actions: invalid subtype" + "%d for while(...){...}(should be action)\n", + t->val[1].type); + return E_BUG; + } + 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; + }else{ + LOG(L_CRIT, "BUG: fix_actions: null while()" + " expression\n"); + return E_BUG; + } + if ( t->val[1].u.data && + ((ret= fix_actions((struct action*)t->val[1].u.data))<0)){ + return ret; + } + break; case ASSIGN_T: case ADD_T: if (t->val[0].type !=LVAL_ST) { diff --git a/route_struct.h b/route_struct.h index a8cfe8f..85242af 100644 --- a/route_struct.h +++ b/route_struct.h @@ -71,7 +71,7 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, IF_T, SWITCH_T /* only until fixup*/, - BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, WHILE_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, [View Less]

1 0

git:andrei/switch: script engine: switch() and break execution
by Andrei Pelinescu-Onciul 09 Feb '09

09 Feb '09

Module: sip-router Branch: andrei/switch Commit: 955535a4f039a3782ef84d4f15bf807ee61af69d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=955535a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 9 19:01:35 2009 +0100 script engine: switch() and break execution - support for executing optimized switch()ed (by fix_switch()) - proper break handling: - exit a switch() on break … [View More](even if the break is inside an if() block) - if the break is outside a switch, exit the route block (compatibility with older versions, for new scripts using exit or drop instead of break is recommended) --- action.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- cfg.y | 2 +- route_struct.h | 1 + switch.h | 1 + 4 files changed, 107 insertions(+), 5 deletions(-) diff --git a/action.c b/action.c index 26edcca..82e187c 100644 --- a/action.c +++ b/action.c @@ -77,6 +77,7 @@ #ifdef USE_SCTP #include "sctp_server.h" #endif +#include "switch.h" #include <sys/types.h> #include <sys/socket.h> @@ -111,6 +112,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct sip_uri *u; unsigned short port; str* dst_host; + int i; + struct switch_cond_table* sct; + struct switch_jmp_table* sjt; + /* reset the value of error to E_UNSPEC so avoid unknowledgable functions to return with error (status<0) and not setting it @@ -448,7 +453,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) /*ret=((ret=run_actions(rlist[a->val[0].u.number], msg))<0)?ret:1;*/ ret=run_actions(h, main_rt.rlist[a->val[0].u.number], msg); h->last_retcode=ret; - h->run_flags&=~RETURN_R_F; /* absorb returns */ + h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ break; case EXEC_T: if (a->val[0].type!=STRING_ST){ @@ -704,7 +709,8 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=0; break; } - h->run_flags &= ~RETURN_R_F; /* catch returns in expr */ + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ ret=1; /*default is continue */ if (v>0) { if ((a->val[1].type==ACTIONS_ST)&&a->val[1].u.data){ @@ -808,6 +814,98 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) LOG(L_CRIT,"BUG: do_action: bad module call\n"); } break; + case EVAL_T: + /* only eval the expression to account for possible + side-effect */ + rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data); + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~RETURN_R_F|BREAK_R_F; /* catch return & break in + expr */ + ret=1; /* default is continue */ + break; + case SWITCH_COND_T: + sct=(struct switch_cond_table*)a->val[1].u.data; + if (unlikely( rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data) <0)){ + /* handle error in expression => use default */ + ret=-1; + goto sw_cond_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + ret=1; /* default is continue */ + for(i=0; i<sct->n; i++) + if (sct->cond[i]==v){ + if (likely(sct->jump[i])){ + ret=run_actions(h, sct->jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + goto skip; + } +sw_cond_def: + if (sct->def){ + ret=run_actions(h, sct->def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + case SWITCH_JT_T: + sjt=(struct switch_jmp_table*)a->val[1].u.data; + if (unlikely( rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data) <0)){ + /* handle error in expression => use default */ + ret=-1; + goto sw_jt_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + ret=1; /* default is continue */ + if (likely(v >= sjt->first && v <= sjt->last)){ + if (likely(sjt->tbl[v - sjt->first])){ + ret=run_actions(h, sjt->tbl[v - sjt->first], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + }else{ + for(i=0; i<sjt->rest.n; i++) + if (sjt->rest.cond[i]==v){ + if (likely(sjt->rest.jump[i])){ + ret=run_actions(h, sjt->rest.jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but + let returns pass */ + } + goto skip; + } + } + /* not found => try default */ +sw_jt_def: + if (sjt->rest.def){ + ret=run_actions(h, sjt->rest.def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + case BLOCK_T: + if (likely(a->val[0].u.data)){ + ret=run_actions(h, (struct action*)a->val[0].u.data, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; case FORCE_RPORT_T: msg->msg_flags|=FL_FORCE_RPORT; ret=1; /* continue processing */ @@ -885,7 +983,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); } -/*skip:*/ +skip: return ret; error_uri: @@ -935,7 +1033,9 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) for (t=a; t!=0; t=t->next){ ret=do_action(h, t, msg); - if (h->run_flags & (RETURN_R_F|EXIT_R_F)){ + /* break, return or drop/exit stop execution of the current + block */ + if (h->run_flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)){ if (h->run_flags & EXIT_R_F){ #ifdef USE_LONGJMP h->last_retcode=ret; diff --git a/cfg.y b/cfg.y index 431054d..42f068a 100644 --- a/cfg.y +++ b/cfg.y @@ -2410,7 +2410,7 @@ cmd: | RETURN {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, (void*)RETURN_R_F); } | RETURN NUMBER {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)RETURN_R_F);} | RETURN RETCODE {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)RETURN_R_F);} - | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)RETURN_R_F); } + | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)BREAK_R_F); } | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)4, STRING_ST, $3); } | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); } | LOG_TOK error { $$=0; yyerror("missing '(' or ')' ?"); } diff --git a/route_struct.h b/route_struct.h index e87b2d0..a8cfe8f 100644 --- a/route_struct.h +++ b/route_struct.h @@ -105,6 +105,7 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, /* run flags */ #define EXIT_R_F 1 #define RETURN_R_F 2 +#define BREAK_R_F 4 struct cfg_pos{ diff --git a/switch.h b/switch.h index 4c9f78b..e92cbad 100644 --- a/switch.h +++ b/switch.h @@ -54,6 +54,7 @@ struct switch_jmp_table{ struct switch_cond_table rest; /**< normal cond. table for the rest */ }; +int fix_switch(struct action* t); #endif /*__switch_h*/ [View Less]

1 0

git:andrei/switch: script parsing: C style switch() & case support
by Andrei Pelinescu-Onciul 05 Feb '09

05 Feb '09

Module: sip-router Branch: andrei/switch Commit: a29a8b6ddba24b8e71faaf78e7426aa7f85c19b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a29a8b6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 4 20:44:26 2009 +0100 script parsing: C style switch() & case support - support for parsing C style switch() & case, e.g.: switch($var){ case 1: log(1, "1\n"); … [View More] break; case 2: case 3: default: log(1, "default\n"); } (note: this is different from kamailio/openser switch()) --- cfg.lex | 7 +++ cfg.y | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- route_struct.h | 8 +++- switch.h | 60 +++++++++++++++++++++++++++ 4 files changed, 194 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index fc9eecb..13767b1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -187,6 +187,9 @@ ELSE "else" SET_ADV_ADDRESS "set_advertised_address" SET_ADV_PORT "set_advertised_port" FORCE_SEND_SOCKET "force_send_socket" +SWITCH "switch" +CASE "case" +DEFAULT "default" /*ACTION LVALUES*/ URIHOST "uri:host" @@ -495,6 +498,10 @@ EAT_ABLE [\ \t\b\r] return SET_ADV_PORT; } <INITIAL>{FORCE_SEND_SOCKET} { count(); yylval.strval=yytext; return FORCE_SEND_SOCKET; } +<INITIAL>{SWITCH} { count(); yylval.strval=yytext; return SWITCH; } +<INITIAL>{CASE} { count(); yylval.strval=yytext; return CASE; } +<INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } + <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } diff --git a/cfg.y b/cfg.y index 63c9eb4..431054d 100644 --- a/cfg.y +++ b/cfg.y @@ -93,6 +93,7 @@ * lval=rval_expr, where lval=avp|pvar (andrei) * 2007-12-06 expression are now evaluated in terms of rvalues; * NUMBER is now always positive; cleanup (andrei) + * 2009-01-26 case/switch() support (andrei) */ %{ @@ -109,6 +110,7 @@ #include "route_struct.h" #include "globals.h" #include "route.h" +#include "switch.h" #include "dprint.h" #include "sr_module.h" #include "modparam.h" @@ -211,6 +213,8 @@ static struct socket_id* mk_listen_id2(struct name_lst*, int, int); static void free_name_lst(struct name_lst* lst); static void free_socket_id_lst(struct socket_id* i); +static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); + %} %union { @@ -219,6 +223,7 @@ static void free_socket_id_lst(struct socket_id* i); char* strval; struct expr* expr; struct action* action; + struct case_stms* case_stms; struct net* ipnet; struct ip_addr* ipaddr; struct socket_id* sockid; @@ -272,6 +277,9 @@ static void free_socket_id_lst(struct socket_id* i); %token SET_ADV_ADDRESS %token SET_ADV_PORT %token FORCE_SEND_SOCKET +%token SWITCH +%token CASE +%token DEFAULT %token URIHOST %token URIPORT %token MAX_LEN @@ -493,6 +501,8 @@ static void free_socket_id_lst(struct socket_id* i); %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 +%type <action> switch_cmd +%type <case_stms> single_case case_stms %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet %type <strval> host @@ -514,7 +524,7 @@ static void free_socket_id_lst(struct socket_id* i); %type <attr> attr_id_any_str %type <pvar> pvar %type <lval> lval -%type <rv_expr> rval rval_expr +%type <rv_expr> rval rval_expr ct_rval %type <lval> avp_pvar /* %type <intval> class_id */ %type <intval> assign_op @@ -1762,6 +1772,7 @@ actions: action: fcmd SEMICOLON {$$=$1;} | if_cmd {$$=$1;} + | switch_cmd {$$=$1;} | assign_action SEMICOLON {$$=$1;} | SEMICOLON /* null action */ {$$=0;} | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } @@ -1770,6 +1781,98 @@ 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); } ; + +ct_rval: rval_expr { + $$=0; + if (!rve_is_constant($1)){ + yyerror("constant expected"); + }else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + yyerror("invalid expression (bad type)"); + }else if (i_tmp!=RV_INT){ + yyerror("invalid expression type, int expected\n"); + }else + $$=$1; + } +; +single_case: + CASE ct_rval COLON actions { + $$=0; + if ($2==0) yyerror ("bad case label"); + else if (($$=mk_case_stm($2, $4))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | CASE ct_rval COLON { + $$=0; + if ($2==0) yyerror ("bad case label"); + else if (($$=mk_case_stm($2, 0))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | DEFAULT COLON actions { + if (($$=mk_case_stm(0, $3))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | DEFAULT COLON { + if (($$=mk_case_stm(0, 0))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | CASE error { $$=0; yyerror("bad case label"); } + | CASE ct_rval COLON error { $$=0; yyerror ("bad case body"); } +; +case_stms: + case_stms single_case { + $$=$1; + if ($2==0) yyerror ("bad case"); + if ($$){ + *($$->append)=$2; + if (*($$->append)!=0) + $$->append=&((*($$->append))->next); + } + } + | single_case { + $$=$1; + if ($1==0) yyerror ("bad case"); + else $$->append=&($$->next); + } +; +switch_cmd: + SWITCH rval_expr LBRACE case_stms RBRACE { + $$=0; + if ($2==0) yyerror("bad expression in switch(...)"); + else if ($4==0) yyerror ("bad switch body"); + else{ + $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, $4); + if ($$==0) { + yyerror("internal error"); + YYABORT; + } + } + } + | SWITCH rval_expr LBRACE RBRACE { + $$=0; + warn("empty switch()"); + if ($2==0) yyerror("bad expression in switch(...)"); + else{ + /* it might have sideffects, so leave it for the optimizer */ + $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, 0); + if ($$==0) { + yyerror("internal error"); + YYABORT; + } + } + } + | SWITCH error { $$=0; yyerror ("bad expression in switch(...)"); } + | SWITCH rval_expr LBRACE error RBRACE + {$$=0; yyerror ("bad switch body"); } +; + /* class_id: LBRACK ATTR_USER RBRACK { $$ = AVP_CLASS_USER; } | LBRACK ATTR_DOMAIN RBRACK { $$ = AVP_CLASS_DOMAIN; } @@ -2763,6 +2866,23 @@ static void free_socket_id_lst(struct socket_id* lst) } } + +static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a) +{ + struct case_stms* s; + s=pkg_malloc(sizeof(*s)); + if (s==0) { + LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); + } else { + memset(s, 0, sizeof(*s)); + s->ct_rve=ct; + s->actions=a; + s->next=0; + s->append=0; + } + return s; +} + /* int main(int argc, char ** argv) { diff --git a/route_struct.h b/route_struct.h index 76aac25..e87b2d0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -70,7 +70,9 @@ enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, - IF_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, + IF_T, SWITCH_T /* only until fixup*/, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, + MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, LEN_GT_T, PREFIX_T, STRIP_T,STRIP_TAIL_T, @@ -96,7 +98,9 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, SELECT_ST, PVAR_ST, LVAL_ST, RVE_ST, - RETCODE_ST}; + RETCODE_ST, CASE_ST, + BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST +}; /* run flags */ #define EXIT_R_F 1 diff --git a/switch.h b/switch.h new file mode 100644 index 0000000..4c9f78b --- /dev/null +++ b/switch.h @@ -0,0 +1,60 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * /home/andrei/sr.git/switch.h + */ +/* + * History: + * -------- + * 2009-02-02 initial version (andrei) +*/ + +#ifndef __switch_h +#define __switch_h + +#include "route_struct.h" + +struct case_stms{ + struct rval_expr* ct_rve; + struct action* actions; + struct case_stms* next; + struct case_stms** append; + int int_label; + int is_default; +}; + + +struct switch_cond_table{ + int n; /**< size */ + int* cond; /**< int labels array */ + struct action** jump; /**< jump points array */ + struct action* def; /**< default jump */ +}; + + +struct switch_jmp_table{ + int first; /**< first int label in the jump table */ + int last; /**< last int label in the jump table */ + struct action** tbl; /**< jmp table [v-first] iff first<=v<=last */ + struct switch_cond_table rest; /**< normal cond. table for the rest */ +}; + + +#endif /*__switch_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ [View Less]

4 10

git:andrei/switch: script engine: switch() fixup and optimizations
by Andrei Pelinescu-Onciul 04 Feb '09

04 Feb '09

Module: sip-router Branch: andrei/switch Commit: 4221104f5cb3f60866d13ceedf05f00c62c0160f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4221104… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 4 20:48:04 2009 +0100 script engine: switch() fixup and optimizations - optimize/transform switch() statements into: - jump tables (if small enough) - condition tables - … [View More]

1 0

git:andrei/switch: expr engine: minor additions
by Andrei Pelinescu-Onciul 04 Feb '09

04 Feb '09

Module: sip-router Branch: andrei/switch Commit: 2d6686519542ee12bedbe085500ed3cd6f87f280 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d66865… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 4 19:20:53 2009 +0100 expr engine: minor additions - added rve_has_side_effects(), preliminary version (for now is equivalent with !rve_is_constant()) - exported rve_destroy() --- … [View More]

1 0

FOSDEM Meeting - Feb 7, 2009, 19:30, Le Mess
by Daniel-Constantin Mierla 04 Feb '09

04 Feb '09

Hello, the place for the social networking event at FOSDEM 2009 has been selected: Le Mess http://www2.resto.be/mess/home-en.htm Louis Schmidtlaan - Av. Louis Schmidt 1 1040 BRUXELLES (ETTERBEEK) It is in walking distance from FOSDEM site. More details at: http://www.kamailio.org/mos/view/News/NewsItem/FOSDEM-2009---Social-Network… If you haven't confirmed your participation, you can still join, subject of available free places in the restaurant. See you Saturday! Cheers, Daniel -- … [View More]

1 0

FOSDEM 2009 - Kamailio (OpenSER)/SIP-Router Social Networking Event
by Daniel-Constantin Mierla 02 Feb '09

02 Feb '09

Hello, a bunch of us will be at FOSDEM 2009: http://fosdem.org/2009/ Therefore is the opportunity for first Social Networking Event in 2009. Everyone interested in Kamailio (OpenSER), SIP Router, SER, SIP and not only are invited to join -- participation is free, everybody pays for its expenses. The event is very likely to be a dinner on Saturday evening, Feb 7, 2009. So far, from Kamailio (OpenSER) community you can meet there: - Henning Westerholt - http://www.kamailio.org/mos/view/… [View More]

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009