sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:sr_3.0: core: fix return not working inside a while() loop

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: f90397b76e48f33386175d298326143311be48cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f90397b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 22:04:44 2010 +0100 core: fix return not working inside a while() loop Reported-by: Juha Heinanen jh tutpro com Closes: FlySpray#46. (cherry picked from commit 0581efe06a8fb0ffe15542c343ae7ac0bc20cbbb) --- action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action.c b/action.c index ddbf445..4edf023 100644 --- a/action.c +++ b/action.c @@ -1116,7 +1116,7 @@ match_cleanup: flags=0; rve=(struct rval_expr*)a->val[0].u.data; ret=1; - while(!(flags & BREAK_R_F) && + while(!(flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)) && (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ i++; if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ @@ -1131,7 +1131,7 @@ match_cleanup: ret=run_actions(h, (struct action*)a->val[1].u.data, msg); flags|=h->run_flags; h->run_flags &= ~BREAK_R_F; /* catch breaks, but let - returns passthrough */ + returns pass-through */ } } break;

14 years, 10 months

git:sr_3.0: makefile: fix install utils

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 7a3daa1752056891739c8a9e60e41e1009af9505 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a3daa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 22 16:33:04 2010 +0100 makefile: fix install utils - previous commit broke installation of utils by a c&p error to non-empty test to utils variable (r => ut) - extra check for directory existence - credits to Federico M. and Nathaniel L Keeling III for reporting (cherry picked from commit 641a41b6e9cf1387c24dd9f863db978c8018df80) --- Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0132d71..52f98f8 100644 --- a/Makefile +++ b/Makefile @@ -986,8 +986,10 @@ install-utils: utils $(bin_prefix)/$(bin_dir) fi ; \ done; true @for ut in $(C_INSTALL_UTILS) "" ; do \ - if [ -n "$$r" ]; then \ - $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + if [ -n "$$ut" ]; then \ + if [ -d "$$ut" ]; then \ + $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + fi ;\ fi ; \ done; true

14 years, 10 months

git:sr_3.0: makefile: presence_mwi added to excluded list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: be2ab41f8a87861a8cfd10cb33103191680b2a79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be2ab41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 24 22:44:49 2010 +0100 makefile: presence_mwi added to excluded list - patch by Ovidiu Sas, tracker FS#45 - makes no sense to build it out of presence group - kpresence group includes it and makes easier packaging (cherry picked from commit d91a9b021c494678cd20bc3fd444f9d4d565ec65) --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 52f98f8..7a4f7ce 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,7 @@ else perl perlvdb purple seas \ snmpstats xmpp \ carrierroute misc_radius peering \ - dialplan lcr utils presence \ + dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ regex xcap_client

14 years, 10 months

git:master: core: fix return not working inside a while() loop

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0581efe06a8fb0ffe15542c343ae7ac0bc20cbbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0581efe… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 22:04:44 2010 +0100 core: fix return not working inside a while() loop Reported-by: Juha Heinanen jh tutpro com Closes: FlySpray#46. --- action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action.c b/action.c index e39b539..ef33814 100644 --- a/action.c +++ b/action.c @@ -1134,7 +1134,7 @@ match_cleanup: flags=0; rve=(struct rval_expr*)a->val[0].u.data; ret=1; - while(!(flags & BREAK_R_F) && + while(!(flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)) && (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ i++; if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ @@ -1149,7 +1149,7 @@ match_cleanup: ret=run_actions(h, (struct action*)a->val[1].u.data, msg); flags|=h->run_flags; h->run_flags &= ~BREAK_R_F; /* catch breaks, but let - returns passthrough */ + returns pass-through */ } } break;

14 years, 10 months

[tracker] Task closed: pv argument support for route() function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#52 - pv argument support for route() function User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Implemented Additional comments about closing: GIT#d75db62 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=52 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

[tracker] Comment added: pv argument support for route() function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#52 - pv argument support for route() function User who did this - Andrei Pelinescu-Onciul (andrei) ---------- I've just added support for generic rvalue expressions (see GIT#d75db62). E.g.: route("foo"+$i) or route((a)received.proto +"_proto_"+$var(route_set)) will work now. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=52#comment50 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

git:master: core: route(): added support for rvalue expressions parameters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d75db62dc2c859165fc3f72b256393678fcd00f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d75db62… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 23:20:17 2010 +0100 core: route(): added support for rvalue expressions parameters route($foo+$bar+"test") will work now. Constant values (e.g. route("foo"+"bar") are optimized to the simple string case (route("foobar")). Closes FlySpray#52. --- NEWS | 1 + action.c | 35 ++++++++++++++++++++++++++++++----- cfg.y | 11 ++++++++++- route.c | 34 ++++++++++++++++++++++++++++++++-- 4 files changed, 73 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 1e5d4b5..de353af 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ core: - global, per protocol blacklist ignore masks (via extended send_flags). See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask). - per message blacklist ignore masks + - route() now supports rvalue expressions (e.g. route("test"+$i)) new config variables: - dst_blacklist_udp_imask - global blacklist events ignore mask for udp diff --git a/action.c b/action.c index c4823e6..70cec69 100644 --- a/action.c +++ b/action.c @@ -481,20 +481,45 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; break; case ROUTE_T: - if (a->val[0].type!=NUMBER_ST){ + if (likely(a->val[0].type == NUMBER_ST)) + i = a->val[0].u.number; + else if (a->val[0].type == RVE_ST) { + rv = rval_expr_eval(h, msg, a->val[0].u.data); + rval_cache_init(&c1); + if (unlikely(rv == 0 || + rval_get_tmp_str(h, msg, &s, rv, 0, &c1) < 0)) { + rval_destroy(rv); + rval_cache_clean(&c1); + ERR("failed to convert RVE to string\n"); + ret = E_UNSPEC; + goto error; + } + i = route_lookup(&main_rt, s.s); + if (unlikely(i < 0)) { + ERR("route \"%s\" not found at %s:%d\n", + s.s, (a->cfile)?a->cfile:"line", a->cline); + rval_cache_clean(&c1); + s.s = 0; + ret = E_SCRIPT; + goto error; + } + rval_cache_clean(&c1); + s.s = 0; + } else { LOG(L_CRIT, "BUG: do_action: bad route() type %d\n", a->val[0].type); ret=E_BUG; goto error; } - if ((a->val[0].u.number>=main_rt.idx)||(a->val[0].u.number<0)){ + if (unlikely((i>=main_rt.idx)||(i<0))){ LOG(L_ERR, "ERROR: invalid routing table number in" - "route(%lu)\n", a->val[0].u.number); + "route(%lu) at %s:%d\n", a->val[0].u.number, + (a->cfile)?a->cfile:"line", a->cline); ret=E_CFG; goto error; } - /*ret=((ret=run_actions(rlist[a->val[0].u.number], msg))<0)?ret:1;*/ - ret=run_actions(h, main_rt.rlist[a->val[0].u.number], msg); + /*ret=((ret=run_actions(rlist[a->val[0].u.number],msg))<0)?ret:1;*/ + ret=run_actions(h, main_rt.rlist[i], msg); h->last_retcode=ret; _last_returned_code = h->last_retcode; h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ diff --git a/cfg.y b/cfg.y index 2b12b67..4769ae1 100644 --- a/cfg.y +++ b/cfg.y @@ -3042,7 +3042,16 @@ cmd: } | ERROR error { $$=0; yyerror("missing '(' or ')' ?"); } | ERROR LPAREN error RPAREN { $$=0; yyerror("bad error argument"); } - | ROUTE LPAREN route_name RPAREN { + | ROUTE LPAREN rval_expr RPAREN { + if ($3) { + $$ = mk_action(ROUTE_T, 1, RVE_ST, (void*)$3); + set_cfg_pos($$); + } else { + $$ = 0; + YYERROR; + } + } + | ROUTE LPAREN ID RPAREN { if ($3) { $$ = mk_action(ROUTE_T, 1, STRING_ST, (void*)$3); set_cfg_pos($$); diff --git a/route.c b/route.c index 729860e..b1cd14c 100644 --- a/route.c +++ b/route.c @@ -639,6 +639,7 @@ int fix_actions(struct action* a) struct lvalue* lval; struct rval_expr* rve; struct rval_expr* err_rve; + struct rvalue* rv; enum rval_type rve_type, err_type, expected_type; @@ -1022,10 +1023,38 @@ int fix_actions(struct action* a) t->val[0].type=STR_ST; break; case ROUTE_T: + if (t->val[0].type == RVE_ST) { + rve=(struct rval_expr*)t->val[0].u.data; + if (!rve_is_constant(rve)) { + if ((ret=fix_rval_expr(&t->val[0].u.data)) < 0){ + ERR("route() failed to fix rve at %s:%d\n", + (t->cfile)?t->cfile:"line", t->cline); + ret = E_BUG; + goto error; + } + } else { + /* rve is constant => replace it with a string */ + if ((rv = rval_expr_eval(0, 0, rve)) == 0 || + rval_get_str(0, 0, &s, rv, 0) < 0) { + /* out of mem. or bug ? */ + rval_destroy(rv); + ERR("route() failed to fix ct. rve at %s:%d\n", + (t->cfile)?t->cfile:"line", t->cline); + ret = E_BUG; + goto error; + } + rval_destroy(rv); + rve_destroy(rve); + t->val[0].type = STRING_ST; + t->val[0].u.string = s.s; + t->val[0].u.str.len = s.len; /* not used */ + /* fall-through the STRING_ST if */ + } + } if (t->val[0].type == STRING_ST) { i=route_lookup(&main_rt, t->val[0].u.string); if (i < 0) { - ERR("route \"%s\" not found at %s:%d\n", + ERR("route \"%s\" not found at %s:%d\n", t->val[0].u.string, (t->cfile)?t->cfile:"line", t->cline); ret = E_SCRIPT; @@ -1034,7 +1063,8 @@ int fix_actions(struct action* a) t->val[0].type = NUMBER_ST; pkg_free(t->val[0].u.string); t->val[0].u.number = i; - } else if (t->val[0].type != NUMBER_ST) { + } else if (t->val[0].type != NUMBER_ST && + t->val[0].type != RVE_ST) { BUG("invalid subtype %d for route()\n", t->val[0].type); ret = E_BUG;

14 years, 10 months

[tracker] Task closed: route is not called and no error is produced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#51 - route is not called and no error is produced User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed Additional comments about closing: Fixed in GIT#0a3ab1. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=51 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

[tracker] Comment added: route is not called and no error is produced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#51 - route is not called and no error is produced User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Ok, now it won't start if a route does no exist, e.g.: ERROR: <core> [route.c:1030]: route "foo" not found at /home/andrei/sr.git/while.cfg:37 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=51#comment49 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

[tracker] Task closed: return does not work when called inside while statement

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#46 - return does not work when called inside while statement User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed Additional comments about closing: Fixed in GIT#0a3ab1. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=46 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev