sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: tm: added drop functionality for branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 45b224a69d350506cf7881a352a43eaebafb2825 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45b224a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 15 11:02:06 2010 +0200 tm: added drop functionality for branch_route - missing part of K integration - credits to Andreas Granig for reporting and testing (cherry picked from commit d592824b6e1b0d31a0d4fff28d003cc4c3c878bc) --- modules/tm/t_fwd.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 1e9644d..b704426 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -204,6 +204,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, snd_flags_t rpl_snd_flags_bak; struct socket_info *force_send_socket_bak; struct dest_info *dst; + struct run_act_ctx ctx; shbuf=0; ret=E_UNSPEC; @@ -333,7 +334,8 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* set the new values */ i_req->fwd_send_flags=snd_flags /* intial value */; set_force_socket(i_req, fsocket); - if (run_top_route(branch_rt.rlist[branch_route], i_req, 0) < 0) + if (run_top_route(branch_rt.rlist[branch_route], i_req, &ctx) + < 0) { LOG(L_ERR, "Error in run_top_route\n"); } @@ -345,6 +347,13 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->fwd_send_flags=fwd_snd_flags_bak; i_req->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(i_req, BRANCH_CB_TYPE); + /* if DROP was called in cfg, don't forward, jump to end */ + if (unlikely(ctx.run_flags&DROP_R_F)) + { + tm_ctx_set_branch_index(0); + set_route_type(backup_route_type); + goto error03; + } } tm_ctx_set_branch_index(0); set_route_type(backup_route_type);

14 years, 9 months

git:master: tm: added drop functionality for branch_route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d592824b6e1b0d31a0d4fff28d003cc4c3c878bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d592824… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 15 11:02:06 2010 +0200 tm: added drop functionality for branch_route - missing part of K integration - credits to Andreas Granig for reporting and testing --- modules/tm/t_fwd.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index c518592..24dfeb1 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -204,6 +204,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, snd_flags_t rpl_snd_flags_bak; struct socket_info *force_send_socket_bak; struct dest_info *dst; + struct run_act_ctx ctx; shbuf=0; ret=E_UNSPEC; @@ -333,7 +334,8 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* set the new values */ i_req->fwd_send_flags=snd_flags /* intial value */; set_force_socket(i_req, fsocket); - if (run_top_route(branch_rt.rlist[branch_route], i_req, 0) < 0) + if (run_top_route(branch_rt.rlist[branch_route], i_req, &ctx) + < 0) { LOG(L_ERR, "Error in run_top_route\n"); } @@ -345,6 +347,13 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->fwd_send_flags=fwd_snd_flags_bak; i_req->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(i_req, BRANCH_CB_TYPE); + /* if DROP was called in cfg, don't forward, jump to end */ + if (unlikely(ctx.run_flags&DROP_R_F)) + { + tm_ctx_set_branch_index(0); + set_route_type(backup_route_type); + goto error03; + } } tm_ctx_set_branch_index(0); set_route_type(backup_route_type);

14 years, 9 months

[tracker] Task opened: Implement "u" rpc formating char

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - Implement "u" rpc formating char Task Type - Improvement Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Its not currently possible to print unsigned int correctly by rpc calls, because "u" formatting char has not been implemented. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=64 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, 9 months

[tracker] Assignee added: Implement "u" rpc formating char

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#64 - Implement "u" rpc formating char User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=64 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, 9 months

unsigned int formatting char in rpc->struct_add?

by jh＠tutpro.com

i noticed that lcr.dump_gws prints defunct_until as a signed int, which is wrong, because the value is unsigned int. the statement in the code is this: rpc->struct_add(st, "dSddd", "strip", gws[i].strip, "tag", &tag, "weight", gws[i].weight, "flags", gws[i].flags, "defunct_until", &gws[i].defunct_until ); i tried to change the format string to "dSddu", but it didn't work: Apr 14 12:49:34 localhost /usr/sbin/sip-proxy[30850]: : ctl [binrpc_run.c:1001]: BUG: binrpc: rpc_struct_add: formatting char 'u' not supported } what is the correct formatting char for unsigned int or is there any? -- juha

14 years, 9 months

[tracker] Assignee added: modules/tm: incorrect t_on_branch() documentation

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#63 - modules/tm: incorrect t_on_branch() documentation User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=63 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, 9 months

[tracker] Task opened: modules/tm: incorrect t_on_branch() documentation

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - modules/tm: incorrect t_on_branch() documentation Task Type - Bug Report Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - tm/README says: 1.5.5. t_on_branch(branch_route) ... Note that the set of commands which are usable within branch_routes is very limited. It is not possible to drop a message or generate a reply. this is not correct, because it IS possible to call drop() in branch route. i do not dare to touch tm documentation myself, so someone more familiar with t_on_branch() should fix README text on t_on_branch(). More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=63 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, 9 months

reminder: irc devel meeting, apr 14, 15:00utc

by Daniel-Constantin Mierla

Hello, short reminders about tomorrow's IRC devel meeting on #sip-router / irc.freenode.net. Add your topics to wiki if you want something to be discussed: http://sip-router.org/wiki/devel/irc-meetings/next Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/ * http://twitter.com/miconda * http://www.linkedin.com/in/danielconstantinmierla

14 years, 9 months

git:kamailio_3.0: modules/lcr: always use current time when loading gateways

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 2da81aa4f591f0dfef49cd6acabd19baa7b2dd8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2da81aa… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 14 17:17:59 2010 +0300 modules/lcr: always use current time when loading gateways - Always use current time when deciding if a gateway is defunct or not. Otherwise a gateway may get used even if its defunct until time in database is greater than current time. (cherry picked from commit 0c819f3ff3d947897fa0bafbaaa0081b671bb4e4) --- modules/lcr/lcr_mod.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 9748024..65c65d1 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1746,12 +1746,11 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) gw_count = gws[0].ip_addr; if (defunct_capability > 0) { - now = time((time_t *)NULL); delete_avp(defunct_gw_avp_type, defunct_gw_avp); - } else { - now = MAX_UVAR_VALUE(now); } + now = time((time_t *)NULL); + while (pl) { if (ruri_user.len < pl->prefix_len) { pl = pl->next;

14 years, 9 months

git:sr_3.0: modules/lcr: always use current time when loading gateways

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 0c819f3ff3d947897fa0bafbaaa0081b671bb4e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c819f3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 14 17:17:59 2010 +0300 modules/lcr: always use current time when loading gateways - Always use current time when deciding if a gateway is defunct or not. Otherwise a gateway may get used even if its defunct until time in database is greater than current time. --- modules/lcr/lcr_mod.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 9748024..65c65d1 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1746,12 +1746,11 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) gw_count = gws[0].ip_addr; if (defunct_capability > 0) { - now = time((time_t *)NULL); delete_avp(defunct_gw_avp_type, defunct_gw_avp); - } else { - now = MAX_UVAR_VALUE(now); } + now = time((time_t *)NULL); + while (pl) { if (ruri_user.len < pl->prefix_len) { pl = pl->next;

14 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev