sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: utils Add section ID's to README xml

by Olle E. Johansson

Module: sip-router Branch: master Commit: 3b76b3bb674420ffcee1cb400ee812bf9e7db418 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b76b3b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 20:35:44 2013 +0200 utils Add section ID's to README xml --- modules/utils/README | 4 ++-- modules/utils/doc/utils_admin.xml | 28 +++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index 44fff00..61d4276 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -177,7 +177,7 @@ modparam("utils", "xcap_table", "pres_xcap") 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) -4.1. http_query(url, result) +4.1. http_query(url, result) Sends HTTP GET request according to URL given in "url" parameter, which is a string that may contain pseudo variables. @@ -202,7 +202,7 @@ switch ($retcode) { } ... -4.2. xcap_auth_status(watcher_uri, presentity_uri) +4.2. xcap_auth_status(watcher_uri, presentity_uri) Function checks in the presence server database if a watcher is authorized to subscribe to event "presence" of presentity. Sphere diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 697d0ea..ab59350 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -72,7 +72,7 @@ <section> <title>Parameters</title> - <section> + <section id="utils.p.http_query_timeout"> <title><varname>http_query_timeout</varname> (int)</title> <para> Defines in seconds how long &kamailio; waits for response @@ -93,7 +93,7 @@ modparam("utils", "http_query_timeout", 2) </programlisting> </example> </section> - <section> + <section id="utils.p.forward_active"> <title><varname>forward_active</varname> (int)</title> <para> Defines if the forwarding callback should be installed. @@ -112,7 +112,7 @@ modparam("utils", "http_query_timeout", 2) </programlisting> </example> </section> - <section> + <section id="utils.p.pres_db_url"> <title><varname>pres_db_url</varname> (string)</title> <para> Defines presence server database URL. If not @@ -132,7 +132,7 @@ modparam("utils", "pres_db_url", "mysql://foo:secret@localhost/pres") </programlisting> </example> </section> - <section> + <section id="utils.p.xcap_table"> <title><varname>xcap_table</varname> (string)</title> <para> Defines the name of the xcap table in the presence server database. @@ -156,7 +156,7 @@ modparam("utils", "xcap_table", "pres_xcap") <section> <title>Functions</title> - <section> + <section id="utils.f.http_query"> <title> <function moreinfo="none">http_query(url, result)</function> </title> @@ -192,7 +192,7 @@ switch ($retcode) { </programlisting> </example> </section> - <section> + <section id="utils.f.xcap_auth_status"> <title> <function moreinfo="none">xcap_auth_status(watcher_uri, presentity_uri)</function> </title> @@ -235,7 +235,7 @@ if (method=="MESSAGE") { <section> <title><acronym>MI</acronym> Commands</title> - <section> + <section id="utils.m.forward_list"> <title><function moreinfo="none">forward_list</function></title> <para> List active forward rules. @@ -253,8 +253,8 @@ id switch filter proxy ... </programlisting> </example> - </section> - <section> + </section> + <section id="utils.m.forward_switch"> <title><function moreinfo="none">forward_switch</function></title> <para> This command can be used to activate or deactivate forwarding rules. @@ -268,9 +268,8 @@ id switch filter proxy ... </programlisting> </example> - </section> - - <section> + </section> + <section id="utils.m.forward_filter"> <title><function moreinfo="none">forward_filter</function></title> <para> Can be used to specify the filter for a certain id. Messages will only be @@ -298,9 +297,8 @@ id switch filter proxy ... </programlisting> </example> - </section> - - <section> + </section> + <section id="utils.m.forward_proxy"> <title><function moreinfo="none">forward_proxy</function></title> <para> This command can be used to configure forwarding rules. Specifies

11 years, 1 month

git:master: db_cluster Add section IDs to XML file and update some text

by Olle E. Johansson

Module: sip-router Branch: master Commit: 43d59fe1093e7319848794a7c266d3605f764d1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43d59fe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 20:31:07 2013 +0200 db_cluster Add section IDs to XML file and update some text --- modules/db_cluster/README | 21 +++++++++++++-------- modules/db_cluster/doc/db_cluster_admin.xml | 25 +++++++++++++++---------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/modules/db_cluster/README b/modules/db_cluster/README index 6ece6af..cbdf261 100644 --- a/modules/db_cluster/README +++ b/modules/db_cluster/README @@ -62,10 +62,10 @@ Chapter 1. Admin Guide used as a middle layer between modules and database connectors. Via clustering, database operations can be executed across multiple - servers, based on policies such as paraller write, serial or round + servers, based on policies such as parallel write, serial or round robin write and read. - Following database commands are considered to be write operations: + The following database commands are considered to be write operations: INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The read operations are done for database commands: QUERY and RAW-QUERY. @@ -94,7 +94,8 @@ Chapter 1. Admin Guide 3.1. connection (str) Specify the connection to a real database system. The format is - 'conid=>DBURL' - providing a connection id and the database URL. + 'conid=>DBURL' - providing a connection id and the database URL used by + the database driver used. Default value is NULL. @@ -112,18 +113,22 @@ modparam("db_cluster", "connection", 'clsid=>conid1=def1;conid2=def2' - providing a cluster id and the list of database connections to be used. For each connection you have to provide a usage definition. The usage definition is a 4-char long - string, specifying priority and command mode for read an write - operations to be done on that connection. + string, specifying priority and command mode for read and write + operations to be performed on that connection. - The priority is a digit between 0 and 9, higher value is higher - priority. Priority 0 means that connection is not going to be used in - that cluster. + The priority is a digit between 0 and 9, where a higher value means + higher priority. Priority 0 means that the connection is not going to + be used in that cluster. Command mode is a character among s, r and p. s is for doing serial operations (try first and if fails, try next); r is for doing round robin operations; p - is for doing parallel operations (this is valid only for write operations). + The first two characters is priority and mode for read, followed by two + characters for priority and mode for write operations. "p" is only used + for write operations. + Default value is NULL. Example 1.2. Set cluster parameter diff --git a/modules/db_cluster/doc/db_cluster_admin.xml b/modules/db_cluster/doc/db_cluster_admin.xml index eef8eb9..d95cdaf 100644 --- a/modules/db_cluster/doc/db_cluster_admin.xml +++ b/modules/db_cluster/doc/db_cluster_admin.xml @@ -21,11 +21,11 @@ </para> <para> Via clustering, database operations can be executed across multiple - servers, based on policies such as paraller write, serial or round + servers, based on policies such as parallel write, serial or round robin write and read. </para> <para> - Following database commands are considered to be write operations: + The following database commands are considered to be write operations: INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The read operations are done for database commands: QUERY and RAW-QUERY. </para> @@ -63,12 +63,12 @@ </section> <section> <title>Parameters</title> - <section> + <section id="db_cluster.p.connection"> <title><varname>connection</varname> (str)</title> <para> Specify the connection to a real database system. The format is 'conid=>DBURL' - providing a connection id and the database - URL. + URL used by the database driver used. </para> <para> <emphasis> @@ -87,19 +87,19 @@ modparam("db_cluster", "connection", </programlisting> </example> </section> - <section> + <section id="db_cluster.p.cluster"> <title><varname>cluster</varname> (str)</title> <para> Specify the cluster definition. The format is 'clsid=>conid1=def1;conid2=def2' - providing a cluster id and the list of database connections to be used. For each connection you have to provide a usage definition. The usage definition is a 4-char long string, - specifying priority and command mode for read an write operations to be - done on that connection. + specifying priority and command mode for read and write operations to be + performed on that connection. </para> <para> - The priority is a digit between 0 and 9, higher value is higher priority. - Priority 0 means that connection is not going to be used in that cluster. + The priority is a digit between 0 and 9, where a higher value means higher priority. + Priority 0 means that the connection is not going to be used in that cluster. </para> <para> Command mode is a character among s, r and p. s is for doing serial @@ -108,6 +108,11 @@ modparam("db_cluster", "connection", only for write operations). </para> <para> + <para> + The first two characters is priority and mode for read, followed by + two characters for priority and mode for write operations. "p" is + only used for write operations. + </para> <emphasis> Default value is NULL. </emphasis> @@ -121,7 +126,7 @@ modparam("db_cluster", "cluster", "cls1=>con1=9s8p;con2=9s8p") </programlisting> </example> </section> - <section> + <section id="db_cluster.p.inactive_interval"> <title><varname>inactive_interval</varname> (int)</title> <para> How long (seconds) a connection is considered inactive after a DB

11 years, 1 month

git:master: modules/dialog_ng: fixed bad append bug and added null sentinel

by Jason Penton

Module: sip-router Branch: master Commit: 68a8ef2ed9e616f563a28d87d591f5deebd23085 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68a8ef2… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Apr 2 20:29:50 2013 +0200 modules/dialog_ng: fixed bad append bug and added null sentinel - thanks Hugh --- modules/dialog_ng/dlg_hash.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/dialog_ng/dlg_hash.c b/modules/dialog_ng/dlg_hash.c index 51f8eec..6bfdde3 100644 --- a/modules/dialog_ng/dlg_hash.c +++ b/modules/dialog_ng/dlg_hash.c @@ -1267,15 +1267,16 @@ int dlg_set_toroute(struct dlg_cell *dlg, str * route) { * \return void */ void create_concurrent_did(struct dlg_cell *dlg, str * new_did) { - int len = dlg->did.len + 1; + int len = dlg->did.len + 1 + 1; new_did->s = shm_malloc(len); if (new_did->s == 0) { LM_ERR("no more shm mem (%d)\n", len); return; } + memset(new_did->s, 0, len); memcpy(new_did->s, dlg->did.s, dlg->did.len); - new_did->s[len]= 'x'; - new_did->len = len; + new_did->s[dlg->did.len] = 'x'; + new_did->len = dlg->did.len + 1; } /*!

11 years, 1 month

git:master: modules/dialog_ng: bug fix for concurrent dialog did generation

by Jason Penton

Module: sip-router Branch: master Commit: 9e7f627c5e9a4c34193e4662fbe341b70fa308bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e7f627… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Apr 2 19:44:46 2013 +0200 modules/dialog_ng: bug fix for concurrent dialog did generation - spotted by Camille @ Orange - tks! --- modules/dialog_ng/dlg_hash.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/dialog_ng/dlg_hash.c b/modules/dialog_ng/dlg_hash.c index 97e1371..51f8eec 100644 --- a/modules/dialog_ng/dlg_hash.c +++ b/modules/dialog_ng/dlg_hash.c @@ -1268,12 +1268,13 @@ int dlg_set_toroute(struct dlg_cell *dlg, str * route) { */ void create_concurrent_did(struct dlg_cell *dlg, str * new_did) { int len = dlg->did.len + 1; - new_did = shm_malloc(len); - if (new_did == 0) { + new_did->s = shm_malloc(len); + if (new_did->s == 0) { LM_ERR("no more shm mem (%d)\n", len); + return; } memcpy(new_did->s, dlg->did.s, dlg->did.len); - new_did->s[dlg->did.len+1]= 'x'; + new_did->s[len]= 'x'; new_did->len = len; }

11 years, 1 month

git:master: acc Update documentation with section IDs

by Olle E. Johansson

Module: sip-router Branch: master Commit: f0f31127878ecde2dac854598030f0d7d5374f18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0f3112… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 20:08:43 2013 +0200 acc Update documentation with section IDs --- modules/acc/README | 6 +- modules/acc/doc/acc_admin.xml | 98 ++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f0f…

11 years, 1 month

git:master: db_mysql Correct e-mail address that had a typo.

by Olle E. Johansson

Module: sip-router Branch: master Commit: 70c5705a6cfd9ba8fc8f5519145eb5d4b13770da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70c5705… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Apr 2 19:26:35 2013 +0200 db_mysql Correct e-mail address that had a typo. --- modules/db_mysql/mysql_mod.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 328965d..4041370 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -5,19 +5,19 @@ * * Copyright (C) 2001-2003 FhG Fokus * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * * ser 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 * - * For a license to use the ser software under conditions + * For a license to use the Kamailio software under conditions * other than those described here, or to purchase support for this * software, please contact iptel.org by e-mail at the following addresses: * info(a)iptel.org * - * ser is distributed in the hope that it will be useful, + * 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. @@ -31,6 +31,7 @@ * -------- * 2003-03-11 updated to the new module exports interface (andrei) * 2003-03-16 flags export parameter added (janakj) + * 2013-04-02 added transaction support (haakon.nessjoen(a)gmail.com) */ /** @addtogroup mysql * @{

11 years, 1 month

sipcapture sql anomaly

by MÉSZÁROS Mihály

Hi Alexandr, I find few anomalies regarding sipcapture modul. May you could correct it? Issues i found: 1. kamailio-4.0.0/modules/sipcapture/sql/create_sipcapture.sql in table sip_trace. `auth` varchar(256) NOT NULL, but on page http://code.google.com/p/homer/source/browse/sql/create_sipcapture.sql `authorization` varchar(256) NOT NULL, So what is the correct? I am experiencing problem if i use git version of homer. db_mysql [km_dbase.c:122]: driver error on query: Unknown column 'auth' in 'field list' 2. on http://kamailio.org/docs/modules/4.0.x/modules/sipcapture.html 6. Database setup Before running Kamailio with the sipcapture module, you have to setup the database tables where the module will store the data. For that, if the table were not created by the installation script or you choose to install everything by yourself you can use the sipcapture_create.sql, SQL script in the sql folder of sipcapture module as template. You can also find the complete database documentation on the project webpage, http://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. I couldn't find any information about sipcapture database on this page, not even the complete db doc: http://www.kamailio.org/docs/db-tables/kamailio-db-devel.html Many Thanks, Misi

11 years, 1 month

[tracker] Comment added: add basic sip-t / sip-i support to sip router (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#281 - add basic sip-t / sip-i support to sip router User who did this - Torrey Searle (tsearle) ---------- Fixed the makefile and figured out how to make git spit out a single file for the diffing ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=281#comment818 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.

11 years, 1 month

[tracker] Comment added: Dialog module: dlg_terminate_dlg and register_dlgcb function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#256 - [sr-dev] Dialog module: dlg_terminate_dlg and register_dlgcb function User who did this - Eduardo Lejarreta (lejarreta.e) ---------- As mentioned above, the problem for acc_cdr.c accounting is that "BYE messages" are generated internally so these messages are not tracked by kamailio nor acc_cdr accounting because they are sent directly to end UAs (legs) I propose to add a small change on "dlg_req_within.c" just to force this messages to be tracked by Kamailio changing the internal record_set of dialog just to force then to pass through REQUEST_ROUTE. On "dlg_bye_all" function add a call to "build_route_set" function (better to isolate this small change) int dlg_bye_all(struct dlg_cell *dlg, str *hdrs) { str all_hdrs = { 0, 0 }; int ret; if ((build_extra_hdr(dlg, hdrs, &all_hdrs)) != 0) { LM_ERR("failed to build dlg headers\n"); return -1; } if ( (build_route_set(dlg)) != 0 ) { LM_ERR("failed to build dlg route set\n"); return -1; } ret = send_bye(dlg, DLG_CALLER_LEG, &all_hdrs); ret |= send_bye(dlg, DLG_CALLEE_LEG, &all_hdrs); pkg_free(all_hdrs.s); return ret; } "build_route_set" function will "trick" Kamailio to route these BYE messages as "end UA generated" allowing acc_cdr to correctly to the accounting. static inline int build_route_set( struct dlg_cell *dlg ) { char *p=0; dlg->route_set[0].len = strlen("<sip:") + dlg->bind_addr[0]->address_str.len + strlen(";lr>"); dlg->route_set[1].len = strlen("<sip:") + dlg->bind_addr[1]->address_str.len + strlen(";lr>"); dlg->route_set[0].s = (char*)pkg_malloc( dlg->route_set[0].len * sizeof(char) ); dlg->route_set[1].s = (char*)pkg_malloc( dlg->route_set[1].len * sizeof(char) ); if ( !dlg->route_set[0].s || !dlg->route_set[1].s ){ LM_ERR("out of pkg memory\n"); goto error; } p = dlg->route_set[0].s; if ( dlg->route_set[0].len ){ memcpy( p, "<sip:", strlen("<sip:") ); p += strlen("<sip:"); memcpy( p, dlg->bind_addr[0]->address_str.s, dlg->bind_addr[0]->address_str.len); p += dlg->bind_addr[0]->address_str.len; memcpy( p, ";lr>", strlen(";lr>") ); } p = dlg->route_set[1].s; if ( dlg->route_set[1].len ){ memcpy( p, "<sip:", strlen("<sip:") ); p += strlen("<sip:"); memcpy( p, dlg->bind_addr[1]->address_str.s, dlg->bind_addr[1]->address_str.len); p += dlg->bind_addr[1]->address_str.len; memcpy( p, ";lr>", strlen(";lr>") ); } return 0; error: return -1; } Could you please deep test this ? I've done several trials and everything seems to be OK. Any security issue idea ? Forgive my poor programming. Thanks and regards. Eduardo Lejarreta. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=256#comment817 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.

11 years, 1 month

[tracker] Comment added: add basic sip-t / sip-i support to sip router

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#281 - add basic sip-t / sip-i support to sip router User who did this - Daniel-Constantin Mierla (miconda) ---------- Looks fine at first sight. The file you attached contains 4 patches or so, it has to be split back to apply one by one. Anyhow, to get the new module in, the easiest way is to join the devel team and maintain the module for at least one year. If that is not possible for you, we will try to get someone else to care of it. Assuming you want to maintain it, email me: - desired unix username for git write access - email address to be used for git commit notifications - your ssh public key >From the attached file above, one thing that I noticed is the Makefile of the module, its content has to be updated a bit, because the comments refer to a different one. It can be a new commit once the above patches are in git master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=281#comment816 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.

11 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013