sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: pv: assignment with $null deletes the avp
by Daniel-Constantin Mierla 15 May '09

15 May '09

Module: sip-router Branch: master Commit: e6fef16a0438edbb00b88a752f0f340e2d6b9e52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6fef16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 15 14:42:21 2009 +0300 pv: assignment with $null deletes the avp - $avp(x) = $null; - equivalent of $avp(x) = null; in K - $(avp(x)[*]) = $null; - equivalent of $avp(x) := null; in K --- modules_k/pv/pv_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 2d9c914..6571876 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1536,7 +1536,7 @@ int pv_set_avp(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) destroy_avps(name_type, avp_name, 1);

1 0

git:master: @ruri forces parsing the URI.
by Miklos Tirpak 15 May '09

15 May '09

Module: sip-router Branch: master Commit: 3e004ccaddd1d9a671dac012021116c7bda2c733 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e004cc… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri May 15 10:04:50 2009 +0200 @ruri forces parsing the URI. The entire RURI value is rearly used as it is, rather its subparts are important. The result of this patch is that for example @ruri.user and @ruri.host cause one parsing instead of two when the RURI has not been parsed yet. --- select_core.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/select_core.c b/select_core.c index 8f7c0f5..0ecd1c9 100644 --- a/select_core.c +++ b/select_core.c @@ -69,6 +69,16 @@ int select_ruri(str* res, select_t* s, struct sip_msg* msg) { + /* Parse the RURI even if it is not needed right now + * because the nested select calls can access the + * parsed URI in this case. + * Go ahead even if the parsing fails, so the + * value of the broken RURI can be accessed at least. + * Subsequent select calls will fail when they try to parse + * the URI anyway. (Miklos) + */ + parse_sip_msg_uri(msg); + if (msg->parsed_uri_ok) select_uri_p = &msg->parsed_uri;

1 0

git:master: Avoid parsing the Request URI when it is not necessary.
by Miklos Tirpak 15 May '09

15 May '09

Module: sip-router Branch: master Commit: 8321667b05da5c3f71b9835f993efcea66e88147 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8321667… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri May 15 09:42:29 2009 +0200 Avoid parsing the Request URI when it is not necessary. When @ruri.user was executed, the first select call set the value of the URI in str format regardless of whether or not it had already been parsed. The second function call took the str value, and parsed the URI to get its user part. This patch introduces a global pointer variable that can be set to the already parsed URI being processed. Any nested select function can check this pointer and access the parsed URI if possible. --- select.c | 10 ++++ select.h | 7 +++ select_core.c | 138 ++++++++++++++++++++++++++++++++++++--------------------- 3 files changed, 104 insertions(+), 51 deletions(-) diff --git a/select.c b/select.c index 13c6dc7..1593c64 100644 --- a/select.c +++ b/select.c @@ -60,6 +60,13 @@ static select_table_t *select_list = &select_core_table; */ int select_level = 0; +/* pointer to the SIP uri beeing processed. + * Nested function calls can pass information to each + * other using this pointer. Only for performace reasons. + * (Miklos) + */ +struct sip_uri *select_uri_p = NULL; + /** parse a select identifier (internal version) * Parse select string into select structure s * moves pointer p to the first unused char. @@ -399,6 +406,9 @@ int run_select(str* res, select_t* s, struct sip_msg* msg) } DBG("Calling SELECT %p \n", s->f); + /* reset the uri pointer */ + select_uri_p = NULL; + /* save and restore the original select_level * because of the nested selects */ orig_level = select_level; diff --git a/select.h b/select.h index 23f4fa7..5b784eb 100644 --- a/select.h +++ b/select.h @@ -149,6 +149,13 @@ typedef struct select_table { */ extern int select_level; +/* pointer to the SIP uri beeing processed. + * Nested function calls can pass information to each + * other using this pointer. Only for performace reasons. + * (Miklos) + */ +extern struct sip_uri *select_uri_p; + /* * Lookup corresponding select function based on * the select parameters diff --git a/select_core.c b/select_core.c index 79b49ca..8f7c0f5 100644 --- a/select_core.c +++ b/select_core.c @@ -69,6 +69,9 @@ int select_ruri(str* res, select_t* s, struct sip_msg* msg) { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; + if (msg->first_line.type==SIP_REQUEST) { if(msg->new_uri.s) { RETURN0_res(msg->new_uri); @@ -94,9 +97,15 @@ int select_next_hop(str* res, select_t* s, struct sip_msg* msg) RETURN0_res(msg->dst_uri); } else if(msg->new_uri.s) { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; RETURN0_res(msg->new_uri); } else { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; + else if (msg->parsed_orig_ruri_ok) + select_uri_p = &msg->parsed_orig_ruri; RETURN0_res(msg->first_line.u.request.uri); } } @@ -691,30 +700,36 @@ static struct sip_uri uri; int select_uri_type(str* res, select_t* s, struct sip_msg* msg) { - trim(res); - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + trim(res); + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.type==ERROR_URI_T) + if (select_uri_p->type==ERROR_URI_T) return -1; - uri_type_to_str(uri.type, res); + uri_type_to_str(select_uri_p->type, res); return 0; } int select_uri_user(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.flags & URI_USER_NORMALIZE) { - if (!(res->s=get_static_buffer(uri.user.len))) + if (select_uri_p->flags & URI_USER_NORMALIZE) { + if (!(res->s=get_static_buffer(select_uri_p->user.len))) return -1; - if ((res->len=normalize_tel_user(res->s, (&uri.user)))==0) + if ((res->len=normalize_tel_user(res->s, (&select_uri_p->user)))==0) return 1; return 0; } - RETURN0_res(uri.user); + RETURN0_res(select_uri_p->user); } /* search for a parameter with "name" @@ -757,23 +772,26 @@ int select_uri_rn_user(str* res, select_t* s, struct sip_msg* msg) int ret; str val; - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } /* search for the "rn" parameter */ - if ((ret = search_param(&uri.params, "rn", 2, &val)) != 0) + if ((ret = search_param(&select_uri_p->params, "rn", 2, &val)) != 0) goto done; - if (uri.sip_params.s != uri.params.s) { + if (select_uri_p->sip_params.s != select_uri_p->params.s) { /* check also the original sip: URI parameters */ - if ((ret = search_param(&uri.sip_params, "rn", 2, &val)) != 0) + if ((ret = search_param(&select_uri_p->sip_params, "rn", 2, &val)) != 0) goto done; } - if ((uri.flags & URI_USER_NORMALIZE) == 0) - RETURN0_res(uri.user); + if ((select_uri_p->flags & URI_USER_NORMALIZE) == 0) + RETURN0_res(select_uri_p->user); /* else normalize the user name */ - val = uri.user; + val = select_uri_p->user; done: if (ret < 0) return -1; /* error */ @@ -787,26 +805,35 @@ done: int select_uri_pwd(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.passwd); + RETURN0_res(select_uri_p->passwd); } int select_uri_host(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.host); + RETURN0_res(select_uri_p->host); } int select_uri_port(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.port); + RETURN0_res(select_uri_p->port); } int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) @@ -814,31 +841,34 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) char* p; int size; - if (parse_uri(res->s,res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (!uri.host.len) + if (!select_uri_p->host.len) return -1; - if (uri.port.len) { - res->s=uri.host.s; - res->len=uri.host.len+uri.port.len+1; + if (select_uri_p->port.len) { + res->s=select_uri_p->host.s; + res->len=select_uri_p->host.len+select_uri_p->port.len+1; return 0; } - size=uri.host.len+5; + size=select_uri_p->host.len+5; if (!(p = get_static_buffer(size))) return -1; - strncpy(p, uri.host.s, uri.host.len); - switch (uri.type) { + strncpy(p, select_uri_p->host.s, select_uri_p->host.len); + switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: - strncpy(p+uri.host.len, ":5061", 5); + strncpy(p+select_uri_p->host.len, ":5061", 5); break; case SIP_URI_T: case TEL_URI_T: - strncpy(p+uri.host.len, ":5060", 5); + strncpy(p+select_uri_p->host.len, ":5060", 5); break; case ERROR_URI_T: return -1; @@ -850,13 +880,16 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) int select_uri_proto(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.proto != PROTO_NONE) { - proto_type_to_str(uri.proto, res); + if (select_uri_p->proto != PROTO_NONE) { + proto_type_to_str(select_uri_p->proto, res); } else { - switch (uri.type) { + switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: proto_type_to_str(PROTO_TLS, res); @@ -879,20 +912,23 @@ int select_uri_params(str* res, select_t* s, struct sip_msg* msg) return select_any_params(res, s, msg); } - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } if (s->param_offset[select_level+1]-s->param_offset[select_level]==1) - RETURN0_res(uri.params); + RETURN0_res(select_uri_p->params); - *res=uri.params; + *res=select_uri_p->params; ret = select_any_params(res, s, msg); if ((ret < 0) - && (uri.sip_params.s != NULL) - && (uri.sip_params.s != uri.params.s) + && (select_uri_p->sip_params.s != NULL) + && (select_uri_p->sip_params.s != select_uri_p->params.s) ) { /* Search also in the original sip: uri parameters. */ - *res = uri.sip_params; + *res = select_uri_p->sip_params; ret = select_any_params(res, s, msg); } return ret;

1 0

git:master: * Added missing "goto err; " in a mod_init() error case.
by Juha Heinanen 15 May '09

15 May '09

Module: sip-router Branch: master Commit: 904d8378c9c3f1b8b564cd7ae11bed1cd79116c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=904d837… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 15 10:35:41 2009 +0300 * Added missing "goto err;" in a mod_init() error case. --- modules/lcr/lcr_mod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 41a3c43..52e2cf5 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -612,6 +612,7 @@ static int mod_init(void) gws = (struct gw_info **)shm_malloc(sizeof(struct gw_info *)); if (gws == 0) { LM_ERR("no memory for gw table pointer\n"); + goto err; } gws_1[0].ip_addr = 0; /* Number of gateways in table */ *gws = gws_1;

1 0

git:master: pv: assignment to an avp with index '*'
by Daniel-Constantin Mierla 15 May '09

15 May '09

Module: sip-router Branch: master Commit: 2ce347b890d6bb9291e774c30a34e43818476876 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ce347b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 15 10:25:58 2009 +0300 pv: assignment to an avp with index '*' - $(avp(name)[*]) = val; - overwrites all avps with same name - equivalent of $avp(name) := val; in K --- modules_k/pv/pv_core.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 0203920..2d9c914 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1514,6 +1514,8 @@ int pv_set_avp(struct sip_msg* msg, pv_param_t *param, int_str avp_val; int flags; unsigned short name_type; + int idxf; + int idx; if(param==NULL) { @@ -1521,20 +1523,28 @@ int pv_set_avp(struct sip_msg* msg, pv_param_t *param, return -1; } + /* get the name */ if(pv_get_avp_name(msg, param, &avp_name, &name_type)!=0) { LM_ALERT("BUG in getting dst AVP name\n"); goto error; } + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return -1; + } + if(val == NULL) { - if(op == ASSIGN_T) + if(idxf == PV_IDX_ALL) destroy_avps(name_type, avp_name, 1); else destroy_avps(name_type, avp_name, 0); return 0; } - if(op == ASSIGN_T) + if(idxf == PV_IDX_ALL) destroy_avps(name_type, avp_name, 1); flags = name_type; if(val->flags&PV_TYPE_INT)

1 0

git:master: core script engine: support for rval expr. in return/drop
by Andrei Pelinescu-Onciul 14 May '09

14 May '09

Module: sip-router Branch: master Commit: ee308afd99cfb80d8a9787f6dfe7fb0935cdb386 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee308af… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 14 21:42:46 2009 +0200 core script engine: support for rval expr. in return/drop --- action.c | 20 ++++++++++++++++---- route.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index f99079a..9f89ac6 100644 --- a/action.c +++ b/action.c @@ -135,10 +135,22 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; switch ((unsigned char)a->type){ case DROP_T: - if (a->val[0].type==RETCODE_ST) - ret=h->last_retcode; - else - ret=(int) a->val[0].u.number; + switch(a->val[0].type){ + case NUMBER_ST: + ret=(int) a->val[0].u.number; + break; + case RVE_ST: + rve=(struct rval_expr*)a->val[0].u.data; + rval_expr_eval_int(h, msg, &ret, rve); + break; + case RETCODE_ST: + ret=h->last_retcode; + break; + default: + BUG("unexpected subtype %d in DROP_T\n", + a->val[0].type); + ret=0; + } h->run_flags|=(unsigned int)a->val[1].u.number; break; case FORWARD_T: diff --git a/route.c b/route.c index 8d8c7db..77adbfb 100644 --- a/route.c +++ b/route.c @@ -807,6 +807,43 @@ int fix_actions(struct action* a) return ret; } break; + case DROP_T: + /* only RVEs need fixing for drop/return/break */ + if (t->val[0].type!=RVE_ST) + break; + 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 drop/return" + " expression\n"); + return E_BUG; + } + break; case ASSIGN_T: case ADD_T: if (t->val[0].type !=LVAL_ST) {

1 0

git:master: core script parser: allow expressions in return/drop
by Andrei Pelinescu-Onciul 14 May '09

14 May '09

Module: sip-router Branch: master Commit: 6c51c69fc131d4fc30562b7990bc9c3458c2ec4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c51c69… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 14 21:36:59 2009 +0200 core script parser: allow expressions in return/drop Changed drop and return to allow expressions. E.g.: return $foo+2 --- cfg.y | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/cfg.y b/cfg.y index 69f6826..6eec3b1 100644 --- a/cfg.y +++ b/cfg.y @@ -529,7 +529,7 @@ static int case_check_default(struct case_stms* stms); %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 while_cmd +%type <action> switch_cmd while_cmd ret_cmd %type <case_stms> single_case case_stms %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet @@ -1862,6 +1862,7 @@ action: | if_cmd {$$=$1;} | switch_cmd {$$=$1;} | while_cmd { $$=$1; } + | ret_cmd SEMICOLON { $$=$1; } | assign_action SEMICOLON {$$=$1;} | SEMICOLON /* null action */ {$$=0;} | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } @@ -2562,15 +2563,6 @@ cmd: | SEND_TCP LPAREN ip COMMA NUMBER RPAREN { $$=mk_action(SEND_TCP_T, 2, IP_ST, (void*)$3, NUMBER_ST, (void*)$5); } | SEND_TCP error { $$=0; yyerror("missing '(' or ')' ?"); } | SEND_TCP LPAREN error RPAREN { $$=0; yyerror("bad send_tcp argument"); } - | DROP LPAREN RPAREN {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); } - | DROP LPAREN NUMBER RPAREN {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$3, NUMBER_ST, (void*)EXIT_R_F); } - | DROP NUMBER {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)EXIT_R_F); } - | DROP RETCODE {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)EXIT_R_F); } - | DROP {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); } - | 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*)BREAK_R_F); } | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)(L_DBG+1), STRING_ST, $3); } | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); } @@ -2822,6 +2814,29 @@ func_param: } } ; + +ret_cmd: + DROP LPAREN RPAREN { + $$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); + } + | DROP rval_expr { + $$=mk_action(DROP_T, 2, RVE_ST, $2, NUMBER_ST, (void*)EXIT_R_F); + } + | DROP { + $$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); + } + | RETURN { + $$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, + (void*)RETURN_R_F); + } + | RETURN rval_expr { + $$=mk_action(DROP_T, 2, RVE_ST, $2, NUMBER_ST, (void*)RETURN_R_F); + } + | BREAK { + $$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)BREAK_R_F); + } + ; + %% extern int line;

1 0

git:master: core script parsing: better error & warning for while() & switch()
by Andrei Pelinescu-Onciul 14 May '09

14 May '09

Module: sip-router Branch: master Commit: 84d5835727f9483b7173574390ff955ba575afcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84d5835… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 14 18:10:37 2009 +0200 core script parsing: better error & warning for while() & switch() - while() checks in-line with the if() checks (warnings on non-int, parse error on invalid expression). - switch() - throw a parse error if the switch() expression or body is invalid (type-wise) --- cfg.y | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/cfg.y b/cfg.y index a0b13d6..69f6826 100644 --- a/cfg.y +++ b/cfg.y @@ -1958,15 +1958,21 @@ case_stms: 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 if (case_check_default($4)!=0) + if ($2==0){ + yyerror("bad expression in switch(...)"); + YYERROR; + }else if ($4==0){ + yyerror ("bad switch body"); + YYERROR; + }else if (case_check_default($4)!=0){ yyerror_at(&$2->fpos, "bad switch(): too many " "\"default:\" labels\n"); - else if (case_check_type($4)!=0) + YYERROR; + }else if (case_check_type($4)!=0){ yyerror_at(&$2->fpos, "bad switch(): mixed integer and" " string/RE cases not allowed\n"); - else{ + YYERROR; + }else{ $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, $4); if ($$==0) { yyerror("internal error"); @@ -1977,8 +1983,10 @@ switch_cmd: | SWITCH rval_expr LBRACE RBRACE { $$=0; warn("empty switch()"); - if ($2==0) yyerror("bad expression in switch(...)"); - else{ + if ($2==0){ + yyerror("bad expression in switch(...)"); + YYERROR; + }else{ /* it might have sideffects, so leave it for the optimizer */ $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, 0); if ($$==0) { @@ -1994,12 +2002,13 @@ switch_cmd: while_cmd: WHILE rval_expr stm { - if ($2){ - if (rve_is_constant($2)) - warn_at(&$2->fpos, "constant value in while(...)"); - }else + if ($2 && rval_expr_int_check($2)>=0){ + warn_ct_rve($2, "while"); + $$=mk_action( WHILE_T, 2, RVE_ST, $2, ACTIONS_ST, $3); + }else{ yyerror_at(&$2->fpos, "bad while(...) expression"); - $$=mk_action( WHILE_T, 2, RVE_ST, $2, ACTIONS_ST, $3); + YYERROR; + } } ;

1 0

git:master: test: port carrierroute DB load test to sr
by Henning Westerholt 14 May '09

14 May '09

Module: sip-router Branch: master Commit: a093e8ec5f454af62ff1c72356748af69153d0d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a093e8e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:24:57 2009 +0200 test: port carrierroute DB load test to sr --- test/unit/13.cfg | 38 +++++++++++++++++--------------------- test/unit/13.sh | 10 +++------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/test/unit/13.cfg b/test/unit/13.cfg index f426d11..509d3f6 100644 --- a/test/unit/13.cfg +++ b/test/unit/13.cfg @@ -1,32 +1,28 @@ -debug=3 -mpath="../modules" -loadmodule "sl/sl.so" -loadmodule "tm/tm.so" -loadmodule "xlog/xlog.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "carrierroute/carrierroute.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +debug=2 +loadpath "../../modules_k" +loadmodule "sl" +loadmodule "../../modules/tm/tm.so" +loadmodule "xlog" +loadmodule "maxfwd" +loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="domain=s:10" -avp_aliases="carrier=s:11" -avp_aliases="host=s:12" - route{ # initial sanity checks if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); return; }; - if (msg:len > max_len) { - sl_send_reply("513", "Message too big"); - return; - }; - cr_user_carrier("$fU", "$fd", "$avp(carrier)"); +# if (msg:len > max_len) { +# sl_send_reply("513", "Message too big"); +# return; +# }; + cr_user_carrier("$fU", "$fd", "$avp(s:11)"); $avp(domain)="start"; - if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) { + if (!cr_route("$avp(carrier)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { xlog("L_ERR", "cr_route failed\n"); exit; } @@ -38,11 +34,11 @@ route{ failure_route[1] { revert_uri(); - if (!cr_next_domain("$avp(carrier)", "$avp(domain)", "$rU", "$avp(host)", "$T_reply_code", "$avp(domain)")) { + if (!cr_next_domain("$avp(s:11)", "$avp(s:10)", "$rU", "$avp(s:12)", "$T_reply_code", "$avp(s:10)")) { xlog("L_ERR", "cr_next_domain failed\n"); exit; } - if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) { + if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { xlog("L_ERR", "cr_route failed\n"); exit; } diff --git a/test/unit/13.sh b/test/unit/13.sh index 16a7f71..23ac6df 100755 --- a/test/unit/13.sh +++ b/test/unit/13.sh @@ -32,7 +32,7 @@ fi ; cp $CFG $CFG.bak # setup config -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG # setup database @@ -65,18 +65,16 @@ mask, next_domain) values ('3', '2', '1', '49', 'host1.local', '503', '0', '0', $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags, mask, next_domain) values ('4', '2', '2', '49', 'host1.local', '5..', '0', '0', '3');" -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -124,8 +122,6 @@ $MYSQL "delete from carrierfailureroute where carrier=1;" $MYSQL "delete from carrierfailureroute where carrier=2;" $MYSQL "delete from carrierfailureroute where carrier=3;" -cd ../test - mv $CFG.bak $CFG rm $TMPFILE

1 0

git:master: test: port carrierroute config load test to sr, add missing tmx mod to test 13
by Henning Westerholt 14 May '09

14 May '09

Module: sip-router Branch: master Commit: 658010d634f520d250978ee57839bdfc5f03f6eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=658010d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:25:59 2009 +0200 test: port carrierroute config load test to sr, add missing tmx mod to test 13 --- test/unit/13.cfg | 5 +---- test/unit/14.cfg | 22 +++++++--------------- test/unit/14.sh | 10 +++------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/test/unit/13.cfg b/test/unit/13.cfg index 509d3f6..aac3cab 100644 --- a/test/unit/13.cfg +++ b/test/unit/13.cfg @@ -6,6 +6,7 @@ loadmodule "xlog" loadmodule "maxfwd" loadmodule "../../modules/carrierroute/carrierroute.so" loadmodule "pv" +loadmodule "tmx" loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") @@ -16,10 +17,6 @@ route{ sl_send_reply("483","Too Many Hops"); return; }; -# if (msg:len > max_len) { -# sl_send_reply("513", "Message too big"); -# return; -# }; cr_user_carrier("$fU", "$fd", "$avp(s:11)"); $avp(domain)="start"; if (!cr_route("$avp(carrier)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { diff --git a/test/unit/14.cfg b/test/unit/14.cfg index bb121ca..dde83a0 100644 --- a/test/unit/14.cfg +++ b/test/unit/14.cfg @@ -1,27 +1,19 @@ -mpath="../modules" -loadmodule "sl/sl.so" -loadmodule "xlog/xlog.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "carrierroute/carrierroute.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +loadpath "../../modules_k" +loadmodule "sl" +loadmodule "xlog" +loadmodule "maxfwd" +loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="domain=s:10" -avp_aliases="carrier=s:11" -avp_aliases="host=s:12" - route{ # initial sanity checks if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); return; }; - if (msg:len > max_len) { - sl_send_reply("513", "Message too big"); - return; - }; if (method == "REGISTER") { if(!cr_route("default", "register", "$rU", "$rU", "call_id", "$avp(s:30)")) { sl_send_reply("403", "Not allowed"); diff --git a/test/unit/14.sh b/test/unit/14.sh index 1db9d4f..b4fdc2f 100755 --- a/test/unit/14.sh +++ b/test/unit/14.sh @@ -31,19 +31,17 @@ fi ; cp $CFG $CFG.bak # setup config -echo "modparam(\"carrierroute\", \"config_file\", \"`pwd`/../test/carrierroute.cfg\")" >> $CFG +echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute.cfg\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -78,8 +76,6 @@ fi ; $KILL -cd ../test - mv $CFG.bak $CFG rm -f $TMPFILE

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009