sr-dev

sr-dev@lists.kamailio.org

44307 discussions

[tracker] Comment added: return does not work when called inside while statement

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#46 - return does not work when called inside while statement User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Thanks, should be 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#comment48 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: fix run_actions w/o USE_LONGJMP

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cf2ecfaa0dd1b316e405d508eac4f4b9ae2296b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf2ecfa… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 22:06:42 2010 +0100 core: fix run_actions w/o USE_LONGJMP - fix retcode not set in run_actions() if USE_LONGJMP is not defined. - minor optimizations (likely()/unlikely()). --- action.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/action.c b/action.c index ef33814..c4823e6 100644 --- a/action.c +++ b/action.c @@ -1282,18 +1282,18 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_UNSPEC; h->rec_lev++; - if (h->rec_lev>ROUTE_MAX_REC_LEV){ + if (unlikely(h->rec_lev>ROUTE_MAX_REC_LEV)){ LOG(L_ERR, "WARNING: too many recursive routing table lookups (%d)" " giving up!\n", h->rec_lev); ret=E_UNSPEC; goto error; } - if (h->rec_lev==1){ + if (unlikely(h->rec_lev==1)){ h->run_flags=0; h->last_retcode=0; _last_returned_code = h->last_retcode; #ifdef USE_LONGJMP - if (setjmp(h->jmp_env)){ + if (unlikely(setjmp(h->jmp_env))){ h->rec_lev=0; ret=h->last_retcode; goto end; @@ -1301,7 +1301,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) #endif } - if (a==0){ + if (unlikely(a==0)){ DBG("DEBUG: run_actions: null action list (rec_level=%d)\n", h->rec_lev); ret=1; @@ -1311,11 +1311,11 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=do_action(h, t, msg); /* break, return or drop/exit stop execution of the current block */ - if (h->run_flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)){ - if (h->run_flags & EXIT_R_F){ -#ifdef USE_LONGJMP + if (unlikely(h->run_flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F))){ + if (unlikely(h->run_flags & EXIT_R_F)) { h->last_retcode=ret; _last_returned_code = h->last_retcode; +#ifdef USE_LONGJMP longjmp(h->jmp_env, ret); #endif } @@ -1327,10 +1327,10 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->rec_lev--; end: /* process module onbreak handlers if present */ - if (h->rec_lev==0 && ret==0) + if (unlikely(h->rec_lev==0 && ret==0)) for (mod=modules;mod;mod=mod->next) - if ((mod->mod_interface_ver==0) && mod->exports && - mod->exports->v0.onbreak_f) { + if (unlikely((mod->mod_interface_ver==0) && mod->exports && + mod->exports->v0.onbreak_f)) { mod->exports->v0.onbreak_f( msg ); DBG("DEBUG: %s onbreak handler called\n", mod->exports->c.name);

14 years, 10 months

git:master: core: trying to execute an undefined route will produce an error

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0a3ab1b240c9879748ffe2f7b4f684510901dacc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a3ab1b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 22:10:27 2010 +0100 core: trying to execute an undefined route will produce an error Trying to call non-existing routes (via route("...")) will result now in an error on startup (during fixups). The old behaviour was to consider any non-existing routes as empty (and do nothing). Reported-by: Juha Heinanen jh tutpro com Closes: FlySpray#51. --- cfg.y | 16 ++++++++-------- route.c | 30 +++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/cfg.y b/cfg.y index a9350ec..2b12b67 100644 --- a/cfg.y +++ b/cfg.y @@ -3043,14 +3043,14 @@ cmd: | ERROR error { $$=0; yyerror("missing '(' or ')' ?"); } | ERROR LPAREN error RPAREN { $$=0; yyerror("bad error argument"); } | ROUTE LPAREN route_name RPAREN { - i_tmp=route_get(&main_rt, $3); - if (i_tmp==-1){ - yyerror("internal error"); - YYABORT; - } - $$=mk_action(ROUTE_T, 1, NUMBER_ST,(void*)(long)i_tmp); - set_cfg_pos($$); - } + if ($3) { + $$ = mk_action(ROUTE_T, 1, STRING_ST, (void*)$3); + set_cfg_pos($$); + } else { + $$ = 0; + YYERROR; + } + } | ROUTE error { $$=0; yyerror("missing '(' or ')' ?"); } | ROUTE LPAREN error RPAREN { $$=0; yyerror("bad route argument"); } | EXEC LPAREN STRING RPAREN { $$=mk_action(EXEC_T, 1, STRING_ST, $3); set_cfg_pos($$); } diff --git a/route.c b/route.c index 0268c12..729860e 100644 --- a/route.c +++ b/route.c @@ -727,7 +727,7 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - ret = E_UNSPEC; + ret = E_SCRIPT; goto error; } /* it's not an error anymore to have non-int in an if, @@ -810,14 +810,14 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - ret = E_UNSPEC; + ret = E_SCRIPT; goto error; } 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); - ret = E_UNSPEC; + ret = E_SCRIPT; goto error; } if ((ret=fix_rval_expr(&t->val[0].u.data))<0) @@ -854,14 +854,14 @@ int fix_actions(struct action* a) LOG(L_ERR, "fix_actions: invalid expression " "(%d,%d): type mismatch?", rve->fpos.s_line, rve->fpos.s_col); - ret = E_UNSPEC; + ret = E_SCRIPT; goto error; } 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); - ret = E_UNSPEC; + ret = E_SCRIPT; goto error; } if ((ret=fix_rval_expr(&t->val[0].u.data))<0) @@ -1021,6 +1021,26 @@ int fix_actions(struct action* a) t->val[0].u.str=s; t->val[0].type=STR_ST; break; + case ROUTE_T: + 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", + t->val[0].u.string, + (t->cfile)?t->cfile:"line", t->cline); + ret = E_SCRIPT; + goto error; + } + 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) { + BUG("invalid subtype %d for route()\n", + t->val[0].type); + ret = E_BUG; + goto error; + } + break; default: /* no fixup required for the rest */ break;

14 years, 10 months

Distinguish between local 408 generated after "fr_inv_timer" and "fr_timer"

by Iñaki Baz Castillo

Hi, this is a common issue reported by other users. Imagine I do failover between two gateways based on request timeout: ------------------------------ failure_route[FAILURE_ROUTE_OUT] { # Locally generated 408 due to transaction timeout: if (t_local_replied("last") && $T_reply_code==408) { xlog("L_ERROR", "_ERROR_ $T_reply_code local replied => failover\n"); ... do failover ... } } ------------------------------ The above code runs when the gateway-1 doesn't reply at all so "fr_timer" expires (let's say 5 seconds). The problem is that such code also runs when no final response at all is received from gateway-1 in "fr_inv_timer" (let's say 150 seconds). This is, 408 is locallly generated even if the proxy has received provisional responses for such transaction. Main problem this originates is the fact that the list of gateways could end without any of them giving a final reply, and when no more gateways are available it's common to reply 500/503 to the client. Two workarounds: a) When no more gateways are available inspect if $T_reply_code==408 and then reply 408 rather than 500/503. I don't like it as if no one gateways has replied a provisional response in "fr_timer" then I have a *real* problem and I should reply 500/503. b) Enable a flag(PROVISIONAL_RECEIVED) when a provisional response is received and then reply 408/480 when no more gateways are available. Anyhow, there should be (IMHO) a in-built way to determine if the 408 occurs after "fr_timer" or "fr_inv_timer". Do I miss something? do you consider this a real need? Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 10 months

[tracker] Task closed: allow choosing of avp syntax

by jh＠tutpro.com

sip-router writes: > Additional comments about closing: It's already implemented: start > your .cfg file with #!KAMAILIO or #!OPENSER and you will have > kamailio/openser syntax. > Use #!SER if you want ser syntax and nothing or #!ALL or #!MAXCOMPAT > if you want the combination between the two (ser & k syntax in the > same time). ok, thanks, juha

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 - Juha Heinanen (jh) ---------- i still think this is a bug, because trying to execute a non-existing route (in this case "$var(test)"), should produce an error to syslog. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=51#comment47 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 reopened: route is not called and no error is produced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#51 - route is not called and no error is produced User who did this - Juha Heinanen (jh) 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] Task reopened: route is not called and no error is produced

by sip-router

14 years, 10 months

[tracker] Task closed: allow choosing of avp syntax

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#47 - allow choosing of avp syntax User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Implemented Additional comments about closing: It's already implemented: start your .cfg file with #!KAMAILIO or #!OPENSER and you will have kamailio/openser syntax. Use #!SER if you want ser syntax and nothing or #!ALL or #!MAXCOMPAT if you want the combination between the two (ser & k syntax in the same time). More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=47 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: 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: Not a bug Additional comments about closing: You are trying to execute the route "$var(test)" which does not exist (rvals are _not_ expanded when quoted). It's the same as trying route("foobar"). 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev