sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: core expr. eval: added bug catcher

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 087be8daf0bc279450732973618cec7fa719efde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=087be8d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 22:02:49 2009 +0200 core expr. eval: added bug catcher Added code for catching an easy to overlook bug (replacing in-line a referenced rval during optimizing). --- rvalue.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rvalue.c b/rvalue.c index 7bfff5c..976945a 100644 --- a/rvalue.c +++ b/rvalue.c @@ -47,6 +47,8 @@ #include "rvalue.h" +#include <stdlib.h> /* abort() */ + /* minimum size alloc'ed for STR RVs (to accomodate * strops without reallocs) */ #define RV_STR_EXTRA 80 @@ -2577,6 +2579,13 @@ static int rve_replace_with_val(struct rval_expr* rve, enum rval_type type, if (rve_op_unary(rve->op)==0) rve_destroy(rve->right.rve); }else{ + if (rve->left.rval.refcnt!=1){ + BUG("trying to replace a referenced rval! (refcnt=%d)\n", + rve->left.rval.refcnt); + /* try to recover */ + refcnt=rve->left.rval.refcnt; + abort(); /* find bugs quicker -- andrei */ + } rval_destroy(&rve->left.rval); } rval_init(&rve->left.rval, type, v, flags);

15 years

git:master: core script engine: if switched to rval_expr

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8637f3408456dcc4e2df2cf6b2530cc7f1588042 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8637f34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 21:58:40 2009 +0200 core script engine: if switched to rval_expr - switched if to use directly rval_expr - warn on startup if "if" expression is constant - fail to start if "if" expression evaluates to non-int --- action.c | 23 +++++++-------------- cfg.y | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- route.c | 42 +++++++++++++++++++++++++++++++++------ 3 files changed, 104 insertions(+), 26 deletions(-) diff --git a/action.c b/action.c index ffc0051..f99079a 100644 --- a/action.c +++ b/action.c @@ -49,6 +49,7 @@ * 2008-11-18 support for variable parameter module functions (andrei) * 2008-12-03 use lvalues/rvalues for assignments (andrei) * 2008-12-17 added UDP_MTU_TRY_PROTO_T (andrei) + * 2009-05-04 switched IF_T to rval_expr (andrei) */ @@ -813,21 +814,14 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; break; case IF_T: - /* if null expr => ignore if? */ - if ((a->val[0].type==EXPR_ST)&&a->val[0].u.data){ - v=eval_expr(h, (struct expr*)a->val[0].u.data, msg); -#if 0 - if (v<0){ - if (v==EXPR_DROP){ /* hack to quit on DROP*/ - ret=0; - break; - }else{ - LOG(L_WARN,"WARNING: do_action:" - "error in expression\n"); - } + rve=(struct rval_expr*)a->val[0].u.data; + if (unlikely(rval_expr_eval_int(h, msg, &v, rve) != 0)){ + ERR("if expression evaluation failed (%d,%d-%d,%d)\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + v=0; /* false */ } -#endif - if (h->run_flags & EXIT_R_F){ + if (unlikely(h->run_flags & EXIT_R_F)){ ret=0; break; } @@ -843,7 +837,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=run_actions(h, (struct action*)a->val[2].u.data, msg); } - } break; case MODULE_T: if ( a->val[0].type==MODEXP_ST && a->val[0].u.data && diff --git a/cfg.y b/cfg.y index 5c0c3f2..21e81a1 100644 --- a/cfg.y +++ b/cfg.y @@ -95,6 +95,7 @@ * NUMBER is now always positive; cleanup (andrei) * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) + * 2009-05-04 switched if to rval_expr (andrei) */ %{ @@ -212,6 +213,8 @@ 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); static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, struct rval_expr* rve2); +static int rval_expr_int_check(struct rval_expr *rve); +static int warn_ct_rve(struct rval_expr *rve, char* name); static struct socket_id* mk_listen_id(char*, int, int); static struct name_lst* mk_name_lst(char* name, int flags); static struct socket_id* mk_listen_id2(struct name_lst*, int, int); @@ -520,7 +523,8 @@ static int case_check_default(struct case_stms* stms); /*non-terminals */ -%type <expr> exp exp_elem +/*%type <expr> exp */ +%type <expr> exp_elem %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 @@ -1566,7 +1570,7 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; -exp: rval_expr +/*exp: rval_expr { if ($1==0){ yyerror("invalid expression"); @@ -1581,6 +1585,7 @@ exp: rval_expr $$=mk_elem(NO_OP, RVEXP_O, $1, 0, 0); } ; +*/ /* exp elem operators */ equalop: @@ -1852,8 +1857,18 @@ action: | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } ; 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); } + IF rval_expr stm { + if (rval_expr_int_check($2)==0){ + warn_ct_rve($2, "if"); + } + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); + } + | IF rval_expr stm ELSE stm { + if (rval_expr_int_check($2)==0){ + warn_ct_rve($2, "if"); + } + $$=mk_action( IF_T, 3, RVE_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); + } ; ct_rval: rval_expr { @@ -2930,6 +2945,48 @@ static struct rval_expr* mk_rve2(enum rval_expr_op op, struct rval_expr* rve1, } +/** check if the expression is an int. + * if the expression does not evaluate to an int return -1 and + * log an error. + * @return 0 on success, -1 on error */ +static int rval_expr_int_check(struct rval_expr *rve) +{ + struct rval_expr* bad_rve; + enum rval_type type, bad_t, exp_t; + + if (rve==0){ + yyerror("invalid expression"); + return -1; + }else if (!rve_check_type(&type, rve, &bad_rve, &bad_t ,&exp_t)){ + if (bad_rve) + yyerror_at(&rve->fpos, "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 -1; + }else if (type!=RV_INT && type!=RV_NONE){ + yyerror_at(&rve->fpos, "invalid expression type, int expected\n"); + return -1; + } + return 0; +} + + +/** warn if the expression is constant. + * @return 0 on success (no warning), 1 when warning */ +static int warn_ct_rve(struct rval_expr *rve, char* name) +{ + if (rve && rve_is_constant(rve)){ + warn_at(&rve->fpos, "constant value in %s%s", + name?name:"expression", name?"(...)":""); + return 1; + } + return 0; +} + + static struct name_lst* mk_name_lst(char* host, int flags) { struct name_lst* l; diff --git a/route.c b/route.c index 7b831e2..4ba116a 100644 --- a/route.c +++ b/route.c @@ -49,6 +49,7 @@ * 2008-04-23 errors are treated as false during expression evaluation * unless the operator is DIFF_OP (Miklos) * 2008-12-03 fixups for rvalues in assignments (andrei) + * 2009-05-04 switched IF_T to rval_expr (andrei) */ @@ -674,24 +675,50 @@ int fix_actions(struct action* a) } break; case IF_T: - if (t->val[0].type!=EXPR_ST){ + if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for if (should be expr)\n", + "%d for if (should be rval expr)\n", t->val[0].type); return E_BUG; - }else if( (t->val[1].type!=ACTIONS_ST)&&(t->val[1].type!=NOSUBTYPE) ){ + }else if( (t->val[1].type!=ACTIONS_ST) && + (t->val[1].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {...} (should be action)\n", t->val[1].type); return E_BUG; - }else if( (t->val[2].type!=ACTIONS_ST)&&(t->val[2].type!=NOSUBTYPE) ){ + }else if( (t->val[2].type!=ACTIONS_ST) && + (t->val[2].type!=NOSUBTYPE) ){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" "%d for if() {} else{...}(should be action)\n", t->val[2].type); return E_BUG; } - if (t->val[0].u.data){ - if ((ret=fix_expr((struct expr*)t->val[0].u.data))<0) + 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; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ @@ -699,7 +726,8 @@ int fix_actions(struct action* a) return ret; } if ( (t->val[2].type==ACTIONS_ST)&&(t->val[2].u.data) ){ - if ((ret=fix_actions((struct action*)t->val[2].u.data))<0) + if ((ret=fix_actions((struct action*)t->val[2].u.data)) + <0) return ret; } break;

15 years

git:master: core expr. eval: support for =~

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bd5099b65baa2e57afa299e8fc6a5f758763d650 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd5099b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 21:09:23 2009 +0200 core expr. eval: support for =~ The match regular expression operator (=~) is now supported in rval_exprs. --- cfg.y | 1 + rvalue.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- rvalue.h | 9 +++ 3 files changed, 229 insertions(+), 16 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd5…

15 years

git:master: Merge commit 'origin/andrei/type_conversion'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c5e6955692fb6f7803fa7550a92a7e727cabf31f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e6955… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 23:38:12 2009 +0200 Merge commit 'origin/andrei/type_conversion' * commit 'origin/andrei/type_conversion': script parsing: fix bug in expression error checking core expr eval: various fixes news: update (new operators, expr. eval behaviour a.s.o.) core: new script operators: eq, ne, ieq, ine core expr eval: fix assoc., commut and 0 adding for +, == core expr eval: minor ==/!= optimization core expr eval: internal == & != int and str only versions core expr eval: special handling for undef cmp expr core eval expr: cache undefined results too core expr eval: str automatic conversion to int core expr eval: undef conversion to int and str core expr eval: defined @select ---

15 years

new operators & if($v) behaviour

by Andrei Pelinescu-Onciul

Right now we have a problem with old scripts that use things like if ($v) (where $v could be avp, pseudovar or select). $v can evaluate to a int, a string or undefined. Now for string and undefined the if will evaluate to false (string being an error) and an error will be logged. If the type of $v can be found prior to runtime (e.g. @select is always string) you'll even get a parse error. I plan to add some new operators, to properly deal with these cases: defined($v) strempty($v) strlen($v) but the question still remains if we should preserve compatibility and still support things like if (@to.tag), instead of if (!strempty((a)to.tag)) or if (@to.tag!=""). What's trickier is that if we allow strings in int expressions then we have 2 problems: - "" evaluates to 1 or 0? - how to evaluate a string in an integer context: is "abc" 1 or 3 (strlen)? How about "123" ? - $v is 0 if v is not defined? Note that if we do this it will work in all types of expressions, e.g. if string evaluates to strlen(string) in interger context then: 3+"abc" = 6 ; 3+ ""=3 ; 3+"9"=4 3+"0"=4. Andrei

15 years

git:master: add complete doxygen documentation for dlg_handlers.{c, h} in dialog module

by Henning Westerholt

Module: sip-router Branch: master Commit: f7aa0a8984868a4e5f48d034cdb2b275cc374389 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7aa0a8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 22:54:24 2009 +0200 add complete doxygen documentation for dlg_handlers.{c,h} in dialog module --- modules_k/dialog/dlg_handlers.c | 220 ++++++++++++++++++++++++++++++++------- modules_k/dialog/dlg_handlers.h | 83 +++++++++++++++- 2 files changed, 262 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f7a…

15 years

git:master: a bunch of small refactorings in the dialog module

by Henning Westerholt

Module: sip-router Branch: master Commit: 80d27be832ff175e31257c612f5b51ce643d4437 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d27be… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 23:25:05 2009 +0200 a bunch of small refactorings in the dialog module - move populate_leg_info declaration to the proper header file - unify mostly identical dlg_seq_up_onreply, dlg_seq_down_onreply functions - make unref_new_dialog static, this is not used outside the implementation file - compact variable declarations in dlg_onroute and a few other functions - the get_dlg_tl_payload macro is only used once, integrate it into the code --- modules_k/dialog/dlg_handlers.c | 71 +++++++++++++++--------------------- modules_k/dialog/dlg_handlers.h | 15 ++++++++ modules_k/dialog/dlg_req_within.h | 3 -- modules_k/dialog/dlg_transfer.c | 1 + 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 6b3bc3d..2b3d53d 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -293,10 +293,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { struct sip_msg *rpl; struct dlg_cell *dlg; - int new_state; - int old_state; - int unref; - int event; + int new_state, old_state, unref, event; str tag; dlg = (struct dlg_cell *)(*param->param); @@ -403,12 +400,16 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) /*! - * \brief Run dialog callbacks on forwarded requests in upstream direction + * \brief Helper function that run dialog callbacks on forwarded requests + * \see dlg_seq_up_onreply + * \see dlg_seq_down_onreply * \param t transaction, unused * \param type type of the callback, should be TMCB_RESPONSE_FWDED * \param param saved dialog structure inside the callback + * \param direction direction of the request */ -static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *param) +static void dlg_seq_onreply_helper(struct cell* t, int type, + struct tmcb_params *param, const int direction) { struct dlg_cell *dlg; @@ -418,7 +419,7 @@ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *par if (type==TMCB_RESPONSE_FWDED) { run_dlg_callbacks(DLGCB_RESPONSE_WITHIN, dlg, param->rpl, - DLG_DIR_UPSTREAM, 0); + direction, 0); return; } @@ -427,26 +428,28 @@ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *par /*! - * \brief Run dialog callbacks on forwarded requests in downstream direction + * \brief Run dialog callbacks on forwarded requests in upstream direction + * \see dlg_seq_onreply_helper * \param t transaction, unused * \param type type of the callback, should be TMCB_RESPONSE_FWDED * \param param saved dialog structure inside the callback */ -static void dlg_seq_down_onreply(struct cell* t, int type, struct tmcb_params *param) +static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *param) { - struct dlg_cell *dlg; - - dlg = (struct dlg_cell *)(*param->param); - if (shutdown_done || dlg==0) - return; + return dlg_seq_onreply_helper(t, type, param, DLG_DIR_UPSTREAM); +} - if (type==TMCB_RESPONSE_FWDED) { - run_dlg_callbacks(DLGCB_RESPONSE_WITHIN, dlg, param->rpl, - DLG_DIR_DOWNSTREAM, 0); - return; - } - return; +/*! + * \brief Run dialog callbacks on forwarded requests in downstream direction + * \see dlg_seq_onreply_helper + * \param t transaction, unused + * \param type type of the callback, should be TMCB_RESPONSE_FWDED + * \param param saved dialog structure inside the callback + */ +static void dlg_seq_down_onreply(struct cell* t, int type, struct tmcb_params *param) +{ + return dlg_seq_onreply_helper(t, type, param, DLG_DIR_DOWNSTREAM); } @@ -492,7 +495,7 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) * \see dlg_onreq * \param dialog unreferenced dialog */ -void unref_new_dialog(void *dialog) +static void unref_new_dialog(void *dialog) { struct tmcb_params p; @@ -755,17 +758,8 @@ static void unreference_dialog(void *dialog) void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { struct dlg_cell *dlg; - str val; - str callid; - str ftag; - str ttag; - int h_entry; - int h_id; - int new_state; - int old_state; - int unref; - int event; - int timeout; + str val, callid, ftag, ttag; + int h_entry, h_id, new_state, old_state, unref, event, timeout; unsigned int dir; int ret = 0; @@ -956,11 +950,6 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) } - -#define get_dlg_tl_payload(_tl_) ((struct dlg_cell*)((char *)(_tl_)- \ - (unsigned long)(&((struct dlg_cell*)0)->tl))) - - /*! * \brief Timer function that removes expired dialogs, run timeout route * \param tl dialog timer list @@ -968,12 +957,12 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) void dlg_ontimeout( struct dlg_tl *tl) { struct dlg_cell *dlg; - int new_state; - int old_state; - int unref; + int new_state, old_state, unref; struct sip_msg *fmsg; - dlg = get_dlg_tl_payload(tl); + /* get the dialog tl payload */ + dlg = ((struct dlg_cell*)((char *)(tl) - + (unsigned long)(&((struct dlg_cell*)0)->tl))); if(dlg->toroute>0 && dlg->toroute<RT_NO) { diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index e0804ba..277db0b 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -71,6 +71,21 @@ void destroy_dlg_handlers(void); /*! + * \brief Parse SIP message and populate leg informations + * + * Parse SIP message and populate leg informations. + * \param dlg the dialog to add cseq, contact & record_route + * \param msg sip message + * \param flag 0-for a request(INVITE), 1- for a reply(200 ok) + * \return 0 on success, -1 on failure + * \note for a request: get record route in normal order, for a reply get + * in reverse order, skipping the ones from the request and the proxies' own + */ +int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, + struct cell* t, unsigned int leg, str *tag); + + +/*! * \brief Function that is registered as TM callback and called on requests * \param t transaction, used to created the dialog * \param type type of the entered callback diff --git a/modules_k/dialog/dlg_req_within.h b/modules_k/dialog/dlg_req_within.h index df7d334..732f430 100644 --- a/modules_k/dialog/dlg_req_within.h +++ b/modules_k/dialog/dlg_req_within.h @@ -49,9 +49,6 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param ); dlg_t* build_dlg_t(struct dlg_cell * cell, int dir); int free_tm_dlg(dlg_t *td); -int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, - struct cell* t, unsigned int leg, str *tag); - int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side); int dlg_bye_all(struct dlg_cell *dlg, str *hdrs); diff --git a/modules_k/dialog/dlg_transfer.c b/modules_k/dialog/dlg_transfer.c index 2348590..df6f5d1 100644 --- a/modules_k/dialog/dlg_transfer.c +++ b/modules_k/dialog/dlg_transfer.c @@ -34,6 +34,7 @@ #include "../../modules/tm/tm_load.h" #include "dlg_req_within.h" +#include "dlg_handlers.h" #include "dlg_transfer.h" #define DLG_HOLD_SDP "v=0\r\no=kamailio-bridge 0 0 IN IP4 0.0.0.0\r\ns=kamailio\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 9 RTP/AVP 8 0\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\n"

15 years

git:master: small refactoring to decrease exported symbols signature

by Henning Westerholt

Module: sip-router Branch: master Commit: 020559fd87eca6605371be4e9d21778b6285f6f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=020559f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun May 3 20:07:53 2009 +0200 small refactoring to decrease exported symbols signature - move unlink_unsafe_dlg function to header file, make them static - move unref_dlg_unsafe, ref_dlg_unsafe macros to implementation file --- modules_k/dialog/dlg_hash.c | 54 ++++++++++++++++++++++++++------------- modules_k/dialog/dlg_hash.h | 58 +++++++++++------------------------------- 2 files changed, 51 insertions(+), 61 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index a699e72..65e5876 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -490,27 +490,45 @@ void link_dlg(struct dlg_cell *dlg, int n) /*! - * \brief Unlink a dialog from the list without locking - * \see unref_dlg_unsafe - * \param d_entry unlinked entry - * \param dlg unlinked dialog + * \brief Reference a dialog without locking + * \param _dlg dialog + * \param _cnt increment for the reference counter */ -inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, - struct dlg_cell *dlg) -{ - if (dlg->next) - dlg->next->prev = dlg->prev; - else - d_entry->last = dlg->prev; - if (dlg->prev) - dlg->prev->next = dlg->next; - else - d_entry->first = dlg->next; +#define ref_dlg_unsafe(_dlg,_cnt) \ + do { \ + (_dlg)->ref += (_cnt); \ + LM_DBG("ref dlg %p with %d -> %d\n", \ + (_dlg),(_cnt),(_dlg)->ref); \ + }while(0) - dlg->next = dlg->prev = 0; - return; -} +/*! + * \brief Unreference a dialog without locking + * \param _dlg dialog + * \param _cnt decrement for the reference counter + */ +#define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ + do { \ + (_dlg)->ref -= (_cnt); \ + LM_DBG("unref dlg %p with %d -> %d\n",\ + (_dlg),(_cnt),(_dlg)->ref);\ + if ((_dlg)->ref<0) {\ + LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ + "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ + (_dlg)->ref, _cnt, _dlg,\ + (_dlg)->h_entry, (_dlg)->h_id,\ + (_dlg)->callid.len, (_dlg)->callid.s,\ + (_dlg)->tag[DLG_CALLER_LEG].len,\ + (_dlg)->tag[DLG_CALLER_LEG].s,\ + (_dlg)->tag[DLG_CALLEE_LEG].len,\ + (_dlg)->tag[DLG_CALLEE_LEG].s); \ + }\ + if ((_dlg)->ref<=0) { \ + unlink_unsafe_dlg( _d_entry, _dlg);\ + LM_DBG("ref <=0 for dialog %p\n",_dlg);\ + destroy_dlg(_dlg);\ + }\ + }while(0) /*! diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index e717a2b..e01c311 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -163,7 +163,21 @@ extern struct dlg_cell *current_dlg_pointer; * \param d_entry unlinked entry * \param dlg unlinked dialog */ -inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg); +static inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell *dlg) +{ + if (dlg->next) + dlg->next->prev = dlg->prev; + else + d_entry->last = dlg->prev; + if (dlg->prev) + dlg->prev->next = dlg->next; + else + d_entry->first = dlg->next; + + dlg->next = dlg->prev = 0; + + return; +} /*! @@ -174,48 +188,6 @@ inline void destroy_dlg(struct dlg_cell *dlg); /*! - * \brief Reference a dialog without locking - * \param _dlg dialog - * \param _cnt increment for the reference counter - */ -#define ref_dlg_unsafe(_dlg,_cnt) \ - do { \ - (_dlg)->ref += (_cnt); \ - LM_DBG("ref dlg %p with %d -> %d\n", \ - (_dlg),(_cnt),(_dlg)->ref); \ - }while(0) - - -/*! - * \brief Unreference a dialog without locking - * \param _dlg dialog - * \param _cnt decrement for the reference counter - */ -#define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ - do { \ - (_dlg)->ref -= (_cnt); \ - LM_DBG("unref dlg %p with %d -> %d\n",\ - (_dlg),(_cnt),(_dlg)->ref);\ - if ((_dlg)->ref<0) {\ - LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ - "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ - (_dlg)->ref, _cnt, _dlg,\ - (_dlg)->h_entry, (_dlg)->h_id,\ - (_dlg)->callid.len, (_dlg)->callid.s,\ - (_dlg)->tag[DLG_CALLER_LEG].len,\ - (_dlg)->tag[DLG_CALLER_LEG].s,\ - (_dlg)->tag[DLG_CALLEE_LEG].len,\ - (_dlg)->tag[DLG_CALLEE_LEG].s); \ - }\ - if ((_dlg)->ref<=0) { \ - unlink_unsafe_dlg( _d_entry, _dlg);\ - LM_DBG("ref <=0 for dialog %p\n",_dlg);\ - destroy_dlg(_dlg);\ - }\ - }while(0) - - -/*! * \brief Initialize the global dialog table * \param size size of the table * \return 0 on success, -1 on failure

15 years

git:master: don't include and link with database API, this is not needed

by Henning Westerholt

Module: sip-router Branch: master Commit: 15e2e89e5d1e7f9dc6265c270153088596159ee5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15e2e89… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 20:32:26 2009 +0200 don't include and link with database API, this is not needed --- modules_s/uri/Makefile | 2 +- modules_s/uri/checks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/uri/Makefile b/modules_s/uri/Makefile index a609c52..d7d185f 100644 --- a/modules_s/uri/Makefile +++ b/modules_s/uri/Makefile @@ -13,6 +13,6 @@ LIBS= DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 +#SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 include ../../Makefile.modules diff --git a/modules_s/uri/checks.c b/modules_s/uri/checks.c index 23e98c1..9d5a1c6 100644 --- a/modules_s/uri/checks.c +++ b/modules_s/uri/checks.c @@ -43,7 +43,7 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_param.h" #include "../../ut.h" /* Handy utilities */ -#include "../../lib/srdb2/db.h" /* Database API */ +//#include "../../lib/srdb2/db.h" /* Database API */ #include "../../dset.h" #include "uri_mod.h" #include "checks.h"

15 years

git:master: generate README for the cfg_rpc module

by Henning Westerholt

Module: sip-router Branch: master Commit: a8539942044b15eef743b28380fa25aefaec0721 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a853994… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:58:11 2009 +0200 generate README for the cfg_rpc module --- modules_s/cfg_rpc/README | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_s/cfg_rpc/README b/modules_s/cfg_rpc/README new file mode 100644 index 0000000..7e457da --- /dev/null +++ b/modules_s/cfg_rpc/README @@ -0,0 +1,45 @@ +1. cfg_rpc Module + +Miklos Tirpak + + <miklos(a)iptel.org> + + Copyright � 2007 iptelorg GmbH + __________________________________________________________________ + + 1.1. Overview + 1.2. RPC Interface + +1.1. Overview + + The module implements RPC functions to set and get configuration + variables on-the-fly, that are declared by SER core and by the modules. + It can be used to fine-tune or debug SER without the need of restart. + +1.2. RPC Interface + + The module implements the following RPC interface commands: + * cfg_rpc.set_now_int - Set the value of a configuration variable and + commit the change immediately. The function accepts three + parameters: group name, variable name, integer value. + * cfg_rpc.set_now_string - Set the value of a configuration variable + and commit the change immediately. The function accepts three + parameters: group name, variable name, string value. + * cfg_rpc.set_delayed_int - Prepare the change of a configuration + variable, but does not commit the new value yet. The function + accepts three parameters: group name, variable name, integer value. + * cfg_rpc.set_delayed_string - Prepare the change of a configuration + variable, but does not commit the new value yet. The function + accepts three parameters: group name, variable name, string value. + * cfg_rpc.commit - Commit the previously prepared configuration + changes. The function does not have any parameters. + * cfg_rpc.rollback - Drop the prepared configuration changed. The + function does not have any parameters. + * cfg_rpc.get - Get the value of a configuration variable. The + function accepts two parameters: group name, variable name. + * cfg_rpc.help - Print the description of a configuration variable. + The function accepts two parameters: group name, variable name. + * cfg_rpc.list - List the configuration variables. The function does + not have any parameters. + * cfg_rpc.diff - List the pending configuration changes that have not + been committed yet. The function does not have any parameters.

15 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009