sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:master: * Added missing "goto err; " in a mod_init() error case.

by Juha Heinanen

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

15 years, 8 months

git:master: pv: assignment to an avp with index '*'

by Daniel-Constantin Mierla

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

15 years, 8 months

git:master: core script parsing: better error & warning for while() & switch()

by Andrei Pelinescu-Onciul

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

15 years, 8 months

git:master: core script parser: allow expressions in return/drop

by Andrei Pelinescu-Onciul

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

15 years, 8 months

git:master: core script engine: support for rval expr. in return/drop

by Andrei Pelinescu-Onciul

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

15 years, 8 months

git:master: test: port carrierroute config load test to sr, add missing tmx mod to test 13

by Henning Westerholt

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

15 years, 8 months

git:master: test: port carrierroute DB load test to sr

by Henning Westerholt

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

15 years, 8 months

x-lite 3.0 on linux

by Daniel-Constantin Mierla

Hello, during last weeks while testing the kamailio (openser) modules with sip-router core I got x-lite 3.0 working on linux (ubuntu) with wine 1.1.20. I posted guidelines at: http://appdb.winehq.org/objectManager.php?sClass=version&iId=16413 Voice, IM&Presence seem to work just fine. Video was not tested as I couldn't make any wine application see the video cam, although it is working fine on linux with skype or ekiga. For me it is a great tool to test the presence, hope it will be useful for some of you as well. Apart of x-lite, I got other sip softphone working with wine: - pangolin - works fine, but the presence status changes are not sent to server (no PUBLISH) -- might be a bug in the software, maybe someone running it on windows can confirm it or not - zoiper communicator rc1 free edition for windows - linux version seems to be available now, but requires to register with their site Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 8 months

git:master: test: further adaptions for sr, test 12 still not work, missing return support

by Henning Westerholt

Module: sip-router Branch: master Commit: d1fe91745ef9517629e01c2ae38a8742d8a8899f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1fe917… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 13:04:26 2009 +0200 test: further adaptions for sr, test 12 still not work, missing return support --- test/unit/12.cfg | 52 ++++++++++++++++++++++++---------------------------- test/unit/12.sh | 20 ++++++++------------ test/unit/7.sh | 2 +- 3 files changed, 33 insertions(+), 41 deletions(-) diff --git a/test/unit/12.cfg b/test/unit/12.cfg index a8517a8..d1e11c7 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -1,23 +1,19 @@ log_stderror=yes listen=127.0.0.1 -mpath="../modules/" -loadmodule "db_mysql/db_mysql.so" -loadmodule "sl/sl.so" -loadmodule "tm/tm.so" -loadmodule "rr/rr.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "textops/textops.so" -loadmodule "xlog/xlog.so" -loadmodule "usrloc/usrloc.so" -loadmodule "registrar/registrar.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +loadpath "../../modules_k/" +loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "sl" +loadmodule "../../modules/tm/tm.so" +loadmodule "rr" +loadmodule "maxfwd" +loadmodule "textops" +loadmodule "xlog" +loadmodule "usrloc" +loadmodule "registrar" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="identity_user=i:81" -avp_aliases="identity_domain=i:82" -avp_aliases="identity_uri=i:83" - route{ xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $(rm{s.tolower}), transport: $rP:$Ri:$rp, user agent: $ua\n"); @@ -25,7 +21,7 @@ route{ xlog("L_ERR", "Error getting identity\n"); exit; } - xlog("L_ERR", "My identity: $avp(identity_uri)\n"); + xlog("L_ERR", "My identity: $avp(i:83)\n"); $var(x) = "sip:" + $fU +"@" + $td; xlog("var(x): $var(x), MD5 var(x): $(var(x){s.md5})\n"); @@ -89,24 +85,24 @@ route[1] { route[39] { if ($ai) { - $avp(identity_user)=$(ai{uri.user}); - $avp(identity_domain)=$(ai{uri.domain}); - $avp(identity_uri)=$ai; + $avp(i:81)=$(ai{uri.user}); + $avp(i:82)=$(ai{uri.domain}); + $avp(i:83)=$ai; xlog("L_ERR", "Getting identity from P-Asserted-Identity header\n"); } else if ($pu) { - $avp(identity_user)=$(pu{uri.user}); - $avp(identity_domain)=$(pu{uri.domain}); - $avp(identity_uri)=$pu; + $avp(i:81)=$(pu{uri.user}); + $avp(i:82)=$(pu{uri.domain}); + $avp(i:83)=$pu; xlog("L_ERR", "Getting identity from P-Preferred-Identity header\n"); } else if ($fu) { - $avp(identity_user)=$(fu{uri.user}); - $avp(identity_domain)=$(fu{uri.domain}); - $avp(identity_uri)=$fu; + $avp(i:81)=$(fu{uri.user}); + $avp(i:82)=$(fu{uri.domain}); + $avp(i:83)=$fu; xlog("L_ERR", "Getting identity from FROM URI\n"); } else { xlog("L_ERR", "No identity for $rm: $fu -> $ru\n"); - return(-1); + return;# -1; } - return (1); + return; #1; } diff --git a/test/unit/12.sh b/test/unit/12.sh index bd4b0a1..b3438b8 100755 --- a/test/unit/12.sh +++ b/test/unit/12.sh @@ -29,26 +29,24 @@ if ! (check_netcat && check_kamailio); then exit 0 fi ; -../$BIN -w . -f $CFG &> $TMPFILE +$BIN -w . -f $CFG &> $TMPFILE ret=$? sleep 1 -# register a user -cat register.sip | nc -q 1 -u localhost 5060 > /dev/null - -cd ../scripts if [ "$ret" -eq 0 ] ; then - ./$CTL ul show | grep "AOR:: 1000" > /dev/null + # register a user + cat register.sip | nc -q 1 -u localhost 5060 > /dev/null + $CTL ul show | grep "AOR:: 1000" > /dev/null ret=$? + # unregister the user + cat unregister.sip | nc -q 1 -u localhost 5060 > /dev/null fi ; -# unregister the user -cat ../test/unregister.sip | nc -q 1 -u localhost 5060 > /dev/null if [ "$ret" -eq 0 ] ; then - ./$CTL ul show | grep "AOR:: 1000" > /dev/null + $CTL ul show | grep "AOR:: 1000" > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then ret=1 @@ -85,9 +83,7 @@ if [ "$ret" -eq 0 ] ; then fi ; fi ; fi ; - -cd ../test - +cat $TMPFILE $KILL rm $TMPFILE diff --git a/test/unit/7.sh b/test/unit/7.sh index 0c631d0..b2851a4 100755 --- a/test/unit/7.sh +++ b/test/unit/7.sh @@ -33,7 +33,7 @@ if ! (check_kamailio); then fi ; # start -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1

15 years, 8 months

Auto-generated Docbook Documentation

by Jan Janak

Hello, Automatically generated HTML documentation from docbook documents stored in the git repository is available at http://sip-router.org/docbook/sip-router/branch/master/ This is all the docbook documentation that we currently have in the repository, including the documents under doc, modules, modules_k, modules_s, and lib subdirectories. The HTML documentation is updated automatically upon changes in the git repository. The script processes all directories that contain a Makefile with the string "docbook_dir" in it. If you add a new directory with docbook documentation anywhere in the git repository then add a Makefile in the directory that can be used to build the documentation and your documentation will be automatically converted to HTML and uploaded to the server. We do not have fancy stuff like module lists or documentation index yet. Also the CSS stylesheets need some changes to produce better-looking HTML pages and images are missing if they were included in a docbook document. We can address that later. Jan.

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev