sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:master: tm: minor improvement
by Andrei Pelinescu-Onciul 14 Jul '09

14 Jul '09

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; } }

1 0

Kamailio (OpenSER) v1.5.2 Released
by Daniel-Constantin Mierla 14 Jul '09

14 Jul '09

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/

1 0

SF.net SVN: openser:[5902] tags/1.5.2/
by Daniel-Constantin Mierla 14 Jul '09

14 Jul '09

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.

1 0

git:master: modules_k/permissions: fixed child initialization
by Juha Heinanen 14 Jul '09

14 Jul '09

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;

1 0

SF.net SVN: openser:[5901] branches/1.5/Makefile.defs
by Daniel-Constantin Mierla 14 Jul '09

14 Jul '09

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.

1 0

reminder: kamailio 1.5.2 today
by Daniel-Constantin Mierla 14 Jul '09

14 Jul '09

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

1 1

replacing k pvars with s selects
by jh＠tutpro.com 14 Jul '09

14 Jul '09

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

4 11

SF.net SVN: openser:[5900] branches/1.5/ChangeLog
by Henning Westerholt 14 Jul '09

14 Jul '09

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.

1 0

Re: [sr-dev] [Kamailio-Users] new module: mi_rpc
by Daniel-Constantin Mierla 14 Jul '09

14 Jul '09

On 13.07.2009 19:51 Uhr, Juha Heinanen wrote: > Daniel-Constantin Mierla writes: > > > here is what mi_rpc modules does: > > - it receives a rpc handler form the rpc interface in core > > - reads first parameter and then lookups MI command, if not found then > > returns error, if found: > > - reads all parameters as string and build internal MI tree > > ok, after andrei fixed some bug, i got stats working via mi_rpc and > xmlrpc module interface. > > all stats except "tm:", which is now implemented using tm.stats command. > > res = c.tm.stats() > > provides this kind of result: > > {'2xx': 0, 'created': 0, '5xx': 0, 'delayed_free': 0, 'current': 0, 'total_local': 0, 'waiting': 0, '6xx': 0, '4xx': 0, '3xx': 0, 'total': 0, 'replied_locally': 0, 'freed': 0} > > whereas mi based stat results look like this: > > ['200 OK\n', '+ :: core:rcv_requests = 3', '+ :: core:rcv_replies = 0', '+ :: core:fwd_requests = 0', '+ :: core:fwd_replies = 0', '+ :: core:drop_requests = 0', '+ :: core:drop_replies = 0', '+ :: core:err_requests = 0', '+ :: core:err_replies = 0', '+ :: core:bad_URIs_rcvd = 0', '+ :: core:unsupported_methods = 3', '+ :: core:bad_msg_hdr = 0'] > > would it be possible to get the result in same (preferable the former) > format in both cases? > you can try implementing a new command in the mi_rpc modulem say 'mix' (mi for xmlrpc) that will format the output as you want. However would be good to get a single command, but I do not know if is possible considering that MI reply trees have: - name for nodes - values for nodes - string or other nodes - attributes for nodes - string IIRC, Andrei proposed to put the value of the attributes in the value of the node. Now, the formating looks a bit strange, as I did it to regocnize the above elements, so: + means that the printed line corresponds to a node - means that the printed line corresponds to an attribute of the last printed node Within a node line: - what is before '::' is the name of node - what is after '::' is the value of node - tab indentation is used to show the depth of nodes and attributes All these are taken from mi_fifo. So, in case of statistics, the nodes have no name and the value has the format "stat = value". I can say it is pretty weird, but it is the current style with mi_fifo. As I am not a xmlrpc user, with mi_datagram I did text parsing. Cheers, Daniel

3 5

git:master: tmx(k): updated to the which_cancel change
by Andrei Pelinescu-Onciul 14 Jul '09

14 Jul '09

Module: sip-router Branch: master Commit: 1a43484b132393a10f1530f7e71cc190eacaf56a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a43484… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 14:49:05 2009 +0200 tmx(k): updated to the which_cancel change - updated to the which_cancel name change - use the new prepare_to_cancel skip_branches parameter to skip the current branch when generating the CANCEL, instead of the previous unsafe way (in sr which_cancel/prepare_to_cancel is lockless and so it's not safe to directly manipulate the cancel buffers even if the reply lock is held). --- modules_k/tmx/tmx_mod.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index c84cff7..5b8cd9c 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -232,11 +232,9 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) switch(n) { case 1: LOCK_REPLIES(t); - _tmx_tmb.which_cancel(t, &cb); - if(t->uac[idx].local_cancel.buffer==BUSY_BUFFER) - t->uac[idx].local_cancel.buffer=NULL; + /* prepare cancel for every branch except idx */ + _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); UNLOCK_REPLIES(t); - cb &= ~(1<<idx); case 2: if(msg->first_line.u.reply.statuscode>=200) break; @@ -244,10 +242,12 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) break; default: LOCK_REPLIES(t); - _tmx_tmb.which_cancel(t, &cb); - UNLOCK_REPLIES(t); if (msg->first_line.u.reply.statuscode>=200) - cb &= ~(1<<idx); + /* 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)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009