sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f7d892e55753f84461bbadd661ac8a4482137d6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7d892e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 15:00:36 2009 +0200 tm: minor improvement - killed an if in prepare_to_cancel --- modules/tm/t_cancel.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index bf12c3c..9fbd98b 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -86,13 +86,14 @@ void prepare_to_cancel(struct cell *t, branch_bm_t *cancel_bm, { int i; int branches_no; + branch_bm_t mask; *cancel_bm=0; branches_no=t->nr_of_outgoings; + mask=~skip_branches; membar_depends(); for( i=0 ; i<branches_no ; i++ ) { - if (!(skip_branches & (1<<i)) && prepare_cancel_branch(t, i, 1)) - *cancel_bm |= 1<<i ; + *cancel_bm |= ((mask & (1<<i)) && prepare_cancel_branch(t, i, 1))<<i; } }

15 years, 6 months

git:master: tm: remove unnecessary locking around prepare_to_cancel()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 95a1194f97e74effbdf557e7fcc5db69c26ea1d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95a1194… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 18:13:26 2009 +0200 tm: remove unnecessary locking around prepare_to_cancel() - prepare_to_cancel() is lockless, doesn't need the reply lock anymore (_reply_light() and rpc_cancel()). - _reply_light() minor fix: don't run prepare_to_cancel() if the reply is not a final reply (might affect latter cancel generation) --- modules/tm/t_cancel.c | 4 +--- modules/tm/t_reply.c | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 9fbd98b..52f086b 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -360,9 +360,7 @@ void rpc_cancel(rpc_t* rpc, void* c) return; } /* find the branches that need cancel-ing */ - LOCK_REPLIES(trans); - prepare_to_cancel(trans, &cancel_bm, 0); - UNLOCK_REPLIES(trans); + prepare_to_cancel(trans, &cancel_bm, 0); /* tell tm to cancel the call */ DBG("Now calling cancel_uacs\n"); i=cancel_uacs(trans, cancel_bm, 0); /* don't fake 487s, diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 65ccce7..ba06cd1 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -522,9 +522,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, DBG("DEBUG: _reply_light: response building failed\n"); /* determine if there are some branches to be canceled */ if ( is_invite(trans) ) { - if (lock) LOCK_REPLIES( trans ); prepare_to_cancel(trans, &cancel_bitmap, 0); - if (lock) UNLOCK_REPLIES( trans ); } /* and clean-up, including cancellations, if needed */ goto error; @@ -532,7 +530,6 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, cancel_bitmap=0; if (lock) LOCK_REPLIES( trans ); - if ( is_invite(trans) ) prepare_to_cancel(trans, &cancel_bitmap, 0); if (trans->uas.status>=200) { LOG( L_ERR, "ERROR: _reply_light: can't generate %d reply" " when a final %d was sent out\n", code, trans->uas.status); @@ -570,8 +567,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, run_trans_callbacks(TMCB_LOCAL_COMPLETED, trans, 0, FAKED_REPLY, code); cleanup_uac_timers( trans ); - if (is_invite(trans)) + if (is_invite(trans)){ + prepare_to_cancel(trans, &cancel_bitmap, 0); cancel_uacs( trans, cancel_bitmap, F_CANCEL_B_KILL ); + } start_final_repl_retr( trans ); } @@ -618,13 +617,14 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, return 1; error3: + prepare_to_cancel(trans, &cancel_bitmap, 0); error2: if (lock) UNLOCK_REPLIES( trans ); pkg_free ( buf ); error: /* do UAC cleanup */ cleanup_uac_timers( trans ); - if ( is_invite(trans) ) + if ( is_invite(trans) && cancel_bitmap ) cancel_uacs( trans, cancel_bitmap, F_CANCEL_B_KILL); /* we did not succeed -- put the transaction on wait */ put_on_wait(trans);

15 years, 6 months

git:master: tmx(k): remove unnecessary reply locking

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 51aeea7d5197ca44d5aabd46085c6c1661a98d73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51aeea7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 18:18:02 2009 +0200 tmx(k): remove unnecessary reply locking - reply locking is not needed around prepare_to_cancel() (former which_cancel()). --- modules_k/tmx/tmx_mod.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 5b8cd9c..ce2e61d 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -231,23 +231,19 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) n = (int)k; switch(n) { case 1: - LOCK_REPLIES(t); /* prepare cancel for every branch except idx */ _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); - UNLOCK_REPLIES(t); case 2: if(msg->first_line.u.reply.statuscode>=200) break; cb = 1<<idx; break; default: - LOCK_REPLIES(t); if (msg->first_line.u.reply.statuscode>=200) /* prepare cancel for every branch except idx */ _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); else _tmx_tmb.prepare_to_cancel(t, &cb, 0); - UNLOCK_REPLIES(t); } LM_DBG("canceling %d/%d\n", n, (int)cb); if(cb==0)

15 years, 6 months

Kamailio (OpenSER) v1.5.2 Released

by Daniel-Constantin Mierla

A new release in 1.5 series is out. Kamailio (OpenSER) 1.5.2 is based on the latest version of branch 1.5, including many fixes in code and documentation, therefore those running 1.5.0 or 1.5.1 are advised to upgrade. Source tarballs are available at: http://www.kamailio.org/pub/kamailio/1.5.2/src/ Detailed changelog: http://www.kamailio.org/pub/kamailio/1.5.2/ChangeLog Download via SVN: svn co https://openser.svn.sourceforge.net/svnroot/openser/branches/1.5 kamailio Tag for this release can be browsed at: http://openser.svn.sourceforge.net/viewvc/openser/tags/1.5.2/ Project site at SourceForge.net (still using old name): http://sourceforge.net/projects/openser/ Binaries and packages will be uploaded at: http://www.kamailio.org/pub/kamailio/1.5.2/ Modules' documentation: http://www.kamailio.org/docs/modules/1.5.x/ What is new in 1.5.x release series is summarized in the announcement of v1.5.0: http://www.kamailio.org/mos/view/Kamailio-OpenSER-v1.5.0-Release-Notes Note: Kamailio is the name of former OpenSER project. First version under Kamailio name was 1.4.0. Older versions will continue to use OpenSER name. The source tree for current development version is hosted by SIP Router project, you can test it via: http://sip-router.org/wiki/migration/kamailio-3.0-config Many thanks to everybody that helped with this release! Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 6 months

SF.net SVN: openser:[5902] tags/1.5.2/

by Daniel-Constantin Mierla

Revision: 5902 http://openser.svn.sourceforge.net/openser/?rev=5902&view=rev Author: miconda Date: 2009-07-14 15:16:52 +0000 (Tue, 14 Jul 2009) Log Message: ----------- Tagging the 1.5.2 release Added Paths: ----------- tags/1.5.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: modules_k/permissions: fixed child initialization

by Juha Heinanen

Module: sip-router Branch: master Commit: d71043e8b74d5a4c30c7553d6722ec5d336c0d8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d71043e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Jul 14 17:48:14 2009 +0300 modules_k/permissions: fixed child initialization - Database was not initialized for all necessary children, which caused trusted_reload and trusted_dump mi commands to fail. --- modules_k/permissions/trusted.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 79a2d47..889a3d2 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -72,6 +72,11 @@ int reload_trusted_table(void) cols[2] = &from_col; cols[3] = &tag_col; + if (db_handle == 0) { + LM_ERR("no connection to database\n"); + return -1; + } + if (perm_dbf.use_table(db_handle, &trusted_table) < 0) { LM_ERR("failed to use trusted table\n"); return -1; @@ -226,27 +231,24 @@ error: */ int init_child_trusted(int rank) { - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) - return 0; /* do nothing for the main process */ + if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) + return 0; if (!db_url.s) { return 0; } - /* Check if database is needed by child */ - if (db_mode==DISABLE_CACHE && rank>0) { - db_handle = perm_dbf.init(&db_url); - if (!db_handle) { - LM_ERR("unable to connect database\n"); - return -1; - } - - if(db_check_table_version(&perm_dbf, db_handle, &trusted_table, TABLE_VERSION) < 0) { - LM_ERR("error during table version check.\n"); - perm_dbf.close(db_handle); - return -1; - } + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + if (db_check_table_version(&perm_dbf, db_handle, &trusted_table, + TABLE_VERSION) < 0) { + LM_ERR("error during table version check.\n"); + perm_dbf.close(db_handle); + return -1; } return 0;

15 years, 6 months

SF.net SVN: openser:[5901] branches/1.5/Makefile.defs

by Daniel-Constantin Mierla

Revision: 5901 http://openser.svn.sourceforge.net/openser/?rev=5901&view=rev Author: miconda Date: 2009-07-14 14:44:48 +0000 (Tue, 14 Jul 2009) Log Message: ----------- - version set to 1.5.2 Modified Paths: -------------- branches/1.5/Makefile.defs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

reminder: kamailio 1.5.2 today

by Daniel-Constantin Mierla

Hello, anyone that still has to commit something on SVN branch 1.5 @sourceforge.net, please do it before 14:00GMT, afterwards will start releasing 1.5.2. Thanks, Daniel

15 years, 6 months

replacing k pvars with s selects

by jh＠tutpro.com

in order to clear lots of confusion and in order to simplify things, i'm suggesting that we replace k pvars with s selects. for example, $fd would become @from.uri.host. also, $avp(name) would simply become $name. -- juha

15 years, 6 months

SF.net SVN: openser:[5900] branches/1.5/ChangeLog

by Henning Westerholt

Revision: 5900 http://openser.svn.sourceforge.net/openser/?rev=5900&view=rev Author: henningw Date: 2009-07-14 13:30:28 +0000 (Tue, 14 Jul 2009) Log Message: ----------- - update changelog Modified Paths: -------------- branches/1.5/ChangeLog 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