sr-dev

sr-dev@lists.kamailio.org

12 participants
43412 discussions

New multi-protocol IM & Presence gateway module

by Eric PTAK

Hi all, I'm glad to announce and to provide you the module I've done few months ago. It's based on libpurple, the library on bottom of pidgin (ex-gaim), and allow you to use all your non-SIP accounts (like MSN) mapped with your SIP URI. It was originally wrote for OpenSER 1.3.x, but I ported and tested it to latest Kamailio/OpenSIPS snapshots. Please refer to included README for more informations. I hope you'll enjoy it ! Eric PTAK, Atos Worldline R&D.

15 years, 9 months

git:andrei/script_vars: script: pvar name parsing fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 2ac5604bdab43ca5ddf10a1db0ea3f61f2d7d912 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ac5604… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 4 01:05:32 2008 +0100 script: pvar name parsing fix - fix parsing pvar names of the form $pvar(...) --- cfg.lex | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index c4f5a14..4ce14d0 100644 --- a/cfg.lex +++ b/cfg.lex @@ -830,7 +830,8 @@ EAT_ABLE [\ \t\b\r] <AVP_PVAR>{AVP_PREF} | <AVP_PVAR>{ID}{LBRACK} { state = ATTR_S; BEGIN(ATTR); yyless(1); return ATTR_MARK; } -<AVP_PVAR>{ID}{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); yymore(); } +<AVP_PVAR>{ID}{LPAREN} { state = PVAR_P_S; p_nest=1; BEGIN(PVAR_P); + yymore(); } <AVP_PVAR>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; memset(&s_buf, 0, sizeof(s_buf));

15 years, 9 months

git:andrei/script_vars: script engine: lvalue/rvalue assignment and fixups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: ab7f82d262e57857722855217c93096303468fab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab7f82d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 4 01:12:46 2008 +0100 script engine: lvalue/rvalue assignment and fixups --- action.c | 127 +++++--------------------------------------------------- route.c | 61 +++++++++++++-------------- route.h | 4 +- route_struct.h | 4 +- 4 files changed, 47 insertions(+), 149 deletions(-) diff --git a/action.c b/action.c index ea69e3a..26edcca 100644 --- a/action.c +++ b/action.c @@ -47,6 +47,7 @@ * 2007-06-14 run_actions & do_action need a ctx or handle now, no more * static vars (andrei) * 2008-11-18 support for variable parameter module functions (andrei) + * 2008-12-03 use lvalues/rvalues for assignments (andrei) */ @@ -63,6 +64,7 @@ #include "parser/msg_parser.h" #include "parser/parse_uri.h" #include "ut.h" +#include "lvalue.h" #include "sr_module.h" #include "mem/mem.h" #include "globals.h" @@ -108,8 +110,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct sip_uri uri, next_hop; struct sip_uri *u; unsigned short port; - unsigned short flags; - int_str name, value; str* dst_host; /* reset the value of error to E_UNSPEC so avoid unknowledgable @@ -870,121 +870,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; /* continue processing */ break; - case ADD_T: - case ASSIGN_T: - - /* If the left attr was specified without indexing brackets delete - * existing AVPs before adding new ones - */ - if ((a->val[0].u.attr->type & AVP_INDEX_ALL) != AVP_INDEX_ALL) delete_avp(a->val[0].u.attr->type, a->val[0].u.attr->name); - - if (a->val[1].type == STRING_ST) { - value.s = a->val[1].u.str; - flags = a->val[0].u.attr->type | AVP_VAL_STR; - name = a->val[0].u.attr->name; - ret = 1; - } else if (a->val[1].type == NUMBER_ST) { - value.n = a->val[1].u.number; - flags = a->val[0].u.attr->type; - name = a->val[0].u.attr->name; + case ADD_T: + case ASSIGN_T: + v=lval_assign(h, msg, (struct lvalue*)a->val[0].u.data, + (struct rval_expr*)a->val[1].u.data); + if (likely(v>=0)) ret = 1; - } else if (a->val[1].type == ACTION_ST) { - flags = a->val[0].u.attr->type; - name = a->val[0].u.attr->name; - if (a->val[1].u.data) { - value.n = run_actions(h, (struct action*)a->val[1].u.data, - msg); - } else { - value.n = -1; - } - ret = value.n; - } else if(a->val[1].type == EXPR_ST && a->val[1].u.data) { - v = eval_expr(h, (struct expr*)a->val[1].u.data, msg); - 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"); - v = 0; /* error is treated as false (Miklos) */ - } - } - - flags = a->val[0].u.attr->type; - name = a->val[0].u.attr->name; - value.n = v; - } else if (a->val[1].type == AVP_ST) { - struct search_state st; - avp_t* avp; - avp_t* avp_mark; - - avp_mark = NULL; - if ((a->val[1].u.attr->type & AVP_INDEX_ALL) == AVP_INDEX_ALL) { - avp = search_first_avp(a->val[1].u.attr->type, a->val[1].u.attr->name, &value, &st); - while(avp) { - /* We take only the type of value and name from the source avp - * and reset class and track flags - */ - flags = (a->val[0].u.attr->type & ~AVP_INDEX_ALL) | (avp->flags & ~(AVP_CLASS_ALL|AVP_TRACK_ALL)); - - if (add_avp_before(avp_mark, flags, a->val[0].u.attr->name, value) < 0) { - LOG(L_CRIT, "ERROR: Failed to assign value to attribute\n"); - ret=E_UNSPEC; - break; - } - - /* move the mark, so the next found AVP will come before the one currently added - * so they will have the same order as in the source list - */ - if (avp_mark) { - avp_mark=avp_mark->next; - } else { - avp_mark=search_first_avp(flags, a->val[0].u.attr->name, NULL, NULL); - } - - avp = search_next_avp(&st, &value); - } - ret = 1; - break; - } else { - avp = search_avp_by_index(a->val[1].u.attr->type, a->val[1].u.attr->name, &value, a->val[1].u.attr->index); - if (avp) { - flags = a->val[0].u.attr->type | (avp->flags & ~(AVP_CLASS_ALL|AVP_TRACK_ALL)); - name = a->val[0].u.attr->name; - ret = 1; - } else { - ret = E_UNSPEC; - break; - } - } - } else if (a->val[1].type == SELECT_ST) { - int r; - r = run_select(&value.s, a->val[1].u.select, msg); - if (r < 0) { - ret=E_UNSPEC; - break; - } else if (r > 0) { - value.s.s = ""; - value.s.len = 0; - } - - flags = a->val[0].u.attr->type | AVP_VAL_STR; - name = a->val[0].u.attr->name; - ret = 1; - } else { - LOG(L_CRIT, "BUG: do_action: Bad right side of avp assignment\n"); - ret=E_BUG; - break; - } - - /* If the action is assign then remove the old avp value - * before adding new ones */ -/* if ((unsigned char)a->type == ASSIGN_T) delete_avp(flags, name); */ - if (add_avp(flags & ~AVP_INDEX_ALL, name, value) < 0) { - LOG(L_CRIT, "ERROR: Failed to assign value to attribute\n"); - ret=E_UNSPEC; - break; - } + else if (unlikely (v == EXPR_DROP)) /* hack to quit on DROP*/ + ret=0; + else + ret=v; break; default: diff --git a/route.c b/route.c index b57364b..cafe4fa 100644 --- a/route.c +++ b/route.c @@ -48,6 +48,7 @@ * the expressions does not exist (Miklos) * 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) */ @@ -66,6 +67,8 @@ #include "dprint.h" #include "proxy.h" #include "action.h" +#include "lvalue.h" +#include "rvalue.h" #include "sr_module.h" #include "ip_addr.h" #include "resolve.h" @@ -276,12 +279,12 @@ int route_lookup(struct route_list* rt, char* name) -static int fix_actions(struct action* a); /*fwd declaration*/ +int fix_actions(struct action* a); /*fwd declaration*/ /* traverses an expr tree and compiles the REs where necessary) * returns: 0 for ok, <0 if errors */ -static int fix_expr(struct expr* exp) +int fix_expr(struct expr* exp) { regex_t* re; int ret; @@ -380,7 +383,7 @@ static int fix_expr(struct expr* exp) /* adds the proxies in the proxy list & resolves the hostnames */ /* returns 0 if ok, <0 on error */ -static int fix_actions(struct action* a) +int fix_actions(struct action* a) { struct action *t; struct proxy_l* p; @@ -391,6 +394,8 @@ static int fix_actions(struct action* a) struct hostent* he; struct ip_addr ip; struct socket_info* si; + struct lvalue* lval; + char buf[30]; /* tmp buffer needed for module param fixups */ if (a==0){ @@ -466,40 +471,34 @@ static int fix_actions(struct action* a) } break; - case ASSIGN_T: - case ADD_T: - if (t->val[0].type != AVP_ST) { - LOG(L_CRIT, "BUG: fix_actions: Invalid left side of assignment\n"); + case ASSIGN_T: + case ADD_T: + if (t->val[0].type !=LVAL_ST) { + LOG(L_CRIT, "BUG: fix_actions: Invalid left side of" + " assignment\n"); return E_BUG; } - if (t->val[0].u.attr->type & AVP_CLASS_DOMAIN) { - LOG(L_ERR, "ERROR: You cannot change domain attributes from the script, they are read-only\n"); - return E_BUG; - } else if (t->val[0].u.attr->type & AVP_CLASS_GLOBAL) { - LOG(L_ERR, "ERROR: You cannot change global attributes from the script, they are read-only\n"); + if (t->val[1].type !=RVE_ST) { + LOG(L_CRIT, "BUG: fix_actions: Invalid right side of" + " assignment (%d)\n", t->val[1].type); return E_BUG; } - - if (t->val[1].type == ACTION_ST && t->val[1].u.data) { - if ((ret = fix_actions((struct action*)t->val[1].u.data)) < 0) { - return ret; - } - } else if (t->val[1].type == EXPR_ST && t->val[1].u.data) { - if ((ret = fix_expr((struct expr*)t->val[1].u.data)) < 0) { - return ret; - } - } else if (t->val[1].type == STRING_ST) { - int len; - len = strlen(t->val[1].u.data); - t->val[1].u.str.s = t->val[1].u.data; - t->val[1].u.str.len = len; - } else if (t->val[1].type == SELECT_ST) { - if ((ret=resolve_select(t->val[1].u.select)) < 0) { - BUG("Unable to resolve select\n"); - print_select(t->val[1].u.select); - return ret; + lval=t->val[0].u.data; + if (lval->type==LV_AVP){ + if (lval->lv.avps.type & AVP_CLASS_DOMAIN) { + LOG(L_ERR, "ERROR: You cannot change domain" + " attributes from the script, they are" + " read-only\n"); + return E_BUG; + } else if (lval->lv.avps.type & AVP_CLASS_GLOBAL) { + LOG(L_ERR, "ERROR: You cannot change global" + " attributes from the script, they are" + "read-only\n"); + return E_BUG; } } + if ((ret=fix_rval_expr(&t->val[1].u.data))<0) + return ret; break; case MODULE_T: diff --git a/route.h b/route.h index a1486d3..31c9785 100644 --- a/route.h +++ b/route.h @@ -73,7 +73,9 @@ int fix_rls(); int eval_expr(struct run_act_ctx* h, struct expr* e, struct sip_msg* msg); - +/* fixup functions*/ +int fix_actions(struct action* a); +int fix_expr(struct expr* exp); diff --git a/route_struct.h b/route_struct.h index 22b92d9..f3b298a 100644 --- a/route_struct.h +++ b/route_struct.h @@ -93,7 +93,9 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, }; enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, EXPR_ST, ACTIONS_ST, MODEXP_ST, MODFIXUP_ST, URIHOST_ST, URIPORT_ST, - MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, SELECT_ST, + MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, + SELECT_ST, /* obsolete */ + LVAL_ST, RVE_ST, RETCODE_ST}; /* run flags */

15 years, 9 months

git:andrei/script_vars: script: lvalue = rvalue expression support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: cddb9399efa10f5685a09b617a2ff5cf665fa2dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cddb939… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 4 01:10:12 2008 +0100 script: lvalue = rvalue expression support - lvalue = rvalue op rvalue ... --- cfg.y | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 129 insertions(+), 36 deletions(-) diff --git a/cfg.y b/cfg.y index 228d909..5cc36f9 100644 --- a/cfg.y +++ b/cfg.y @@ -89,6 +89,8 @@ * LINGER2, KEEPALIVE, KEEPIDLE, KEEPINTVL, KEEPCNT} (andrei) * 2008-01-24 added cfg_var definition (Miklos) * 2008-11-18 support for variable parameter module functions (andrei) + * 2007-12-03 support for generalised lvalues and rvalues: + * lval=rval_expr, where lval=avp|pvar (andrei) */ %{ @@ -118,6 +120,10 @@ #include "tcp_init.h" #include "tcp_options.h" #include "sctp_options.h" +#include "pvar.h" +#include "lvalue.h" +#include "rvalue.h" +#include "sr_compat.h" #include "config.h" #include "cfg_core.h" @@ -187,14 +193,7 @@ static select_t sel; static select_t* sel_ptr; static pv_spec_t* pv_spec; static struct action *mod_func_action; - -static struct avp_pvar_spec{ - int type; - union{ - struct avp_spec avp; - pv_spec_t pv; - }u; -} *apv_spec; +static struct lvalue* lval_tmp; static void warn(char* s); static struct socket_id* mk_listen_id(char*, int, int); @@ -216,8 +215,10 @@ static void free_socket_id_lst(struct socket_id* i); struct socket_id* sockid; struct name_lst* name_l; struct avp_spec* attr; - struct pv_spec_t* pvar; - struct avp_pvar_spec* avp_pvar_s; + struct _pv_spec* pvar; + struct lvalue* lval; + struct rvalue* rval; + struct rval_expr* rv_expr; select_t* select; } @@ -508,13 +509,17 @@ static void free_socket_id_lst(struct socket_id* i); %type <attr> attr_id_any %type <attr> attr_id_any_str %type <pvar> pvar -%type <avp_pvar_s> avp_pvar +%type <lval> lval +%type <rv_expr> rval rval_expr +%type <lval> avp_pvar /* %type <intval> class_id */ %type <intval> assign_op %type <select> select_id %type <strval> flag_name; %type <strval> route_name; %type <intval> avpflag_oper +%type <intval> rve_un_op +%type <intval> rve_op /*%type <route_el> rules; %type <route_el> rule; @@ -1986,42 +1991,38 @@ pvar: PVAR { yyerror("Not enough memory"); YYABORT; } - s.s=$1; s.len=strlen(s.s); - if (pv_parse_spec(&s, pv_spec)==0){ + memset(pv_spec, 0, sizeof(*pv_spec)); + s_tmp.s=$1; s_tmp.len=strlen($1); + if (pv_parse_spec(&s_tmp, pv_spec)==0){ yyerror("unknown script pseudo variable"); pkg_free(pv_spec); YYABORT; } $$=pv_spec; - BUG("parsed pvar \"%.*s\"\n", s.len, s.s); } ; avp_pvar: AVP_OR_PVAR { - apv=pkg_malloc(sizeof(*apv)); - if (!apv) { - yyerror("Not enough memory"); - YYABORT; - } - s.s=$1; s.len=strlen(s.s); - if (pv_parse_spec(&s, &apv_spec->u.pv)==0){ - /* not a pvar, try avps */ - /* TODO: test if in ser or k mode */ - if (parse_avp_name(&s, &type, &apv_spec->u.avp.name, &idx)) { - yyerror("error when parsing AVP"); - pkg_free(apv_spec); + lval_tmp=pkg_malloc(sizeof(*lval_tmp)); + if (!lval_tmp) { + yyerror("Not enough memory"); YYABORT; } - apv_spec->u.avp.type = type; - apv_spec->u.avp.index = idx; - apv_spec.type=APV_AVP_T; - }else{ - apv_spec.type=APV_PVAR_T; + memset(lval_tmp, 0, sizeof(*lval_tmp)); + s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); + if (pv_parse_spec(&s_tmp, &lval_tmp->lv.pvs)==0){ + /* not a pvar, try avps */ + lval_tmp->lv.avps.type|= AVP_NAME_STR; + lval_tmp->lv.avps.name.s.s = s_tmp.s+1; + lval_tmp->lv.avps.name.s.len = s_tmp.len-1; + lval_tmp->type=LV_AVP; + }else{ + lval_tmp->type=LV_PVAR; + } + $$ = lval_tmp; + DBG("parsed ambigous avp/pvar \"%.*s\" to %d\n", + s_tmp.len, s_tmp.s, lval_tmp->type); } - $$ = apv_spec; - BUG("parsed ambigous avp/pvar \"%.*s\" to %d\n", s.len, s.s, - apv_spec.type); - } ; @@ -2034,6 +2035,98 @@ assign_op: assign_op: EQUAL { $$ = ASSIGN_T; } ; + + +lval: attr_id_ass { + lval_tmp=pkg_malloc(sizeof(*lval_tmp)); + if (!lval_tmp) { + yyerror("Not enough memory"); + YYABORT; + } + lval_tmp->type=LV_AVP; lval_tmp->lv.avps=*$1; + pkg_free($1); /* free the avp spec we just copied */ + $$=lval_tmp; + } + | pvar { + if (!pv_is_w($1)) + yyerror("read only pvar in assignment left side"); + if ($1->trans!=0) + yyerror("pvar with transformations in assignment" + " left side"); + lval_tmp=pkg_malloc(sizeof(*lval_tmp)); + if (!lval_tmp) { + yyerror("Not enough memory"); + YYABORT; + } + lval_tmp->type=LV_PVAR; lval_tmp->lv.pvs=*($1); + pkg_free($1); /* free the pvar spec we just copied */ + $$=lval_tmp; + } + | avp_pvar { + if (($1)->type==LV_PVAR){ + if (!pv_is_w(&($1)->lv.pvs)) + yyerror("read only pvar in assignment left side"); + if ($1->lv.pvs.trans!=0) + yyerror("pvar with transformations in assignment" + " left side"); + } + $$=$1; + } + ; + +rval: NUMBER {$$=mk_rval_expr_v(RV_INT, (void*)$1); } + | STRING { s_tmp.s=$1; s_tmp.len=strlen($1); + $$=mk_rval_expr_v(RV_STR, &s_tmp); } + | attr_id_any {$$=mk_rval_expr_v(RV_AVP, $1); pkg_free($1); } + | pvar {$$=mk_rval_expr_v(RV_PVAR, $1); pkg_free($1); } + | avp_pvar { + switch($1->type){ + case LV_AVP: + $$=mk_rval_expr_v(RV_AVP, &$1->lv.avps); + break; + case LV_PVAR: + $$=mk_rval_expr_v(RV_PVAR, &$1->lv.pvs); + break; + default: + yyerror("BUG: invalid lvalue type "); + YYABORT; + } + pkg_free($1); /* not needed anymore */ + } + | select_id {$$=mk_rval_expr_v(RV_SEL, $1); pkg_free($1); } + | fcmd {$$=mk_rval_expr_v(RV_ACTION_ST, $1); } + //| exp {$$=mk_rval_expr_v(RV_BEXPR, $1);} + /* missing/TODO: RV_ACTION_ST */ + ; + + +rve_un_op: MINUS { $$=RVE_UMINUS_OP; } + /* TODO: RVE_BOOL_OP, RVE_NOT_OP? */ + ; + +rve_op: PLUS { $$=RVE_PLUS_OP; } + | MINUS { $$=RVE_MINUS_OP; } + | STAR { $$=RVE_MUL_OP; } + /* TODO: RVE_DIV_OP */ + ; + +rval_expr: rval { $$=$1; + if ($$==0){ + yyerror("out of memory\n"); + YYABORT; + } + } + | LPAREN rval_expr RPAREN { $$=$2; } + | rve_un_op rval_expr {$$=mk_rval_expr1($1, $2); } + | rval_expr rve_op rval_expr {$$=mk_rval_expr2($2, $1, $3); } + ; + +assign_action: lval assign_op rval_expr { $$=mk_action($2, 2, LVAL_ST, $1, + RVE_ST, $3); + } + ; + +/* assign_action: attr_id_ass assign_op STRING { $$=mk_action($2, 2, AVP_ST, $1, STRING_ST, $3); } | attr_id_ass assign_op NUMBER { $$=mk_action($2, 2, AVP_ST, $1, NUMBER_ST, (void*)$3); } @@ -2042,7 +2135,7 @@ assign_action: | attr_id_ass assign_op select_id { $$=mk_action($2, 2, AVP_ST, (void*)$1, SELECT_ST, (void*)$3); } | attr_id_ass assign_op LPAREN exp RPAREN { $$ = mk_action($2, 2, AVP_ST, $1, EXPR_ST, $4); } ; - +*/ avpflag_oper: SETAVPFLAG { $$ = 1; }

15 years, 9 months

git:andrei/script_vars: script engine: generalised lvalues & rvalues

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 1c7e485e4a8b77271d7a65c5e7a1263d2d73dda8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c7e485… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 4 00:47:29 2008 +0100 script engine: generalised lvalues & rvalues - support for rvalues (anything that can appear on the right side of an assignment). For now an rvalue can be an avp, pvar, select, number, string, logical expression or script command. rvalues expressions are also supported (rvalue operator rvalue ...). Evaluation of integer rvalue expression is highly optimized. For performance reasons the rvalue expressions are completely separated from the logical expressions (eval_elem/eval_expr). - rvalue expression fixup (apart for normal fixup stuff will also optimize away simple expressions, like 2+3 or "a" + "b"). - support for more general lvalues (anything in the left side of an assignment operator). For now an lvalue is either an avp or a script pvar. lvalue = rvalue_expression. Direct assignments (lvalue to avp or pvar) are optimised. --- lvalue.c | 361 ++++++++++++++++ lvalue.h | 67 +++ rvalue.c | 1377 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ rvalue.h | 175 ++++++++ 4 files changed, 1980 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1c7…

15 years, 9 months

git:master: kamailio compatibility, add shm_strdup and pkg_strdup implementation

by Henning Westerholt

Module: sip-router Branch: master Commit: 4bcc8357d12d1b2563cb3c7248804806c1ff4a9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bcc835… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Dec 2 16:05:48 2008 +0100 kamailio compatibility, add shm_strdup and pkg_strdup implementation --- ut.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/ut.h b/ut.h index e8ff01b..45cf559 100644 --- a/ut.h +++ b/ut.h @@ -61,6 +61,8 @@ #include "config.h" #include "dprint.h" #include "str.h" +#include "mem/mem.h" +#include "mem/shm_mem.h" @@ -592,6 +594,45 @@ static inline int str2sint(str* _s, int* _r) return 0; } +/** + * \brief Make a copy of a str structure using shm_malloc + * \param dst destination + * \param src source + * \return 0 on success, -1 on failure + */ +static inline int shm_str_dup(str* dst, const str* src) +{ + dst->s = shm_malloc(src->len); + if (!dst->s) { + SHM_MEM_ERROR; + return -1; + } + + memcpy(dst->s, src->s, src->len); + dst->len = src->len; + return 0; +} + +/** + * \brief Make a copy of a str structure using pkg_malloc + * \param dst destination + * \param src source + * \return 0 on success, -1 on failure + */ +static inline int pkg_str_dup(str* dst, const str* src) +{ + dst->s = pkg_malloc(src->len); + if (dst->s==NULL) + { + PKG_MEM_ERROR; + return -1; + } + + memcpy(dst->s, src->s, src->len); + dst->len = src->len; + return 0; +} + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ int user2uid(int* uid, int* gid, char* user);

15 years, 9 months

string utility functions

by Henning Westerholt

Hi, several kamailio modules need various string utility functions in the core, e.g.: - shm_strdup, pkg_strdup - str_strcmp, str_casecmp In the kamailio core we implemented this in the ut.h file. Does the SER core already provide similiar functions? If not i can move the implementation code from kamailio to this file, if this place is appropriate. Henning

15 years, 9 months

Meeting at 25C3 in Berlin

by Henning Westerholt

Hello all, i'll be present this year at the 25th Chaos Communication Congress in Berlin [1], December 27th to 30th, 2008. So if some people here also participate in this event, and want to meet for some hacking sessions and discussions around the Kamailio/ sip-router project please drop me a personal mail. Regards, Henning [1] http://events.ccc.de/congress/2008/

15 years, 9 months

git:andrei/script_vars: script: ser, kamailio and max compat mode support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: f69ff7d9697349bf767f355be93eb15cdeab4e60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f69ff7d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Nov 29 17:12:16 2008 +0100 script: ser, kamailio and max compat mode support - script mode can be switched between ser compatible, kamailio compatible and max compatibility (compatible with both as much as possible), using #!SER, #!KAMAILIO or #!ALL on the first line (#!OPENSER and #!MAXCOMPAT are also allowed) --- NEWS | 18 +++++++++++++++- cfg.lex | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- sr_compat.c | 43 ++++++++++++++++++++++++++++++++++++++++ sr_compat.h | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index f9c0867..03852ee 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,24 @@ -Release notes for SIP Express Router (ser) +Release notes for SIP Router (sr) *********************************************** $Id$ +sip-router changes + +core: + - support for dual module interfaces: ser and kamailio +config script changes: + - script mode can be switched between ser compatible, kamailio compatible + and max compatibility (compatible with both as much as possible), using + #!SER + #!KAMAILIO + #!OPENSER + #!ALL + #!MAXCOMPAT + where #!KAMAILIO is equivalent with #!OPENSER and #!ALL with #!MAXCOMPAT + - support for kamailio style pvars + + 2.1.0 changes diff --git a/cfg.lex b/cfg.lex index b196c32..c4f5a14 100644 --- a/cfg.lex +++ b/cfg.lex @@ -89,6 +89,7 @@ #include "usr_avp.h" #include "select.h" #include "cfg.tab.h" + #include "sr_compat.h" /* states */ #define INITIAL_S 0 @@ -99,6 +100,7 @@ #define SELECT_S 5 #define AVP_PVAR_S 6 /* avp or pvar */ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ + #define PVARID_S 8 /* $foo.bar...*/ #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -124,7 +126,12 @@ %} /* start conditions */ -%x STRING1 STRING2 COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P +%x STRING1 STRING2 COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P PVARID + +/* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ +SER_CFG SER +KAMAILIO_CFG KAMAILIO|OPENSER +MAXCOMPAT_CFG MAXCOMPAT|ALL /* action keywords */ FORWARD forward @@ -761,8 +768,22 @@ EAT_ABLE [\ \t\b\r] return ID; } -<INITIAL>{VAR_MARK}{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); p_nest=1; - yymore();} +<INITIAL>{VAR_MARK}{LPAREN} { + switch(sr_cfg_compat){ + case SR_COMPAT_SER: + state=ATTR_S; BEGIN(ATTR); + yyless(1); + count(); + return ATTR_MARK; + break; + case SR_COMPAT_KAMAILIO: + case SR_COMPAT_MAX: + default: + state = PVAR_P_S; BEGIN(PVAR_P); + p_nest=1; yymore(); + break; + } + } /* eat everything between 2 () and return PVAR token and a string containing everything (including $ and ()) */ <PVAR_P>{RPAREN} { p_nest--; @@ -779,14 +800,38 @@ EAT_ABLE [\ \t\b\r] } <PVAR_P>. { yymore(); } +<PVARID>{ID}|'.' {yymore(); } +<PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); + p_nest=1; yymore(); } +<PVARID>. { count(); state=INITIAL_S; BEGIN(INITIAL); + return PVAR; + } -<INITIAL>{VAR_MARK} { state=AVP_PVAR_S; BEGIN(AVP_PVAR); yymore(); } + +<INITIAL>{VAR_MARK} { + switch(sr_cfg_compat){ + case SR_COMPAT_SER: + count(); + state=ATTR_S; BEGIN(ATTR); + return ATTR_MARK; + break; + case SR_COMPAT_KAMAILIO: + state=PVARID_S; BEGIN(PVARID); + yymore(); + break; + case SR_COMPAT_MAX: + default: + state=AVP_PVAR_S; BEGIN(AVP_PVAR); + yymore(); + break; + } + } /* avp prefix detected -> go to avp mode */ <AVP_PVAR>{AVP_PREF} | <AVP_PVAR>{ID}{LBRACK} { state = ATTR_S; BEGIN(ATTR); yyless(1); return ATTR_MARK; } <AVP_PVAR>{ID}{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); yymore(); } -<AVP_PVAR>{ID} { count(); addstr(&s_buf, yytext, yyleng); +<AVP_PVAR>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; memset(&s_buf, 0, sizeof(s_buf)); state = INITIAL_S; @@ -882,6 +927,12 @@ EAT_ABLE [\ \t\b\r] } <COMMENT>.|{EAT_ABLE}|{CR} { count(); }; +<INITIAL>{COM_LINE}!{SER_CFG}{CR} { count(); + sr_cfg_compat=SR_COMPAT_SER;} +<INITIAL>{COM_LINE}!{KAMAILIO_CFG}{CR} { count(); + sr_cfg_compat=SR_COMPAT_KAMAILIO;} +<INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); + sr_cfg_compat=SR_COMPAT_MAX;} <INITIAL>{COM_LINE}.*{CR} { count(); } <INITIAL>{ID} { count(); addstr(&s_buf, yytext, yyleng); @@ -916,6 +967,8 @@ EAT_ABLE [\ \t\b\r] " while parsing" " avp name\n"); break; + case PVARID_S: + p_nest=0; case PVAR_P_S: LOG(L_CRIT, "ERROR: unexpected EOF" " while parsing pvar name" diff --git a/sr_compat.c b/sr_compat.c new file mode 100644 index 0000000..79660ab --- /dev/null +++ b/sr_compat.c @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * Copyright (C) 2008 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. + */ +/** + * @file + * @brief ser/kamailio/openser compatibility macros & vars. + */ +/* + * History: + * -------- + * 2008-11-29 initial version (andrei) + */ + + +#include "sr_compat.h" + +#ifdef SR_SER +#define SR_DEFAULT_COMPAT SR_COMPAT_SER +#elif defined SR_KAMAILIO || defined SR_OPENSER +#define SR_DEFAULT_COMPAT SR_COMPAT_KAMAILIO +#elif defined SR_ALL || defined SR_MAX_COMPAT +#define SR_DEFAULT_COMPAT SR_COMPAT_MAX +#else +/* default */ +#define SR_DEFAULT_COMPAT SR_COMPAT_MAX +#endif + +int sr_compat=SR_DEFAULT_COMPAT; +int sr_cfg_compat=SR_DEFAULT_COMPAT; diff --git a/sr_compat.h b/sr_compat.h new file mode 100644 index 0000000..ba46bde --- /dev/null +++ b/sr_compat.h @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * Copyright (C) 2008 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. + */ +/** + * @file + * @brief ser/kamailio/openser compatibility macros & vars. + */ +/* + * History: + * -------- + * 2008-11-29 initial version (andrei) + */ + + +#ifndef _sr_compat_h +#define _sr_compat_h + +/** max compat mode: support as many features as possible from all xSERs */ +#define SR_COMPAT_MAX 0 +/** maximum compatibility mode with ser */ +#define SR_COMPAT_SER 1 +/** maximum compatibility mode with kamailio/openser */ +#define SR_COMPAT_KAMAILIO 2 +#define SR_COMPAT_OPENSER 2 + + +extern int sr_compat; +extern int sr_cfg_compat; + +#endif /* _sr_compat_h */

15 years, 9 months

git:andrei/script_vars: script: basic support for parsing pvar names

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 26a886bcdcd5901e87d2b1f1984de457eb9fb4d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26a886b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 28 20:24:04 2008 +0100 script: basic support for parsing pvar names - parse pvar names and try to guess on ambiguous pvar/avps identifiers (e.g.: $foo) --- cfg.lex | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ cfg.y | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 15 deletions(-) diff --git a/cfg.lex b/cfg.lex index 5af02db..56c51e5 100644 --- a/cfg.lex +++ b/cfg.lex @@ -75,6 +75,7 @@ * 2007-11-28 added TCP_OPT_{FD_CACHE, DEFER_ACCEPT, DELAYED_ACK, SYNCNT, * LINGER2, KEEPALIVE, KEEPIDLE, KEEPINTVL, KEEPCNT} (andrei) * 2008-01-24 added CFG_DESCRIPTION used by cfg_var (Miklos) + * 2008-11-28 added support for kamailio pvars and avp/pvar guessing (andrei) */ @@ -94,8 +95,10 @@ #define COMMENT_S 1 #define COMMENT_LN_S 2 #define STRING_S 3 - #define ATTR_S 4 - #define SELECT_S 5 + #define ATTR_S 4 /* avp/attr */ + #define SELECT_S 5 + #define AVP_PVAR_S 6 /* avp or pvar */ + #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -106,6 +109,7 @@ static int comment_nest=0; + static int p_nest=0; static int state=0, old_state=0, old_initial=0; static struct str_buf s_buf; int line=1; @@ -120,7 +124,7 @@ %} /* start conditions */ -%x STRING1 STRING2 COMMENT COMMENT_LN ATTR SELECT +%x STRING1 STRING2 COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P /* action keywords */ FORWARD forward @@ -219,7 +223,8 @@ PLUS "+" MINUS "-" /* Attribute specification */ -ATTR_MARK "$"|"%" +ATTR_MARK "%" +VAR_MARK "$" SELECT_MARK "@" ATTR_FROM "f" ATTR_TO "t" @@ -231,6 +236,9 @@ ATTR_FROMDOMAIN "fd" ATTR_TODOMAIN "td" ATTR_GLOBAL "g" +/* avp prefix */ +AVP_PREF (([ft][rud]?)|g)\. + /* config vars. */ DEBUG debug FORK fork @@ -729,7 +737,8 @@ EAT_ABLE [\ \t\b\r] <SELECT>{BINNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 2); return NUMBER; } -<INITIAL>{ATTR_MARK} { count(); state = ATTR_S; BEGIN(ATTR); return ATTR_MARK; } +<INITIAL>{ATTR_MARK} { count(); state = ATTR_S; BEGIN(ATTR); + return ATTR_MARK; } <ATTR>{ATTR_FROM} { count(); return ATTR_FROM; } <ATTR>{ATTR_TO} { count(); return ATTR_TO; } <ATTR>{ATTR_FROMURI} { count(); return ATTR_FROMURI; } @@ -742,15 +751,48 @@ EAT_ABLE [\ \t\b\r] <ATTR>{DOT} { count(); return DOT; } <ATTR>{LBRACK} { count(); return LBRACK; } <ATTR>{RBRACK} { count(); return RBRACK; } -<ATTR>{STAR} { count(); return STAR; } -<ATTR>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } -<ATTR>{ID} { count(); addstr(&s_buf, yytext, yyleng); - yylval.strval=s_buf.s; - memset(&s_buf, 0, sizeof(s_buf)); - state = INITIAL_S; - BEGIN(INITIAL); - return ID; - } +<ATTR>{STAR} { count(); return STAR; } +<ATTR>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } +<ATTR>{ID} { count(); addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + state = INITIAL_S; + BEGIN(INITIAL); + return ID; + } + +<INITIAL>{VAR_MARK}{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); p_nest=1; + yymore();} + /* eat everything between 2 () and return PVAR token and a string + containing everything (including $ and ()) */ +<PVAR_P>{RPAREN} { p_nest--; + if (p_nest==0){ + count(); + addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + state=INITIAL_S; + BEGIN(INITIAL); + return PVAR; + } + yymore(); + } +<PVAR_P>. { yymore(); } + + +<INITIAL>{VAR_MARK} { state=AVP_PVAR_S; BEGIN(AVP_PVAR); yymore(); } + /* avp prefix detected -> go to avp mode */ +<AVP_PVAR>{AVP_PREF} | +<AVP_PVAR>{ID}{LBRACK} { state = ATTR_S; BEGIN(ATTR); yyless(1); + return ATTR_MARK; } +<AVP_PVAR>{ID}{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); yymore(); } +<AVP_PVAR>{ID} { count(); addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + state = INITIAL_S; + BEGIN(INITIAL); + return AVP_OR_PVAR; + } <INITIAL>{IPV6ADDR} { count(); yylval.strval=yytext; return IPV6ADDR; } <INITIAL>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } diff --git a/cfg.y b/cfg.y index 5adc111..228d909 100644 --- a/cfg.y +++ b/cfg.y @@ -185,8 +185,17 @@ static struct ip_addr* ip_tmp; static struct avp_spec* s_attr; static select_t sel; static select_t* sel_ptr; +static pv_spec_t* pv_spec; static struct action *mod_func_action; +static struct avp_pvar_spec{ + int type; + union{ + struct avp_spec avp; + pv_spec_t pv; + }u; +} *apv_spec; + static void warn(char* s); static struct socket_id* mk_listen_id(char*, int, int); static struct name_lst* mk_name_lst(char* name, int flags); @@ -207,6 +216,8 @@ static void free_socket_id_lst(struct socket_id* i); struct socket_id* sockid; struct name_lst* name_l; struct avp_spec* attr; + struct pv_spec_t* pvar; + struct avp_pvar_spec* avp_pvar_s; select_t* select; } @@ -426,6 +437,7 @@ static void free_socket_id_lst(struct socket_id* i); %token ATTR_GLOBAL %token ADDEQ + %token STUN_REFRESH_INTERVAL %token STUN_ALLOW_STUN %token STUN_ALLOW_FP @@ -452,6 +464,9 @@ static void free_socket_id_lst(struct socket_id* i); %token <strval> ID %token <strval> STRING %token <strval> IPV6ADDR +%token <strval> PVAR +/* not clear yet if this is an avp or pvar */ +%token <strval> AVP_OR_PVAR /* other */ %token COMMA @@ -492,6 +507,8 @@ static void free_socket_id_lst(struct socket_id* i); %type <attr> attr_id_val %type <attr> attr_id_any %type <attr> attr_id_any_str +%type <pvar> pvar +%type <avp_pvar_s> avp_pvar /* %type <intval> class_id */ %type <intval> assign_op %type <select> select_id @@ -1954,7 +1971,7 @@ attr_id_any_str: s.len = strlen(s.s); if (parse_avp_name(&s, &type, &avp_spec->name, &idx)) { yyerror("error when parsing AVP"); - pkg_free(avp_spec); + pkg_free(avp_spec); YYABORT; } avp_spec->type = type; @@ -1962,6 +1979,52 @@ attr_id_any_str: $$ = avp_spec; } ; + +pvar: PVAR { + pv_spec=pkg_malloc(sizeof(*pv_spec)); + if (!pv_spec) { + yyerror("Not enough memory"); + YYABORT; + } + s.s=$1; s.len=strlen(s.s); + if (pv_parse_spec(&s, pv_spec)==0){ + yyerror("unknown script pseudo variable"); + pkg_free(pv_spec); + YYABORT; + } + $$=pv_spec; + BUG("parsed pvar \"%.*s\"\n", s.len, s.s); + } + ; + +avp_pvar: AVP_OR_PVAR { + apv=pkg_malloc(sizeof(*apv)); + if (!apv) { + yyerror("Not enough memory"); + YYABORT; + } + s.s=$1; s.len=strlen(s.s); + if (pv_parse_spec(&s, &apv_spec->u.pv)==0){ + /* not a pvar, try avps */ + /* TODO: test if in ser or k mode */ + if (parse_avp_name(&s, &type, &apv_spec->u.avp.name, &idx)) { + yyerror("error when parsing AVP"); + pkg_free(apv_spec); + YYABORT; + } + apv_spec->u.avp.type = type; + apv_spec->u.avp.index = idx; + apv_spec.type=APV_AVP_T; + }else{ + apv_spec.type=APV_PVAR_T; + } + $$ = apv_spec; + BUG("parsed ambigous avp/pvar \"%.*s\" to %d\n", s.len, s.s, + apv_spec.type); + } + ; + + /* assign_op: ADDEQ { $$ = ADD_T; } @@ -1979,6 +2042,8 @@ assign_action: | attr_id_ass assign_op select_id { $$=mk_action($2, 2, AVP_ST, (void*)$1, SELECT_ST, (void*)$3); } | attr_id_ass assign_op LPAREN exp RPAREN { $$ = mk_action($2, 2, AVP_ST, $1, EXPR_ST, $4); } ; + + avpflag_oper: SETAVPFLAG { $$ = 1; } | RESETAVPFLAG { $$ = 0; }

15 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev