sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:andrei/type_conversion: script parsing: fix bug in expression error checking

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 36d4ed7ce18f025bc69fb24e1820bcb8ec56984f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36d4ed7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 14:02:16 2009 +0200 script parsing: fix bug in expression error checking - fixed core dump when attempting to continuing script checking after an expression parse error. --- cfg.y | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/cfg.y b/cfg.y index df3056d..f703238 100644 --- a/cfg.y +++ b/cfg.y @@ -1565,7 +1565,10 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { exp: rval_expr { - if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + if ($1==0){ + yyerror("invalid expression"); + $$=0; + }else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ yyerror("invalid expression"); $$=0; }else if (i_tmp!=RV_INT && i_tmp!=RV_NONE){ @@ -2220,9 +2223,9 @@ rval: intno {$$=mk_rve_rval(RV_INT, (void*)$1); } | fcmd {$$=mk_rve_rval(RV_ACTION_ST, $1); } | exp_elem { $$=mk_rve_rval(RV_BEXPR, $1); } | LBRACE actions RBRACE {$$=mk_rve_rval(RV_ACTION_ST, $2); } - | LBRACE error RBRACE { yyerror("bad command block"); } + | LBRACE error RBRACE { $$=0; yyerror("bad command block"); } | LPAREN assign_action RPAREN {$$=mk_rve_rval(RV_ACTION_ST, $2); } - | LPAREN error RPAREN { yyerror("bad expression"); } + | LPAREN error RPAREN { $$=0; yyerror("bad expression"); } ; @@ -2240,10 +2243,11 @@ rve_op: PLUS { $$=RVE_PLUS_OP; } */ rval_expr: rval { $$=$1; - if ($$==0){ + /* if ($$==0){ yyerror("out of memory\n"); YYABORT; } + */ } | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } | rval_expr PLUS rval_expr {$$=mk_rve2(RVE_PLUS_OP, $1, $3); } @@ -2261,7 +2265,7 @@ rval_expr: rval { $$=$1; | STRLEN LPAREN rval_expr RPAREN { $$=mk_rve1(RVE_STRLEN_OP, $3);} | STREMPTY LPAREN rval_expr RPAREN {$$=mk_rve1(RVE_STREMPTY_OP, $3);} | DEFINED rval_expr { $$=mk_rve1(RVE_DEFINED_OP, $2);} - | rve_un_op %prec NOT error { yyerror("bad expression"); } + | rve_un_op %prec NOT error { $$=0; yyerror("bad expression"); } | rval_expr PLUS error { yyerror("bad expression"); } | rval_expr MINUS error { yyerror("bad expression"); } | rval_expr STAR error { yyerror("bad expression"); } @@ -2274,9 +2278,9 @@ rval_expr: rval { $$=$1; { yyerror("bad expression"); } | rval_expr LOG_AND error { yyerror("bad expression"); } | rval_expr LOG_OR error { yyerror("bad expression"); } - | STRLEN LPAREN error RPAREN { yyerror("bad expression"); } - | STREMPTY LPAREN error RPAREN { yyerror("bad expression"); } - | DEFINED error { yyerror("bad expression"); } + | STRLEN LPAREN error RPAREN { $$=0; yyerror("bad expression"); } + | STREMPTY LPAREN error RPAREN { $$=0; yyerror("bad expression"); } + | DEFINED error { $$=0; yyerror("bad expression"); } ; assign_action: lval assign_op rval_expr { $$=mk_action($2, 2, LVAL_ST, $1, @@ -2904,13 +2908,19 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, if ((rve1==0) || (rve2==0)) return 0; + bad_rve=0; + bad_t=0; + exp_t=0; cfg_pos_join(&pos, &rve1->fpos, &rve2->fpos); ret=mk_rval_expr2(op, rve1, rve2, &pos); if (ret && (rve_check_type(&type, ret, &bad_rve, &bad_t, &exp_t)!=1)){ - yyerror_at(&pos, "bad expression: type mismatch:" + if (bad_rve) + yyerror_at(&pos, "bad expression: type mismatch:" " %s instead of %s at (%d,%d)", rval_type_name(bad_t), rval_type_name(exp_t), bad_rve->fpos.s_line, bad_rve->fpos.s_col); + else + yyerror("BUG: unexpected null \"bad\" expression\n"); } return ret; }

15 years, 7 months

git:andrei/type_conversion: core expr eval: various fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: e9249a149a3dca35c8f7f0b3c1f72343cd1a9c30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9249a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 13:55:01 2009 +0200 core expr eval: various fixes - fix pvars type evaluated to STRING almost always (when they had PV_VAL_STR). - fix undefined not properly propagated for avps (typo) which caused some comparsion to behave in unexpected way (e.g. $undef_avp != $undef_avp was true). - fix <undef>+something (used to produce an error, now is equivalent to "" + something). --- rvalue.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/rvalue.c b/rvalue.c index 9a74cda..55456a1 100644 --- a/rvalue.c +++ b/rvalue.c @@ -314,18 +314,18 @@ inline static enum rval_type rval_get_btype(struct run_act_ctx* h, } memset(pv, 0, sizeof(tmp_pval)); if (likely(pv_get_spec_value(msg, &rv->v.pvs, pv)==0)){ - if (pv->flags & PV_VAL_STR){ + if (pv->flags & PV_TYPE_INT){ if (likely(val_cache!=0)) - val_cache->val_type=RV_STR; + val_cache->val_type=RV_INT; else pv_value_destroy(pv); - return RV_STR; - }else if (pv->flags & PV_TYPE_INT){ + return RV_INT; + }else if (pv->flags & PV_VAL_STR){ if (likely(val_cache!=0)) - val_cache->val_type=RV_INT; + val_cache->val_type=RV_STR; else pv_value_destroy(pv); - return RV_INT; + return RV_STR; }else{ pv_value_destroy(pv); if (likely(val_cache!=0)) @@ -339,7 +339,7 @@ inline static enum rval_type rval_get_btype(struct run_act_ctx* h, } break; case RV_AVP: - if (likely(val_cache && val_cache==RV_CACHE_EMPTY)){ + if (likely(val_cache && val_cache->cache_type==RV_CACHE_EMPTY)){ ptype=&val_cache->val_type; avpv=&val_cache->c.avp_val; val_cache->cache_type=RV_CACHE_AVP; @@ -718,6 +718,11 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, } break; case RVE_NONE_OP: + default: + BUG("unexpected rve op %d\n", rve->op); + if (bad_rve) *bad_rve=rve; + if (bad_t) *bad_t=RV_NONE; + if (exp_t) *exp_t=RV_STR; break; } return 0; @@ -2041,6 +2046,7 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_STR: + case RV_NONE: rv2=rval_expr_eval(h, msg, rve->right.rve); if (unlikely(rv2==0)){ ERR("rval expression evaluation failed\n"); @@ -2051,9 +2057,6 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, break; default: BUG("rv unsupported basic type %d\n", type); - case RV_NONE: - rval_cache_clean(&c1); - goto error; } rval_cache_clean(&c1); break;

15 years, 7 months

git:master: tm: handling of branch flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cd9460b0d8023c43348bce58fe38ef3ce9a686cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd9460b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 20:40:26 2009 +0200 tm: handling of branch flags - save/restore branch upon execution of tm specific routes --- modules/tm/h_table.h | 3 +++ modules/tm/t_fwd.c | 9 +++++++++ modules/tm/t_reply.c | 9 +++++++-- modules/tm/t_reply.h | 2 +- modules/tm/t_suspend.c | 4 +++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 37aecc9..d38e3d6 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -70,6 +70,7 @@ #include "../../md5utils.h" #include "../../usr_avp.h" #include "../../timer.h" +#include "../../flags.h" #include "../../atomic_ops.h" #include "../../hash_func.h" #include "config.h" @@ -85,6 +86,7 @@ struct entry; struct cell; struct timer; struct retr_buf; +struct ua_client; #include "../../mem/shm_mem.h" #include "lock.h" @@ -224,6 +226,7 @@ typedef struct ua_client /* internal flags per tm uac */ unsigned int flags; #endif + flag_t branch_flags; #ifdef WITH_AS_SUPPORT /** * Resent for every rcvd 2xx reply. diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 9344e6f..46ddbfb 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -450,6 +450,7 @@ int add_uac( struct cell *t, struct sip_msg *request, str *uri, str* next_hop, else if(len==2) t->uac[branch].flags = TM_UAC_FLAG_RR|TM_UAC_FLAG_R2; #endif + getbflagsval(0, &t->uac[branch].branch_flags); membar_write(); /* to allow lockless ops (e.g. which_cancel()) we want to be sure everything above is fully written before updating branches no. */ @@ -1005,6 +1006,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , int lock_replies; str dst_uri; struct socket_info* si, *backup_si; + flag_t backup_bflags = 0; + flag_t bflags = 0; /* make -Wall happy */ @@ -1028,6 +1031,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , } backup_si = p_msg->force_send_socket; + getbflagsval(0, &backup_bflags); + /* if no more specific error code is known, use this */ lowest_ret=E_UNSPEC; /* branches added */ @@ -1072,6 +1077,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri.s, &dst_uri.len, &si))) { try_new++; p_msg->force_send_socket = si; + getbflagsval(get_branch_iterator(), &bflags); + setbflagsval(0, bflags); + branch_ret=add_uac( t, p_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, proxy, proto); @@ -1088,6 +1096,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , clear_branches(); p_msg->force_send_socket = backup_si; + setbflagsval(0, backup_bflags); /* don't forget to clear all branches processed so far */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5cb731f..e51142c 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -730,7 +730,7 @@ void faked_env( struct cell *t,struct sip_msg *msg) int fake_req(struct sip_msg *faked_req, - struct sip_msg *shmem_msg, int extra_flags) + struct sip_msg *shmem_msg, int extra_flags, struct ua_client *uac) { /* on_negative_reply faked msg now copied from shmem msg (as opposed * to zero-ing) -- more "read-only" actions (exec in particular) will @@ -771,6 +771,8 @@ int fake_req(struct sip_msg *faked_req, faked_req->dst_uri.len); faked_req->dst_uri.s[faked_req->dst_uri.len]=0; } + if(uac) setbflagsval(0, uac->branch_flags); + else setbflagsval(0, 0); return 1; error00: @@ -836,7 +838,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, return 1; } - if (!fake_req(&faked_req, shmem_msg, extra_flags)) { + if (!fake_req(&faked_req, shmem_msg, extra_flags, &t->uac[picked_branch])) { LOG(L_ERR, "ERROR: run_failure_handlers: fake_req failed\n"); return 0; } @@ -1953,10 +1955,13 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); + setbflagsval(0, uac->branch_flags); if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; + getbflagsval(0, &uac->branch_flags); + /* restore original avp list */ set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); set_avp_list( AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 65b4498..c385697 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -160,7 +160,7 @@ void rpc_reply(rpc_t* rpc, void* c); void faked_env( struct cell *t,struct sip_msg *msg); int fake_req(struct sip_msg *faked_req, - struct sip_msg *shmem_msg, int extra_flags); + struct sip_msg *shmem_msg, int extra_flags, struct ua_client *uac); void free_faked_req(struct sip_msg *faked_req, struct cell *t); diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 1c0b729..c1dc1b1 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -109,6 +109,7 @@ int t_continue(unsigned int hash_index, unsigned int label, struct cell *t; struct sip_msg faked_req; int branch; + struct ua_client *uac =NULL; if (t_lookup_ident(&t, hash_index, label) < 0) { LOG(L_ERR, "ERROR: t_continue: transaction not found\n"); @@ -136,13 +137,14 @@ int t_continue(unsigned int hash_index, unsigned int label, * a failure rute => deadlock, because both * of them need the reply lock to be held. */ t->uac[branch].last_received=500; + uac = &t->uac[branch]; } /* else Not a huge problem, fr timer will fire, but CANCEL will not be sent. last_received will be set to 408. */ /* fake the request and the environment, like in failure_route */ - if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */)) { + if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */, uac)) { LOG(L_ERR, "ERROR: t_continue: fake_req failed\n"); UNLOCK_REPLIES(t); return -1;

15 years, 7 months

git:master: core: wrapper to return branch iterator position

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 764bac17b074714c651d71654c6e7276a58ca5e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=764bac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 20:38:09 2009 +0200 core: wrapper to return branch iterator position --- dset.c | 4 ++++ dset.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 9409557..1770a3c 100644 --- a/dset.c +++ b/dset.c @@ -155,6 +155,10 @@ void init_branch_iterator(void) branch_iterator = 0; } +int get_branch_iterator(void) +{ + return branch_iterator; +} /* * Return the next branch from the dset diff --git a/dset.h b/dset.h index adba10e..175e0c3 100644 --- a/dset.h +++ b/dset.h @@ -53,6 +53,10 @@ int km_append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, */ void init_branch_iterator(void); +/* + * Return branch iterator position + */ +int get_branch_iterator(void); /* * Get the next branch in the current transaction

15 years, 7 months

git:master: kex: added km_append_branch

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8cf72b2de1ca86cafe7203433ff411e837d26dfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cf72b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:23:23 2009 +0200 kex: added km_append_branch - K compatible append_branch() function --- modules_k/kex/kex_mod.c | 5 +++ modules_k/kex/km_core.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/km_core.h | 30 +++++++++++++++++++++ 3 files changed, 102 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index e4960c0..9baa48d 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -31,6 +31,7 @@ #include "../../mod_fix.h" #include "flags.h" +#include "km_core.h" #include "mi_core.h" #include "core_stats.h" @@ -63,6 +64,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, 0, ANY_ROUTE }, + {"km_append_branch", (cmd_function)w_km_append_branch, 0, 0, + 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"km_append_branch", (cmd_function)w_km_append_branch, 1, fixup_spve_null, + 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0,0,0,0,0,0} }; diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c new file mode 100644 index 0000000..beebb35 --- /dev/null +++ b/modules_k/kex/km_core.c @@ -0,0 +1,67 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../dprint.h" +#include "../../dset.h" +#include "../../flags.h" +#include "../../mod_fix.h" +#include "km_core.h" + +int w_km_append_branch(struct sip_msg *msg, char *uri, str *sq) +{ + str suri; + int ret; + int q = Q_UNSPECIFIED; + flag_t branch_flags = 0; + + getbflagsval(0, &branch_flags); + if (uri==NULL) { + ret = km_append_branch(msg, 0, &msg->dst_uri, &msg->path_vec, + q, branch_flags, msg->force_send_socket); + /* reset all branch info */ + msg->force_send_socket = 0; + setbflagsval(0, 0); + if(msg->dst_uri.s!=0) + pkg_free(msg->dst_uri.s); + msg->dst_uri.s = 0; + msg->dst_uri.len = 0; + if(msg->path_vec.s!=0) + pkg_free(msg->path_vec.s); + msg->path_vec.s = 0; + msg->path_vec.len = 0; + } else { + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("cannot get the URI parameter\n"); + return -1; + } + ret = km_append_branch(msg, &suri, &msg->dst_uri, + &msg->path_vec, q, branch_flags, + msg->force_send_socket); + } + return ret; +} + diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h new file mode 100644 index 0000000..a668c71 --- /dev/null +++ b/modules_k/kex/km_core.h @@ -0,0 +1,30 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _KEX_CORE_H_ +#define _KEX_CORE_H_ + +#include "../../sr_module.h" + +int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); + +#endif

15 years, 7 months

git:master: registrar: update for getblagsval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fd4baa2b0cc91d215f9460ea91d369fb0febc344 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd4baa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:22:41 2009 +0200 registrar: update for getblagsval --- modules_k/registrar/save.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 6f7b747..13e0b49 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -278,7 +278,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, /* set flags */ ci.flags = _f; - getbflags(&ci.flags, 0); + getbflagsval(0, &ci.flags); /* get received */ if (path_received.len && path_received.s) {

15 years, 7 months

git:master: pv: update for getbflagsval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 52d3321b989c95c4f9f10693e1f77a5d18a58f18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52d3321… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:22:23 2009 +0200 pv: update for getbflagsval --- modules_k/pv/pv_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index ead4e78..0203920 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -483,7 +483,7 @@ int pv_get_bflags(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { flag_t flags; - if (getbflags(&flags, 0) < 0) { + if (getbflagsval(0, &flags) < 0) { ERR("pv_get_bflags: Error while obtainig values of branch flags\n"); return -1; } @@ -498,7 +498,7 @@ int pv_get_hexbflags(struct sip_msg *msg, pv_param_t *param, if(res==NULL) return -1; - if (getbflags(&flags, 0) < 0) { + if (getbflagsval(0, &flags) < 0) { ERR("pv_get_hexbflags: Error while obtaining values of branch flags\n"); return -1; }

15 years, 7 months

git:master: core: renamed getbflsgs to getblagsval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d02a166db83db71b587cd1252db0b4d4954e8c93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d02a166… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:21:04 2009 +0200 core: renamed getbflsgs to getblagsval - match the template of counterpart setblagsval - swapped the parameters --- dset.c | 2 +- dset.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dset.c b/dset.c index cbc636b..9409557 100644 --- a/dset.c +++ b/dset.c @@ -126,7 +126,7 @@ int resetbflag(unsigned int branch, flag_t flag) } -int getbflags(flag_t* res, unsigned int branch) +int getbflagsval(unsigned int branch, flag_t* res) { flag_t* flags; if (res == NULL) return -1; diff --git a/dset.h b/dset.h index e350238..adba10e 100644 --- a/dset.h +++ b/dset.h @@ -126,11 +126,11 @@ int isbflagset(unsigned int branch, flag_t flag); * * This function returns the value of all branch flags * combined in a single variable. - * @param res A pointer to a variable to store the result * @param branch Number of the branch (0 for the main Request-URI branch) + * @param res A pointer to a variable to store the result * @return 1 on success, -1 on failure */ -int getbflags(flag_t* res, unsigned int branch); +int getbflagsval(unsigned int branch, flag_t* res); /** * Set the value of all branch flags at once for a given branch.

15 years, 7 months

git:andrei/type_conversion: news: update (new operators, expr. eval behaviour a.s.o.)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: bb4d414574c35b1ba2c0497e19313b4cd000f775 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb4d414… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 19:54:03 2009 +0200 news: update (new operators, expr. eval behaviour a.s.o.) --- NEWS | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index fade123..ed1ab96 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,33 @@ $Id$ sip-router changes core: + - new operators eq, ne for string compares and ieq, ine for interger + compares. The names are not yet final (use them at your own risk). + Future version might use ==/!= only for ints (ieq/ine) and eq/ne for + strings (under debate). + They are almost equivalent to == or !=, but they force the conversion + of their operands (eq to string and ieq to int), allowing among other + things better type checking on startup and more optimizations. + Non equiv. examples: 0 == "" (true) is not equivalent to 0 eq "" + (false: it evaluates to "0" eq ""). "a" ieq "b" (true: (int)"a" is 0 + and (int)"b" is 0) is not equivalent to "a" == "b" (false). + Note: internally == and != are converted on startup to eq/ne/ieq/ine + whenever possible (both operand types can be safely determined at + start time and they are the same). + - try to guess what the user wanted when operators that support multiple + types are used on different typed operands. In general convert the + the right operand to the type of the left operand and then perform the + operation. Exception: the left operand is undef. + This applies to the following operators: +, == and !=. + Special case: undef as left operand: + For +: undef + expr -> undef is converted to string => "" + expr. + For == and !=: undef == expr -> undef is converted to type_of expr. + If expr is undef, then undef == undef is true (internally is converted + to string). + - expression evaluation changes: auto-convert to interger or string + in function of the operators: + int(undef)==0, int("")==0, int("123")==123, int("abc")==0 + str(undef)=="", str(123)=="123". - new script operators: defined, strlen, strempty defined expr - returns true if expr is defined, and false if not. Note: only a standalone avp or pvar can be

15 years, 7 months

git:andrei/type_conversion: core: new script operators: eq, ne, ieq, ine

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 298512a2b79ff3bd9405a63c5d05030b5ec21de3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=298512a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 19:48:11 2009 +0200 core: new script operators: eq, ne, ieq, ine Added operators for: - string == and string != : eq, ne - integer == and integer!= : ieq, ine They are almost equivalent to == or !=, but they force the conversion of their operands (eq to string and ieq to int), allowing among other things better type checking on startup and more optimizations. Non equiv. examples: 0 == "" (true) is not equivalent to 0 eq "" (false: it evaluates to "0" eq ""). "a" ieq "b" (true: (int)"a" is 0 and (int)"b" is 0) is not equivalent to "a" == "b" (false). Note: the names are not final, they are mostly for testing. Future releases might replace ==/!= with ieq/ine and use eq/ne for strings. --- cfg.lex | 8 ++++++++ cfg.y | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index b1f9c55..768f3e9 100644 --- a/cfg.lex +++ b/cfg.lex @@ -248,6 +248,10 @@ MINUS "-" STRLEN "strlen" STREMPTY "strempty" DEFINED "defined" +STREQ eq +INTEQ ieq +STRDIFF ne +INTDIFF ine /* Attribute specification */ ATTR_MARK "%" @@ -772,6 +776,10 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{STRLEN} { count(); return STRLEN; } <INITIAL>{STREMPTY} { count(); return STREMPTY; } <INITIAL>{DEFINED} { count(); return DEFINED; } +<INITIAL>{STREQ} { count(); return STREQ; } +<INITIAL>{INTEQ} { count(); return INTEQ; } +<INITIAL>{STRDIFF} { count(); return STRDIFF; } +<INITIAL>{INTDIFF} { count(); return INTDIFF; } <INITIAL>{SELECT_MARK} { count(); state = SELECT_S; BEGIN(SELECT); return SELECT_MARK; } <SELECT>{ID} { count(); addstr(&s_buf, yytext, yyleng); diff --git a/cfg.y b/cfg.y index a281052..df3056d 100644 --- a/cfg.y +++ b/cfg.y @@ -484,7 +484,7 @@ static int case_check_default(struct case_stms* stms); %left LOG_AND %left BIN_OR %left BIN_AND -%left EQUAL_T DIFF MATCH +%left EQUAL_T DIFF MATCH INTEQ INTDIFF STREQ STRDIFF %left GT LT GTE LTE %left PLUS MINUS %left STAR SLASH @@ -1580,6 +1580,8 @@ exp: rval_expr equalop: EQUAL_T {$$=EQUAL_OP; } | DIFF {$$=DIFF_OP; } + | STREQ {$$=EQUAL_OP; } /* for expr. elems equiv. to EQUAL_T*/ + | STRDIFF {$$=DIFF_OP; } /* for expr. elems. equiv. to DIFF */ ; cmpop: GT {$$=GT_OP; } @@ -1597,6 +1599,10 @@ strop: rve_equalop: EQUAL_T {$$=RVE_EQ_OP; } | DIFF {$$=RVE_DIFF_OP; } + | INTEQ {$$=RVE_IEQ_OP; } + | INTDIFF {$$=RVE_IDIFF_OP; } + | STREQ {$$=RVE_STREQ_OP; } + | STRDIFF {$$=RVE_STRDIFF_OP; } ; rve_cmpop: GT {$$=RVE_GT_OP; }

15 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009