sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

new pv for presence subscriptions
by Luis Azedo 23 Mar '15

23 Mar '15

Hi, we would like to add a new pv $presentity (or better name) to be set on presence handle_subscribe. the reason for this is that we need the presentity of the subscription to carry on further tasks in the script and the To header not always carries the right information on re-subscriptions. handle_subscribe will take the presentity from Request-URI if no to-tag is sent or it will take it from hash/db if to-tag is present. is that ok to proceed with implementation ? Best

2 3

patch porposal for usrloc: close TCP connections
by Camille Oudot 23 Mar '15

23 Mar '15

Hi, I want to propose a patch to usrloc: https://github.com/kamailio/kamailio/commit/14852a98ed46b7a88c92bff31c319d2… this patch adds a new parameter, close_expired_tcp, that makes usrloc request the main TCP process to end the connections of expired registrations (assuming 1 connection = 1 contact). It enables to release resources on the system ASAP, in the event of a lost connection (e.g. when clients are on mobile networks). Any thoughts? Cheers, -- Camille

4 6

git:master:e172b7a1: tmrec: update licensing and copyright info
by Richard Fuchs 20 Mar '15

20 Mar '15

Module: kamailio Branch: master Commit: e172b7a1b66edfb302da8d498eada7da9f21643e URL: https://github.com/kamailio/kamailio/commit/e172b7a1b66edfb302da8d498eada7d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-03-20T09:43:36-04:00 tmrec: update licensing and copyright info --- Modified: modules/tmrec/doc/tmrec.xml Modified: modules/tmrec/period.c Modified: modules/tmrec/period.h --- Diff: https://github.com/kamailio/kamailio/commit/e172b7a1b66edfb302da8d498eada7d… Patch: https://github.com/kamailio/kamailio/commit/e172b7a1b66edfb302da8d498eada7d… --- diff --git a/modules/tmrec/doc/tmrec.xml b/modules/tmrec/doc/tmrec.xml index 441cffe..f429be3 100644 --- a/modules/tmrec/doc/tmrec.xml +++ b/modules/tmrec/doc/tmrec.xml @@ -28,11 +28,20 @@ <surname>Balashov</surname> <email>abalashov(a)evaristesys.com</email> </editor> + <editor> + <firstname>Richard</firstname> + <surname>Fuchs</surname> + <email>rfuchs(a)sipwise.com</email> + </editor> </authorgroup> <copyright> <year>2012</year> <holder>asipto.com</holder> </copyright> + <copyright> + <year>2012</year> + <holder>Sipwise GmbH</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/modules/tmrec/period.c b/modules/tmrec/period.c index c5e4407..0b43696 100644 --- a/modules/tmrec/period.c +++ b/modules/tmrec/period.c @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2012 Sipwise GmbH + * Written by Richard Fuchs <rfuchs(a)sipwise.com> + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version + * + * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., 59 + * Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <stdio.h> #include <string.h> #include <time.h> diff --git a/modules/tmrec/period.h b/modules/tmrec/period.h index bede828..25103d7 100644 --- a/modules/tmrec/period.h +++ b/modules/tmrec/period.h @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2012 Sipwise GmbH + * Written by Richard Fuchs <rfuchs(a)sipwise.com> + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version + * + * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., 59 + * Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #ifndef _PERIOD_H_ #define _PERIOD_H_

1 0

TMREC files
by Olle E. Johansson 20 Mar '15

20 Mar '15

There are two files in tmrec module that has no copyright, no boilerplate, anything. period.c and period.h Do you know their history? Should we add a GPL or BSD boilerplate or something? If so, please take action. /O

3 2

git:master:e6cdb910: tm: formated the comment without + chars
by Daniel-Constantin Mierla 20 Mar '15

20 Mar '15

Module: kamailio Branch: master Commit: e6cdb91037abc5a7668e7919281072b15e758739 URL: https://github.com/kamailio/kamailio/commit/e6cdb91037abc5a7668e7919281072b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-20T12:57:04+01:00 tm: formated the comment without + chars --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/e6cdb91037abc5a7668e7919281072b… Patch: https://github.com/kamailio/kamailio/commit/e6cdb91037abc5a7668e7919281072b… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index cc4dd61..3fa8f2e 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -216,13 +216,13 @@ int t_continue(unsigned int hash_index, unsigned int label, } /* Set last_received to something >= 200, -+ * the actual value does not matter, the branch -+ * will never be picked up for response forwarding. -+ * If last_received is lower than 200, -+ * then the branch may tried to be cancelled later, -+ * for example when t_reply() is called from -+ * a failure route => deadlock, because both -+ * of them need the reply lock to be held. */ + * the actual value does not matter, the branch + * will never be picked up for response forwarding. + * If last_received is lower than 200, + * then the branch may tried to be cancelled later, + * for example when t_reply() is called from + * a failure route => deadlock, because both + * of them need the reply lock to be held. */ t->uac[branch].last_received=500; uac = &t->uac[branch]; }

1 0

Suspended branch still active
by Daniel-Constantin Mierla 20 Mar '15

20 Mar '15

Hello Richard, with the commit 16e763c32d7a2b9fc451185e028a90b3be758f65 you removed the setting of last_received code for the branch used for suspending the transaction (blind uac). You added some comments: + /*we really don't need this next line anymore otherwise we will + never be able to forward replies after a (t_relay) on this branch. + We want to try and treat this branch as 'normal' (as if it were a normal req, not async)' */ + //t->uac[branch].last_received=500; But a t_relay() will create a new uac/branch, not reusing it. Do you have some specific use cases reusing that suspended branch? If not, then I will revert the above change and set the last_received to make the branch inactive. If yes, we have to identify the case and set the last received for the rest. On a report from Alex Balashov with a crash, the suspended branch is picked for handling cancel and apparently messes some stuff. There is another active branch due to a t_relay() after t_continue(). Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

2 8

Simplify the Configuration
by Brian LaVallee 20 Mar '15

20 Mar '15

Hi, I would like to propose [and manage] an effort with the primary Kamailio developers to simplify the configuration syntax. I'm not a developer, but used lot's of different applications and I'm familiar with various configuration formats. Based on what I've seen, there are five (5) types of configuration directives used with Kamailio. - C-Style Control Directives - Apache-Like Name/Value Pairs - Normal Name/Value Pairs - Modify Parameter Procedures - Routing Logic Scripting I do understand some of this may be the result of merging multiple projects. But this mixture of syntax slows adoption, drastically increases the learning curve for the user base. By implementing a consistent standard to the configuration syntax, it will make using the application less complicated. -- My first recommendation, would be to separate the routing logic from the primary configuration file. This can easily be done with import/include. However, I feel that a fixed path should be added during compile. ‘--with-routing=/etc/kamailio/routing/’ Then it would possible to modify the configuration parser to read all the files in that directory. Allowing the separation of the route logic into individual files. relay.cfg, reqinit.cfg, ... xmlrpc.cfg, tovoicemail.cfg, etc... Making individual logic changes a bit easier. To reach a fixed path solution, and keep some backwards compatibility, the first step should be... Use import/include and move all the route logic into /etc/kamailio/routing/basic.cfg We can discuss on the mailing list or feel free to contact me directly. Sincerely, Brian LaVallee

3 3

[kamailio] Vseva/dialplan avp list (#18)
by Victor Seva 19 Mar '15

19 Mar '15

This closes #5 . Be aware that this needs the #17 applied in order to work You can merge this Pull Request by running: git pull https://github.com/linuxmaniac/kamailio vseva/dialplan_avp_list Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/18 -- Commit Summary -- * dialplan: using $(avp("key")[*]) on match rules * dialplan: using $(avp("key")[*]) on subst rules -- File Changes -- M modules/dialplan/dialplan.h (2) M modules/dialplan/dp_repl.c (356) -- Patch Links -- https://github.com/kamailio/kamailio/pull/18.patch https://github.com/kamailio/kamailio/pull/18.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/18

2 12

git:master:8960a3e7: dialplan: use PV_IDX_ITR
by Victor Seva 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 8960a3e7aa52f706676806c175e70d228cc11549 URL: https://github.com/kamailio/kamailio/commit/8960a3e7aa52f706676806c175e70d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-03-19T18:01:41+01:00 dialplan: use PV_IDX_ITR --- Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/8960a3e7aa52f706676806c175e70d2… Patch: https://github.com/kamailio/kamailio/commit/8960a3e7aa52f706676806c175e70d2… --- diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 5c63ef1..bfeda07 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -156,7 +156,7 @@ int dpl_detect_avp_indx(const pv_elem_p elem, pv_elem_p *avp) for(e=elem, num=num_avp_all=0; e!=NULL; e=e->next, num++) { if(e->spec!=NULL && e->spec->type==PVT_AVP && - e->spec->pvp.pvi.type==PV_IDX_ALL) + e->spec->pvp.pvi.type==PV_IDX_ITR) { *avp = e; num_avp_all++;

1 0

git:master:28553798: core: introduce '+' as PV_INDX_ITR
by Victor Seva 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 28553798f5b30a6204752ed38a69c42b78bc91cc URL: https://github.com/kamailio/kamailio/commit/28553798f5b30a6204752ed38a69c42… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-03-19T18:01:40+01:00 core: introduce '+' as PV_INDX_ITR With this notation we want to check all values one by one not the list of coma separated values --- Modified: pvapi.c Modified: pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/28553798f5b30a6204752ed38a69c42… Patch: https://github.com/kamailio/kamailio/commit/28553798f5b30a6204752ed38a69c42… --- diff --git a/pvapi.c b/pvapi.c index 710b460..ccf9814 100644 --- a/pvapi.c +++ b/pvapi.c @@ -667,6 +667,11 @@ int pv_parse_index(pv_spec_p sp, str *in) sp->pvp.pvi.type = PV_IDX_ALL; return 0; } + if(*p=='+' && in->len==1) + { + sp->pvp.pvi.type = PV_IDX_ITR; + return 0; + } sign = 1; if(*p=='-') { @@ -1225,7 +1230,10 @@ int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags) *flags = PV_IDX_ALL; return 0; } - + if(ip->pvi.type == PV_IDX_ITR) { + *flags = PV_IDX_ITR; + return 0; + } if(ip->pvi.type == PV_IDX_INT) { *idx = ip->pvi.u.ival; diff --git a/pvar.h b/pvar.h index 601f0ef..da13806 100644 --- a/pvar.h +++ b/pvar.h @@ -60,6 +60,7 @@ #define PV_IDX_INT 0 #define PV_IDX_PVAR 1 #define PV_IDX_ALL 2 +#define PV_IDX_ITR 3 /*! if PV name is dynamic, integer, or str */ #define pv_has_dname(pv) ((pv)->pvp.pvn.type==PV_NAME_PVAR)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015