sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

[tracker] Task closed: module pua_reginfo, function reginfo_handle_notify
by sip-router 18 Sep '13

18 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#340 - module pua_reginfo, function reginfo_handle_notify User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Documentation enhanced to reflect the parameter for the function. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=340 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: pua_reginfo: documented the parameter for reginfo_handle_notify ()
by Daniel-Constantin Mierla 18 Sep '13

18 Sep '13

Module: sip-router Branch: master Commit: 89969601d66422fd4dab50b0bb303bb17465c193 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8996960… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 18 22:23:41 2013 +0200 pua_reginfo: documented the parameter for reginfo_handle_notify() - reported in FS#340 --- modules/pua_reginfo/README | 80 +++++++++++-------------- modules/pua_reginfo/doc/pua_reginfo_admin.xml | 10 ++- 2 files changed, 42 insertions(+), 48 deletions(-) diff --git a/modules/pua_reginfo/README b/modules/pua_reginfo/README index 5799d0c..18260be 100644 --- a/modules/pua_reginfo/README +++ b/modules/pua_reginfo/README @@ -10,7 +10,7 @@ Carsten Bock <carsten(a)ng-voice.com> - Copyright © 2011 Carsten Bock, carsten(a)ng-voice.com, + Copyright � 2011 Carsten Bock, carsten(a)ng-voice.com, http://www.ng-voice.com __________________________________________________________________ @@ -27,25 +27,23 @@ Carsten Bock 3. Parameters 3.1. default_domain(str) - 3.2. default_domain(str) - 3.3. publish_reginfo(int) - 3.4. outbound_proxy(str) - 3.5. server_address(str) + 3.2. publish_reginfo(int) + 3.3. outbound_proxy(str) + 3.4. server_address(str) 4. Functions - 4.1. reginfo_handle_notify + 4.1. reginfo_handle_notify(uldomain) 4.2. reginfo_subscribe(uri[, expires]) List of Examples 1.1. Set default_domain parameter - 1.2. Set default_domain parameter - 1.3. Set publish_reginfo parameter - 1.4. Set outbound_proxy parameter - 1.5. Set server_address parameter - 1.6. reginfo_handle_notify usage - 1.7. reginfo_subscribe usage + 1.2. Set publish_reginfo parameter + 1.3. Set outbound_proxy parameter + 1.4. Set server_address parameter + 1.5. reginfo_handle_notify usage + 1.6. reginfo_subscribe usage Chapter 1. Admin Guide @@ -60,14 +58,13 @@ Chapter 1. Admin Guide 3. Parameters 3.1. default_domain(str) - 3.2. default_domain(str) - 3.3. publish_reginfo(int) - 3.4. outbound_proxy(str) - 3.5. server_address(str) + 3.2. publish_reginfo(int) + 3.3. outbound_proxy(str) + 3.4. server_address(str) 4. Functions - 4.1. reginfo_handle_notify + 4.1. reginfo_handle_notify(uldomain) 4.2. reginfo_subscribe(uri[, expires]) 1. Overview @@ -115,69 +112,59 @@ Chapter 1. Admin Guide 3. Parameters 3.1. default_domain(str) - 3.2. default_domain(str) - 3.3. publish_reginfo(int) - 3.4. outbound_proxy(str) - 3.5. server_address(str) + 3.2. publish_reginfo(int) + 3.3. outbound_proxy(str) + 3.4. server_address(str) 3.1. default_domain(str) The default domain for the registered users to be used when constructing the uri for the registrar callback. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set default_domain parameter ... modparam("pua_bla", "default_domain", "kamailio.org") ... -3.2. default_domain(str) - - The domain to be used to publish information about a user. - - Example 1.2. Set default_domain parameter -... -modparam("pua_reginfo", "default_domain", "kamailio.org") -... - -3.3. publish_reginfo(int) +3.2. publish_reginfo(int) Whether or not to generate PUBLISH requests. - Default value is “1” (enabled). + Default value is "1" (enabled). - Example 1.3. Set publish_reginfo parameter + Example 1.2. Set publish_reginfo parameter ... modparam("pua_reginfo", "publish_reginfo", 0) ... -3.4. outbound_proxy(str) +3.3. outbound_proxy(str) The outbound_proxy uri to be used when sending Subscribe requests. - Default value is “NULL”. + Default value is "NULL". - Example 1.4. Set outbound_proxy parameter + Example 1.3. Set outbound_proxy parameter ... modparam("pua_reginfo", "outbound_proxy", "sip:proxy@kamailio.org") ... -3.5. server_address(str) +3.4. server_address(str) The IP address of the server. - Example 1.5. Set server_address parameter + Example 1.4. Set server_address parameter ... modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") ... 4. Functions - 4.1. reginfo_handle_notify + 4.1. reginfo_handle_notify(uldomain) 4.2. reginfo_subscribe(uri[, expires]) -4.1. reginfo_handle_notify +4.1. reginfo_handle_notify(uldomain) This function processes received "NOTIFY"-requests and updates the local registry accordingly. @@ -185,20 +172,23 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") This method does not create any SIP-Reponse, this has to be done the script-writer. + The parameter has to correspond to user location table (domain) where + to store the record. + Return codes: * 2 - contacts successfully updated, but no more contacts online now. 1 - contacts successfully updated and at at least one contact still registered. -1 - Invalid NOTIFY or other error (see log-file) - Example 1.6. reginfo_handle_notify usage + Example 1.5. reginfo_handle_notify usage ... if(is_method("NOTIFY")) - if (reginfo_handle_notify()) + if (reginfo_handle_notify("location")) send_reply("202", "Accepted"); ... -4.2. reginfo_subscribe(uri[, expires]) +4.2. reginfo_subscribe(uri[, expires]) This function will subscribe for reginfo-information at the given server URI. @@ -209,7 +199,7 @@ if(is_method("NOTIFY")) expires - Expiration date for this subscription, in seconds (default 3600) - Example 1.7. reginfo_subscribe usage + Example 1.6. reginfo_subscribe usage ... route { t_on_reply("1"); diff --git a/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/modules/pua_reginfo/doc/pua_reginfo_admin.xml index b651f44..f18ffe2 100644 --- a/modules/pua_reginfo/doc/pua_reginfo_admin.xml +++ b/modules/pua_reginfo/doc/pua_reginfo_admin.xml @@ -157,9 +157,9 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") </section> <section> <title>Functions</title> - <section> + <section id="pua_reginfo.f.reginfo_handle_notify"> <title> - <function moreinfo="none">reginfo_handle_notify</function> + <function moreinfo="none">reginfo_handle_notify(uldomain)</function> </title> <para> This function processes received "NOTIFY"-requests and updates @@ -169,6 +169,10 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") This method does not create any SIP-Reponse, this has to be done the script-writer. </para> + <para> + The parameter has to correspond to user location table (domain) + where to store the record. + </para> <para>Return codes:</para> <itemizedlist> <listitem> @@ -191,7 +195,7 @@ modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") <programlisting format="linespecific"> ... if(is_method("NOTIFY")) - if (reginfo_handle_notify()) + if (reginfo_handle_notify("location")) send_reply("202", "Accepted"); ... </programlisting>

1 0

[tracker] Task closed: pua_reginfo: Fails to insert the contact into the location table
by sip-router 18 Sep '13

18 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#339 - pua_reginfo: Fails to insert the contact into the location table User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patches applied. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=339 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: pua_reginfo: add ruid for location records
by Daniel-Constantin Mierla 18 Sep '13

18 Sep '13

Module: sip-router Branch: master Commit: 9ee44c6079c8d30138ece619295974e17993aa04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ee44c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 18 22:17:55 2013 +0200 pua_reginfo: add ruid for location records - patch by Wonbin Cho, FS#339 --- modules/pua_reginfo/Makefile | 3 +++ modules/pua_reginfo/notify.c | 13 ++++++++++++- modules/pua_reginfo/pua_reginfo.c | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/modules/pua_reginfo/Makefile b/modules/pua_reginfo/Makefile index b6d8e40..532f159 100644 --- a/modules/pua_reginfo/Makefile +++ b/modules/pua_reginfo/Makefile @@ -24,4 +24,7 @@ endif DEFS+=-DKAMAILIO_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srutils/srutils + include ../../Makefile.modules diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index 176c16c..1187e34 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -26,6 +26,7 @@ #include "../../parser/parse_content.h" #include "../../parser/parse_uri.h" #include "../../modules/usrloc/usrloc.h" +#include "../../lib/srutils/sruid.h" #include <libxml/parser.h> #include "pua_reginfo.h" @@ -62,7 +63,10 @@ #define RESULT_CONTACTS_FOUND 1 #define RESULT_NO_CONTACTS 2 -int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str callid, int cseq, int expires, int event, str contact_uri) { +extern sruid_t _reginfo_sruid; + +int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str callid, + int cseq, int expires, int event, str contact_uri) { str no_str = {0, 0}; static str no_ua = str_init("n/a"); static ucontact_info_t ci; @@ -102,6 +106,13 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal /* set expire time */ ci.expires = time(0) + expires; + /* set ruid */ + if(sruid_next(&_reginfo_sruid) < 0) { + LM_ERR("failed to generate ruid"); + } else { + ci.ruid = _reginfo_sruid.uid; + } + /* Now we start looking for the contact: */ if (((*ul_record)->contacts == 0) || (ul.get_ucontact(*ul_record, &contact_uri, &callid, &no_str, cseq+1, &ul_contact) != 0)) { diff --git a/modules/pua_reginfo/pua_reginfo.c b/modules/pua_reginfo/pua_reginfo.c index a9ffe76..73d7113 100644 --- a/modules/pua_reginfo/pua_reginfo.c +++ b/modules/pua_reginfo/pua_reginfo.c @@ -25,6 +25,7 @@ #include "../pua/pua_bind.h" /* Bindings to usrloc */ #include "../usrloc/usrloc.h" +#include "../../lib/srutils/sruid.h" #include "pua_reginfo.h" #include "subscribe.h" @@ -43,6 +44,7 @@ str server_address = {NULL, 0}; int publish_reginfo = 1; +sruid_t _reginfo_sruid; /** Fixup functions */ static int domain_fixup(void** param, int param_no); @@ -161,6 +163,10 @@ static int mod_init(void) return -1; } } + + if(sruid_init(&_reginfo_sruid, (char)'-', "regi", SRUID_INC)<0) + return -1; + return 0; }

1 0

git:master: pua_reginfo: unlock udomain only when aor is set
by Daniel-Constantin Mierla 18 Sep '13

18 Sep '13

Module: sip-router Branch: master Commit: ed6884e854cdae63c4f62871a32bdcdcddb8853e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed6884e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 18 22:02:04 2013 +0200 pua_reginfo: unlock udomain only when aor is set - patch by Wonbin Cho, FS#338 --- modules/pua_reginfo/notify.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index a6f7428..176c16c 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -374,7 +374,8 @@ next_contact: next_registration: // if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ - ul.unlock_udomain(domain, &aor); + if (aor.len > 0) + ul.unlock_udomain(domain, &aor); registrations = registrations->next; }

1 0

[tracker] Task closed: Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify
by sip-router 18 Sep '13

18 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#338 - Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied, thanks! More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=338 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] Comment added: avpops: use xavp semantic on second parameter
by sip-router 18 Sep '13

18 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#346 - avpops: use xavp semantic on second parameter User who did this - Daniel-Constantin Mierla (miconda) ---------- I see it depends on pv module, by including some header file from there. What exactly it is needed for? It should be made in a way to avoid this, eventually moving some structure declaration or function in xavp.h in core or finding another solution. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346#comment1083 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] Task opened: avpops: use xavp semantic on second parameter (Attachment added)
by sip-router 18 Sep '13

18 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - avpops: use xavp semantic on second parameter Task Type - Improvement Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Add the possibility to use the xavp as second parameter with [*] to check all xavp values. if(avp_check("$avp(s:foo)","re/$xavp(test[0]=>re[*])/g")) { xlog("L_INFO", "[3.2] $avp(s:foo)->$xavp(test[0]=>re[*]) found!\n"); } One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346 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: ims_registrar_scscf: fixed bug caused by uninitialized global variable
by Carlos Ruiz Diaz 18 Sep '13

18 Sep '13

Module: sip-router Branch: master Commit: 3bc87f139bc9635e23a4e92b03d24e00b97706dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bc87f1… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Wed Sep 18 13:39:23 2013 -0400 ims_registrar_scscf: fixed bug caused by uninitialized global variable - "rerrno" variable was not initialized and caused corruption in transaction states --- modules/ims_registrar_scscf/cxdx_sar.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index 51dafdd..7ff976b 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -101,6 +101,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps str xml_data = {0, 0}, ccf1 = {0, 0}, ccf2 = {0, 0}, ecf1 = {0, 0}, ecf2 = {0, 0}; ims_subscription* s = 0; + rerrno = R_FINE; if (!param) { LM_DBG("No transaction data this must have been called from usrloc cb impu deleted - just log result code and then exit");

1 0

[PATCH] modules/sca: fix sca_call_info_uri_update() return value
by Timo Teräs 18 Sep '13

18 Sep '13

sca_call_info_uri_update() return value is passed directly as return value of script function "sca_call_info_update". Return value 0 means 'exit script' but that is unwanted. Fix it to just continue with script execution normally. --- Andrew, does this look ok? Can I push this, or will you do it? Should go to master and 4.0 branch at least. modules/sca/sca_call_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 43c7f56..b71bed3 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -743,7 +743,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info, STR_FMT( contact_uri ), STR_FMT( call_id ), call_info->index ); if ( !sca_uri_is_shared_appearance( sca, aor )) { - return( 0 ); + return( 1 ); } dialog.id.s = dlg_buf; -- 1.8.4

2 2

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013