January 2012 - sr-dev - kamailio.org

Commit 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c messed up with license statement in atomic_alpha.h
by Andrey 23 Jan '12

23 Jan '12

Hi, The commit 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c messed up a little with the license in atomic/atomic_alpha.h The attached patch is intended to fix this. More details on the original commit: """ URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6aaba8e… Author: Henning Westerholt <henning.westerholt at 1und1.de> Committer: Henning Westerholt <henning.westerholt at 1und1.de> Date: Thu Jun 23 23:39:01 2011 +0200 doxygen: convert existing docs to use proper doxygen structures and groups, small cleanups """ -- Andrey Mazo.

2 2

git:master: Fix license in atomic_alpha.h
by Henning Westerholt 23 Jan '12

23 Jan '12

Module: sip-router Branch: master Commit: 1db6c72af33b20234cc16483dc8dd56a83f514a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db6c72… Author: Andrey Mazo <ahippo(a)yandex.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Mon Jan 23 15:20:22 2012 +0400 Fix license in atomic_alpha.h This reverts an accidental change from 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c. --- atomic/atomic_alpha.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/atomic/atomic_alpha.h b/atomic/atomic_alpha.h index fa94d85..598fb23 100644 --- a/atomic/atomic_alpha.h +++ b/atomic/atomic_alpha.h @@ -10,7 +10,7 @@ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCEAtomic operations and memory barriers (alpha specific) + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */

1 0

git:master: pua_usrloc: added branch_flag parameter
by Daniel-Constantin Mierla 20 Jan '12

20 Jan '12

Module: sip-router Branch: master Commit: bdbacf559134022856f5723a91fe7e130ceada29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdbacf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 20 19:06:59 2012 +0100 pua_usrloc: added branch_flag parameter - mark the contact for sending PUBLISH via setbflag(branch_flag) --- modules_k/pua_usrloc/pua_usrloc.c | 9 ++++++++- modules_k/pua_usrloc/pua_usrloc.h | 3 +++ modules_k/pua_usrloc/ul_publish.c | 14 ++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/modules_k/pua_usrloc/pua_usrloc.c b/modules_k/pua_usrloc/pua_usrloc.c index 9dcf27e..e3d676d 100644 --- a/modules_k/pua_usrloc/pua_usrloc.c +++ b/modules_k/pua_usrloc/pua_usrloc.c @@ -59,7 +59,11 @@ MODULE_VERSION str default_domain= {NULL, 0}; -int pua_ul_publish= 0; + +int pua_ul_publish = 0; +int pua_ul_bflag = -1; +int pua_ul_bmask = 0; + pua_api_t pua; str pres_prefix= {0, 0}; @@ -85,6 +89,7 @@ static cmd_export_t cmds[]= static param_export_t params[]={ {"default_domain", STR_PARAM, &default_domain.s }, {"entity_prefix", STR_PARAM, &pres_prefix.s }, + {"branch_flag", INT_PARAM, &pua_ul_bflag }, {0, 0, 0 } }; @@ -200,6 +205,8 @@ static int mod_init(void) return -1; } + if(pua_ul_bflag!=-1) + pua_ul_bmask = 1 << pua_ul_bflag; return 0; } diff --git a/modules_k/pua_usrloc/pua_usrloc.h b/modules_k/pua_usrloc/pua_usrloc.h index c8e7c30..76774d2 100644 --- a/modules_k/pua_usrloc/pua_usrloc.h +++ b/modules_k/pua_usrloc/pua_usrloc.h @@ -40,4 +40,7 @@ void ul_publish(ucontact_t* c, int type, void* param); int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param); extern str pres_prefix; +extern int pua_ul_bflag; +extern int pua_ul_bmask; + #endif diff --git a/modules_k/pua_usrloc/ul_publish.c b/modules_k/pua_usrloc/ul_publish.c index d9c4ad0..4eaf7a9 100644 --- a/modules_k/pua_usrloc/ul_publish.c +++ b/modules_k/pua_usrloc/ul_publish.c @@ -39,6 +39,7 @@ #include "../../parser/parse_expires.h" #include "../../parser/msg_parser.h" #include "../../str.h" +#include "../../dset.h" #include "../usrloc/usrloc.h" #include "../usrloc/ul_callback.h" #include "../../modules/tm/tm_load.h" @@ -50,12 +51,16 @@ int pua_set_publish(struct sip_msg* msg , char* s1, char* s2) { LM_DBG("set send publish\n"); pua_ul_publish= 1; + if(pua_ul_bmask!=0) + setbflag(0, pua_ul_bflag); return 1; } int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param) { pua_ul_publish= 0; + if(pua_ul_bmask!=0) + resetbflag(0, pua_ul_bflag); return 1; } @@ -206,11 +211,16 @@ void ul_publish(ucontact_t* c, int type, void* param) content_type.s= "application/pidf+xml"; content_type.len= 20; - if(pua_ul_publish== 0) + if(pua_ul_publish==0 && pua_ul_bmask==0) { LM_INFO("should not send ul publish\n"); return; - } + } + if(pua_ul_bmask!=0 && (c->cflags & pua_ul_bmask)==0) + { + LM_INFO("not marked for publish\n"); + return; + } if(type & UL_CONTACT_DELETE) { LM_DBG("\nDELETE type\n");

1 0

git:master: pua_usrloc: documented branch_flag parameter
by Daniel-Constantin Mierla 20 Jan '12

20 Jan '12

Module: sip-router Branch: master Commit: 266fa4e2cd62f58ee1f2eec2a5a83bc3028d194a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=266fa4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 20 19:04:21 2012 +0100 pua_usrloc: documented branch_flag parameter --- modules_k/pua_usrloc/README | 28 +++++++++++++++++++----- modules_k/pua_usrloc/doc/pua_usrloc_admin.xml | 20 +++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules_k/pua_usrloc/README b/modules_k/pua_usrloc/README index 8daadfc..65e1f87 100644 --- a/modules_k/pua_usrloc/README +++ b/modules_k/pua_usrloc/README @@ -8,7 +8,7 @@ Edited by Anca-Maria Vamanu - Copyright © 2006 Voice Sistem SRL + Copyright � 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -25,6 +25,7 @@ Anca-Maria Vamanu 3.1. default_domain (str) 3.2. entity_prefix (str) + 3.3. branch_flag (int) 4. Functions @@ -34,7 +35,8 @@ Anca-Maria Vamanu 1.1. Set default_domain parameter 1.2. Set presentity_prefix parameter - 1.3. pua_set_publish usage + 1.3. Set branch_flag parameter + 1.4. pua_set_publish usage Chapter 1. Admin Guide @@ -50,6 +52,7 @@ Chapter 1. Admin Guide 3.1. default_domain (str) 3.2. entity_prefix (str) + 3.3. branch_flag (int) 4. Functions @@ -87,13 +90,14 @@ Chapter 1. Admin Guide 3.1. default_domain (str) 3.2. entity_prefix (str) + 3.3. branch_flag (int) 3.1. default_domain (str) The default domain to use when constructing the presentity URI if it is missing from recorded AOR. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set default_domain parameter ... @@ -105,24 +109,36 @@ modparam("pua_usrloc", "default_domain", "kamailio.org") The prefix when construstructing entity attribute to be added to presence node in XML PIDF. (ex: pres:user@domain ). - Default value is “NULL”. + Default value is "NULL". Example 1.2. Set presentity_prefix parameter ... modparam("pua_usrloc", "entity_prefix", "pres") ... +3.3. branch_flag (int) + + Which branch flag to be used to select the contact addresses for which + to generate PUBLISH. Valid values are 0 to 31. + + Default value is "-1" (disabled). + + Example 1.3. Set branch_flag parameter +... +modparam("pua_usrloc", "branch_flag", 9) +... + 4. Functions 4.1. pua_set_publish() -4.1. pua_set_publish() +4.1. pua_set_publish() The function is used to mark REGISTER requests that have to issue a PUBLISH. The PUBLISH is issued when REGISTER is saved in location table. - Example 1.3. pua_set_publish usage + Example 1.4. pua_set_publish usage ... if(is_method("REGISTER") && from_uri=~"john(a)kamailio.org") pua_set_publish(); diff --git a/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml b/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml index 50f1676..3e85a89 100644 --- a/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml +++ b/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml @@ -104,6 +104,26 @@ modparam("pua_usrloc", "entity_prefix", "pres") </example> </section> + <section> + <title><varname>branch_flag</varname> (int)</title> + <para> + Which branch flag to be used to select the contact addresses for which + to generate PUBLISH. Valid values are 0 to 31. + </para> + <para> + <emphasis>Default value is <quote>-1</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>branch_flag</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_usrloc", "branch_flag", 9) +... +</programlisting> + </example> + </section> + </section> <section> <title>Functions</title>

1 0

[tracker] Task opened: kamailio does not stop if debug >= 3
by sip-router 20 Jan '12

20 Jan '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Rob Gagnon (rgagnon) Attached to Project - sip-router Summary - kamailio does not stop if debug >= 3 Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - Linux Severity - Medium Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - If kamailio.cfg has debug set to 3 or more, or if the "kamctl fifo debug 3" (or a number above 3) is issued after starting kamailio, it will not stop unless debug is changed first to a number below 3, or issuing a second stop request. Using CentOS 5.7 x86_64 Installed Kamailio 3.2.1 from RPM Steps to Reproduce: ~~~~~~~~~~~~~~~~~~~ service kamailio start # indicates "OK" kamctl fifo debug 3 service kamailio stop # After a longer than normal pause, indicates "OK" ps -ef|grep kamailio # shows kamailio still running service kamailio stop # After a longer than normal pause, indicates "OK" ps -ef|grep kamailio # does not show kamailio running Work-around I've implemented for now: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Within /etc/init.d/kamailio, in the "stop()" area of the code. I've added a "kamctl fifo debug 1" before the "killproc $KAM". This ensures the debug level is lowered before stopping the program. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=199 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.

1 0

[tracker] Assignee added: kamailio does not stop if debug >= 3
by sip-router 20 Jan '12

20 Jan '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#199 - kamailio does not stop if debug >= 3 User who did this - Rob Gagnon (rgagnon) http://sip-router.org/tracker/index.php?do=details&task_id=199 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.

1 0

git:master: msrp: fixed length in comparison of var names
by Daniel-Constantin Mierla 20 Jan '12

20 Jan '12

Module: sip-router Branch: master Commit: e75c2636cdab55911493a636af743918071518bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e75c263… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 20 11:19:05 2012 +0100 msrp: fixed length in comparison of var names - reported by A. Heggestad --- modules/msrp/msrp_vars.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 60225fa..93e57e7 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -96,9 +96,9 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; - else if(strncmp(in->s, "prevhops", 7)==0) + else if(strncmp(in->s, "prevhops", 8)==0) sp->pvp.pvn.u.isname.name.n = 17; - else if(strncmp(in->s, "nexthops", 7)==0) + else if(strncmp(in->s, "nexthops", 8)==0) sp->pvp.pvn.u.isname.name.n = 18; else goto error; break;

1 0

git:master: msrp: added $msrp(conid) - returns the internal id of TCP connection
by Daniel-Constantin Mierla 20 Jan '12

20 Jan '12

Module: sip-router Branch: master Commit: deb2a87687f2ca04e7110e70d049bf8f47328bda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=deb2a87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 20 11:26:00 2012 +0100 msrp: added $msrp(conid) - returns the internal id of TCP connection --- modules/msrp/msrp_vars.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 93e57e7..0debdc6 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -62,6 +62,8 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) case 5: if(strncmp(in->s, "msgid", 5)==0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "conid", 5)==0) + sp->pvp.pvn.u.isname.name.n = 21; else goto error; case 6: if(strncmp(in->s, "method", 6)==0) @@ -103,7 +105,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else goto error; break; default: - /* max is 20 */ + /* max is 21 */ goto error; } sp->pvp.pvn.type = PV_NAME_INTSTR; @@ -286,6 +288,10 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 20: return pv_get_strval(msg, param, res, &mf->tcpinfo->rcv->bind_address->sock_str); + case 21: + if(mf->tcpinfo->con==NULL) + return pv_get_null(msg, param, res); + return pv_get_sintval(msg, param, res, mf->tcpinfo->con->id); default: return pv_get_null(msg, param, res); }

1 0

git:master: dialog(k): A few documentation enhancements.
by Alex Balashov 19 Jan '12

19 Jan '12

Module: sip-router Branch: master Commit: c34a44f5a5b7d375a3b1716dbb5a2d7a6183dff6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c34a44f… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Thu Jan 19 09:30:47 2012 -0500 dialog(k): A few documentation enhancements. - Fixed some grammatical and spelling errors. - A few stylistic modifications. - Expanded discussion of potential use cases. --- modules_k/dialog/README | 362 ++++++++++++++++++--------------- modules_k/dialog/doc/dialog.xml | 5 + modules_k/dialog/doc/dialog_admin.xml | 146 ++++++++------ 3 files changed, 284 insertions(+), 229 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c34…

1 0

git:master: db_cassandra: Minor documentation edits.
by Alex Balashov 19 Jan '12

19 Jan '12

Module: sip-router Branch: master Commit: 401a81e1a8eb435e853421f4b1ee5aeb024cbdda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=401a81e… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Thu Jan 19 08:39:48 2012 -0500 db_cassandra: Minor documentation edits. - Minor clarifying and stylistic edits to the documentation. --- modules/db_cassandra/README | 97 ++++++++++++---------- modules/db_cassandra/doc/db_cassandra.xml | 5 + modules/db_cassandra/doc/db_cassandra_admin.xml | 72 +++++++++-------- 3 files changed, 95 insertions(+), 79 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=401…

1 0