sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:rbetancor/drouting: drouting: Now the module compiles, but it' s not tested

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 1ea464a3ee271810a560ca3c4cee0e96d8790027 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ea464a… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 18:08:52 2009 +0100 drouting: Now the module compiles, but it's not tested - fixed call to sip_resolvehost --- modules_k/drouting/routing.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c index 79f3e73..618f413 100644 --- a/modules_k/drouting/routing.c +++ b/modules_k/drouting/routing.c @@ -351,8 +351,7 @@ add_dst( } /* note we discard the port discovered by the resolve function - we are interested only in the port that was actually configured. */ - if ( (he=sip_resolvehost( &uri.host, NULL, &uri.proto, - (uri.type==SIPS_URI_T), 0))==0 ) { + if ( (he=sip_resolvehost( &uri.host, NULL, (char*)(void*)&uri.proto)==0 )) { if(dr_force_dns) { LM_ERR("cannot resolve <%.*s>\n",

15 years, 6 months

git:rbetancor/drouting: drouting: Makefile fixed to compile with OPENSER_MOD_INTERFACE

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: c4f2871cd47376ee1c5131dbbf5c8151753ff905 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4f2871… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sat Jun 20 00:45:02 2009 +0100 drouting: Makefile fixed to compile with OPENSER_MOD_INTERFACE --- modules_k/drouting/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/drouting/Makefile b/modules_k/drouting/Makefile index c0cecae..acc2c1a 100644 --- a/modules_k/drouting/Makefile +++ b/modules_k/drouting/Makefile @@ -6,5 +6,6 @@ include ../../Makefile.defs auto_gen= NAME=drouting.so LIBS= +DEFS+=-DOPENSER_MOD_INTERFACE include ../../Makefile.modules

15 years, 6 months

git:rbetancor/drouting: drouting:

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 854020b243c1c608324c41621da583ca5ad30a7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=854020b… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 16:29:58 2009 +0100 drouting: - fixed do_action calls --- modules_k/drouting/drouting.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 6c76f21..a5bb756 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -632,7 +632,7 @@ static int use_next_gw(struct sip_msg* msg) if (!avp) return -1; - if (rewrite_ruri(msg, &val.s.s)==-1) { + if (rewrite_ruri(msg, &val)==-1) { LM_ERR("failed to rewite RURI\n"); return -1; } @@ -975,13 +975,15 @@ static int fixup_from_gw( void** param, int param_no) static int strip_username(struct sip_msg* msg, int strip) { struct action act; + struct run_act_ctx ra_ctx; act.type = STRIP_T; - act.elem[0].type = NUMBER_ST; - act.elem[0].u.number = strip; + act.val[0].type = NUMBER_ST; + act.val[0].u.number = strip; act.next = 0; - if (do_action(&act, msg) < 0) + init_run_actions_ctx(&ra_ctx); + if (do_action(&ra_ctx, &act, msg) < 0) { LM_ERR( "Error in do_action\n"); return -1;

15 years, 6 months

git:rbetancor/drouting: drouting: Module for more flexible dynamic routing rules

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: e90d502b2620391047b04c670c6c408b75d362f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e90d502… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 15:42:11 2009 +0100 drouting: Module for more flexible dynamic routing rules - disabled blacklisting support till reviewed sr bl support --- modules_k/drouting/dr_bl.c | 32 ++++++++++++++++---------------- modules_k/drouting/dr_bl.h | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules_k/drouting/dr_bl.c b/modules_k/drouting/dr_bl.c index ebc14c3..3e38585 100644 --- a/modules_k/drouting/dr_bl.c +++ b/modules_k/drouting/dr_bl.c @@ -125,12 +125,12 @@ int init_dr_bls(void) bl_lists[i] = NULL; /* create backlist for it */ - drbl->bl = create_bl_head( 131313, 0/*flags*/, NULL, NULL, &name); - if (drbl->bl==NULL) { - LM_ERR("failed to create bl <%.*s>\n",name.len,name.s); - shm_free(drbl); - return -1; - } + //drbl->bl = create_bl_head( 131313, 0/*flags*/, NULL, NULL, &name); + //if (drbl->bl==NULL) { + // LM_ERR("failed to create bl <%.*s>\n",name.len,name.s); + // shm_free(drbl); + // return -1; + //} /* link it */ drbl->next = drbl_lists; @@ -181,21 +181,21 @@ int populate_dr_bls(pgw_addr_t *pgwa) continue; } /* add this destination to the BL */ - add_rule_to_list( &drbl_first, &drbl_last, - gw_net, - NULL/*body*/, - 0/*port*/, - PROTO_NONE/*proto*/, - 0/*flags*/); + //add_rule_to_list( &drbl_first, &drbl_last, + // gw_net, + // NULL/*body*/, + // 0/*port*/, + // PROTO_NONE/*proto*/, + // 0/*flags*/); pkg_free(gw_net); } } } /* the new content for the BL */ - if (add_list_to_head( drbl->bl, drbl_first, drbl_last, 1, 0)!=0) { - LM_ERR("failed to update bl\n"); - return -1; - } + //if (add_list_to_head( drbl->bl, drbl_first, drbl_last, 1, 0)!=0) { + // LM_ERR("failed to update bl\n"); + // return -1; + //} } return 0; diff --git a/modules_k/drouting/dr_bl.h b/modules_k/drouting/dr_bl.h index b9bc11b..e9547b0 100644 --- a/modules_k/drouting/dr_bl.h +++ b/modules_k/drouting/dr_bl.h @@ -29,7 +29,7 @@ #define _DR_DR_BL_H #include "../../sr_module.h" -#include "../../blacklists.h" +//#include "../../blacklists.h" #include "prefix_tree.h" #define MAX_TYPES_PER_BL 32

15 years, 6 months

git:rbetancor/drouting: drouting: Documentation updated

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 9d8cb1917800e096d8a34232e63fb01ca83855d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d8cb19… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sat Jun 20 00:58:32 2009 +0100 drouting: Documentation updated - entities.xml path fixed - &osips references changed to &kamailio references - README regenated --- modules_k/drouting/README | 825 ++++++++++++++++------------- modules_k/drouting/doc/drouting.xml | 4 +- modules_k/drouting/doc/drouting_admin.xml | 6 +- modules_k/drouting/doc/drouting_devel.xml | 2 +- 4 files changed, 451 insertions(+), 386 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9d8…

15 years, 6 months

git:master: tm: suspended transaction was not always replied and freed

by Miklos Tirpak

Module: sip-router Branch: master Commit: 090243564b4d54be19991457f7e014c46a131e06 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0902435… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Jul 2 18:37:56 2009 +0200 tm: suspended transaction was not always replied and freed - When the suspended transaction continued but no new UAC was added to the transaction, for example all the new branches tried to reach a blacklisted destination, then there was no error message returned and the transaction was never freed. --- modules/tm/t_suspend.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 3c22ab9..2a0cb05 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -39,6 +39,7 @@ #include "h_table.h" #include "t_lookup.h" #include "t_fwd.h" +#include "t_funcs.h" #include "timer.h" #include "t_suspend.h" @@ -145,6 +146,8 @@ int t_continue(unsigned int hash_index, unsigned int label, Not a huge problem, fr timer will fire, but CANCEL will not be sent. last_received will be set to 408. */ + reset_kr(); + /* fake the request and the environment, like in failure_route */ if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */, uac)) { LOG(L_ERR, "ERROR: t_continue: fake_req failed\n"); @@ -171,9 +174,44 @@ int t_continue(unsigned int hash_index, unsigned int label, /* update the flags */ t->uas.request->flags = faked_req.flags; + if (t->uas.status < 200) { + /* No final reply has been sent yet. + * Check whether or not there is any pending branch. + */ + for ( branch = 0; + branch < t->nr_of_outgoings; + branch++ + ) { + if ((t->uac[branch].request.buffer != NULL) + && (t->uac[branch].last_received < 200) + ) + break; + } + + if (branch == t->nr_of_outgoings) { + /* There is not any open branch so there is + * no chance that a final response will be received. + * The script has hopefully set the error code. If not, + * let us reply with a default error. + */ + if ((kill_transaction_unsafe(t, + tm_error ? tm_error : E_UNSPEC)) <=0 + ) { + LOG(L_ERR, "ERROR: t_continue: " + "reply generation failed\n"); + /* The transaction must be explicitely released, + no more timer is running */ + UNLOCK_REPLIES(t); + t_release_transaction(t); + t_unref(t->uas.request); + return 0; + } + } + } + UNLOCK_REPLIES(t); - /* release the transaction */ + /* unref the transaction */ t_unref(t->uas.request); return 0;

15 years, 6 months

SF.net SVN: openser:[5893] branches/1.5/packaging/debian/copyright

by Henning Westerholt

Revision: 5893 http://openser.svn.sourceforge.net/openser/?rev=5893&view=rev Author: henningw Date: 2009-07-02 14:27:45 +0000 (Thu, 02 Jul 2009) Log Message: ----------- - extend copyright notice a bit Modified Paths: -------------- branches/1.5/packaging/debian/copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: core: fix EXTRA_DEBUG information about second via in parse_msg

by Henning Westerholt

Module: sip-router Branch: master Commit: da589b753539ebecfc2294b86bdcfe4bd09d64fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da589b7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 2 12:38:48 2009 +0200 core: fix EXTRA_DEBUG information about second via in parse_msg --- parser/msg_parser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 5132112..18e17df 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -625,7 +625,7 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg) #ifdef EXTRA_DEBUG /* dump parsed data */ if (msg->via1){ - DBG(" first via: <%.*s/%.*s/%.*s> <%.*s:%.*s(%d)>", + DBG("first via: <%.*s/%.*s/%.*s> <%.*s:%.*s(%d)>", msg->via1->name.len, ZSW(msg->via1->name.s), msg->via1->version.len, @@ -645,7 +645,7 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg) DBG ("\n"); } if (msg->via2){ - DBG(" first via: <%.*s/%.*s/%.*s> <%.*s:%.*s(%d)>", + DBG("second via: <%.*s/%.*s/%.*s> <%.*s:%.*s(%d)>", msg->via2->name.len, ZSW(msg->via2->name.s), msg->via2->version.len,

15 years, 6 months

SF.net SVN: openser:[5892] branches

by Henning Westerholt

Revision: 5892 http://openser.svn.sourceforge.net/openser/?rev=5892&view=rev Author: henningw Date: 2009-07-02 10:35:20 +0000 (Thu, 02 Jul 2009) Log Message: ----------- - fix EXTRA_DEBUG information about second via in parse_msg Modified Paths: -------------- branches/1.3/parser/msg_parser.c branches/1.4/parser/msg_parser.c branches/1.5/parser/msg_parser.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

SF.net SVN: openser:[5889] trunk/etc/kamailio.cfg

by Inaki Baz Castillo

Revision: 5889 http://openser.svn.sourceforge.net/openser/?rev=5889&view=rev Author: ibc_sf Date: 2009-07-01 11:35:07 +0000 (Wed, 01 Jul 2009) Log Message: ----------- - Revert of last commit in kamailio.cfg (it was incorrect). Modified Paths: -------------- trunk/etc/kamailio.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev