March 2012 - sr-dev - kamailio.org

git:master: modules_k/presence: Fixed bug - calling child_init in process main
by Anca Vamanu 12 Mar '12

12 Mar '12

Module: sip-router Branch: master Commit: 7f54aacb740011abe968eb599509cf296e003a61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f54aac… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Mar 8 17:26:06 2012 +0200 modules_k/presence: Fixed bug - calling child_init in process main Process main calls child_init with process type PROC_MAIN before forking the TCP children. Since presence module opens database connection in child_init, this resulted in connection being inherited by the TCP children and wierd things happening when doing DB operations. Since there is no place in main() where child_init is called after all the forks, for the subs_db_mode=WRITE_BACK when process main needs to dump the subscribe table in database at shutdown, the solution was to open the database connection in mod_destroy(). --- modules_k/presence/presence.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 58ddbd4..dd415f7 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -369,7 +369,7 @@ static int mod_init(void) */ static int child_init(int rank) { - if (rank==PROC_INIT || rank==PROC_TCP_MAIN) + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ pid = my_pid(); @@ -462,8 +462,14 @@ static int mi_child_init(void) */ static void destroy(void) { - if(subs_htable && pa_db) - timer_db_update(0, 0); + if(subs_htable && subs_dbmode == WRITE_BACK) { + /* open database connection */ + pa_db = pa_dbf.init(&db_url); + if (!pa_db) { + LM_ERR("mod_destroy: unsuccessful connecting to database\n"); + } else + timer_db_update(0, 0); + } if(subs_htable) destroy_shtable(subs_htable, shtable_size);

2 3

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Anca Vamanu 12 Mar '12

12 Mar '12

Module: sip-router Branch: master Commit: 654a15281ad42a92076bfd131d95b3e7c5cb240f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=654a152… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Mar 8 17:47:23 2012 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

2 1

git:master: tls: updated readme with missing parameters
by Daniel-Constantin Mierla 12 Mar '12

12 Mar '12

Module: sip-router Branch: master Commit: 30266d27e3abbea9ceb5ea59bcccc69fe9a0b9bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30266d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 12 12:26:39 2012 +0100 tls: updated readme with missing parameters --- modules/tls/README | 55 +++++++++++++++++++++++++++++++++++++----- modules/tls/doc/params.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 7 deletions(-) diff --git a/modules/tls/README b/modules/tls/README index 0fa3f37..e693a67 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -4,7 +4,7 @@ Andrei Pelinescu-Onciul iptelorg GmbH - Copyright © 2007 iptelorg GmbH + Copyright � 2007 iptelorg GmbH __________________________________________________________________ 1.1. Overview @@ -43,7 +43,10 @@ Andrei Pelinescu-Onciul 1.9.24. low_mem_threshold1 (integer) 1.9.25. low_mem_threshold2 (integer) 1.9.26. tls_force_run (boolean) - 1.9.27. config (string) + 1.9.27. session_cache (boolean) + 1.9.28. session_id (str) + 1.9.29. renegotiation (boolean) + 1.9.30. config (string) 1.10. Functions @@ -883,7 +886,45 @@ modparam("tls", "low_mem_threshold2", -1) modparam("tls", "tls_force_run", 11) ... -1.9.27. config (string) +1.9.27. session_cache (boolean) + + If enabled SIP server will do caching of the TLS sessions data, + generation a session_id and sending it back to client. + + By default TLS session caching is disabled (0). + + Example 36. Set session_cache parameter +... +modparam("tls", "session_cache", 1) +... + +1.9.28. session_id (str) + + The value for session ID context, making sense when session caching is + enabled. + + By default TLS session_id is "sip-router-tls-3.1". + + Example 37. Set session_id parameter +... +modparam("tls", "session_id", "my-session-id-context") +... + +1.9.29. renegotiation (boolean) + + If enabled SIP server will allow renegotiations of TLS connection + initiated by the client. This may expose to a security risk if the + client is not a trusted peer and keeps renegotiating, consuming CPU and + bandwidth resources. + + By default TLS renegotiation is disabled (0). + + Example 38. Set renegotiation parameter +... +modparam("tls", "renegotiation", 1) +... + +1.9.30. config (string) Sets the name of the TLS specific config file. @@ -922,7 +963,7 @@ modparam("tls", "tls_force_run", 11) client when it initiates a new connection by itself (it connects to something). - Example 36. Short config file + Example 39. Short config file [server:default] method = TLSv1 verify_certificate = yes @@ -949,7 +990,7 @@ ca_list = local_ca.pem For a more complete example check the tls.cfg distributed with the SIP-router source (sip_router/modules/tls/tls.cfg). - Example 37. Set config parameter + Example 40. Set config parameter ... modparam("tls", "config", "/usr/local/etc/ser/tls.cfg") ... @@ -957,7 +998,7 @@ modparam("tls", "config", "/usr/local/etc/ser/tls.cfg") It can be changed also at runtime. The new config will not be loaded immediately, but after the first tls.reload RPC call. - Example 38. Change and reload tls config at runtime + Example 41. Change and reload tls config at runtime $ sercmd cfg.set_now_string tls config "/usr/local/etc/ser/new_tls.cfg" $ sercmd tls.reload @@ -969,7 +1010,7 @@ modparam("tls", "config", "/usr/local/etc/ser/tls.cfg") , the peer presented an X509 certificate and the certificate chain verified ok. It can be used only in a request route. - Example 39. is_peer_verified usage + Example 42. is_peer_verified usage if (proto==TLS && !is_peer_verified()){ sl_send_reply("400", "No certificate or verification failed"); drop; diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index 63d7eeb..8297172 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -855,6 +855,63 @@ modparam("tls", "tls_force_run", 11) </example> </section> + <section id="session_cache"> + <title><varname>session_cache</varname> (boolean)</title> + <para> + If enabled SIP server will do caching of the TLS sessions data, generation a session_id and sending + it back to client. + </para> + <para> + By default TLS session caching is disabled (0). + </para> + <example> + <title>Set <varname>session_cache</varname> parameter</title> + <programlisting> +... +modparam("tls", "session_cache", 1) +... + </programlisting> + </example> + </section> + + <section id="session_id"> + <title><varname>session_id</varname> (str)</title> + <para> + The value for session ID context, making sense when session caching is enabled. + </para> + <para> + By default TLS session_id is "sip-router-tls-3.1". + </para> + <example> + <title>Set <varname>session_id</varname> parameter</title> + <programlisting> +... +modparam("tls", "session_id", "my-session-id-context") +... + </programlisting> + </example> + </section> + + <section id="renegotiation"> + <title><varname>renegotiation</varname> (boolean)</title> + <para> + If enabled SIP server will allow renegotiations of TLS connection initiated by the client. This may + expose to a security risk if the client is not a trusted peer and keeps renegotiating, consuming CPU + and bandwidth resources. + </para> + <para> + By default TLS renegotiation is disabled (0). + </para> + <example> + <title>Set <varname>renegotiation</varname> parameter</title> + <programlisting> +... +modparam("tls", "renegotiation", 1) +... + </programlisting> + </example> + </section> + <section id="config"> <title><varname>config</varname> (string)</title> <para>

1 0

Plans for next major release v3.3.0
by Daniel-Constantin Mierla 12 Mar '12

12 Mar '12

Hello, during the last IRC devel meeting, we discussed about next major release - v3.3.0, proposing to do it before the summer holidays. That means we are going to have about one more month of development, then go to testing phase and release end of May/beginning of June. If anyone is considering different plans/proposals, let us know. The draft of new features in current devel branch are collected at: * http://www.kamailio.org/wiki/features/new-in-devel Please add any missing items there. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

1 0

IRC Devel Meeting Transcript
by Daniel-Constantin Mierla 12 Mar '12

12 Mar '12

Hello, took me some time to upload, however, if anyone is interested to read the discussions done during last IRC devel meeting, here is the link: * http://www.kamailio.org/wiki/devel/irc-meetings/2012a#transcripts_of_discus… I will bring soon to the lists via dedicated messages some of the topics that need further discussions. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

1 0

[tracker] Comment added: uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407)
by sip-router 09 Mar '12

09 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#204 - uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407) User who did this - oded resnik (or66) ---------- it works OK, Thanks ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=204#comment505 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: modules_k/presence Fixed indexes in SQL schemas
by Anca Vamanu 09 Mar '12

09 Mar '12

Module: sip-router Branch: master Commit: 652f08a52fbc42ab413015ff4a3135d71538f71b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=652f08a… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Mar 9 16:17:56 2012 +0200 modules_k/presence Fixed indexes in SQL schemas Added index on expires for both presentity and active_watchers tables Fixed unique index on active_watchers(no longer matched the operations done in the code) --- lib/srdb1/schema/pr_active_watchers.xml | 8 ++++++-- lib/srdb1/schema/pr_presentity.xml | 10 ++++++++-- utils/kamctl/db_sqlite/presence-create.sql | 6 +++++- utils/kamctl/mysql/presence-create.sql | 6 +++++- utils/kamctl/oracle/presence-create.sql | 6 +++++- utils/kamctl/postgres/presence-create.sql | 6 +++++- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 35d697a..73d5e2f 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -128,7 +128,7 @@ <description>Record route</description> </column> - <column> + <column id="expires"> <name>expires</name> <type>int</type> <size>&expires_len;</size> @@ -174,11 +174,15 @@ <index> <name>active_watchers_idx</name> - <colref linkend="presentity_uri"/> <colref linkend="callid"/> <colref linkend="to_tag"/> <colref linkend="from_tag"/> <unique/> </index> + <index> + <name>active_watchers_expires</name> + <colref linkend="expires"/> + </index> + </table> diff --git a/lib/srdb1/schema/pr_presentity.xml b/lib/srdb1/schema/pr_presentity.xml index 188b9ce..f37b753 100644 --- a/lib/srdb1/schema/pr_presentity.xml +++ b/lib/srdb1/schema/pr_presentity.xml @@ -62,6 +62,7 @@ <type>int</type> <size>&expires_len;</size> <description>Expires</description> + <index/> </column> <column> @@ -75,8 +76,8 @@ <name>body</name> <type>binary</type> </column> - - <column id="sender"> + + <column id="sender"> <name>sender</name> <type>string</type> <size>&uri_len;</size> @@ -92,4 +93,9 @@ <unique/> </index> + <index> + <name>presentity_expires</name> + <colref linkend="expires"/> + </index> + </table> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index c99f3a9..ac0e007 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -12,6 +12,8 @@ CREATE TABLE presentity ( CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) ); +CREATE INDEX presentity_presentity_expires ON presentity (expires); + INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( id INTEGER PRIMARY KEY NOT NULL, @@ -35,9 +37,11 @@ CREATE TABLE active_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT active_watchers_active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); +CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( id INTEGER PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 577ad81..51644df 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -12,6 +12,8 @@ CREATE TABLE presentity ( CONSTRAINT presentity_idx UNIQUE (username, domain, event, etag) ) ENGINE=MyISAM; +CREATE INDEX presentity_expires ON presentity (expires); + INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, @@ -35,9 +37,11 @@ CREATE TABLE active_watchers ( version INT(11) DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT active_watchers_idx UNIQUE (callid, to_tag, from_tag) ) ENGINE=MyISAM; +CREATE INDEX active_watchers_expires ON active_watchers (expires); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index cd3dbf5..9ef4797 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -20,6 +20,8 @@ END presentity_tr; / BEGIN map2users('presentity'); END; / +CREATE INDEX presentity_presentity_expires ON presentity (expires); + INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( id NUMBER(10) PRIMARY KEY, @@ -43,7 +45,7 @@ CREATE TABLE active_watchers ( version NUMBER(10) DEFAULT 0 NOT NULL, socket_info VARCHAR2(64), local_contact VARCHAR2(128), - CONSTRAINT ORA_active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT ORA_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); CREATE OR REPLACE TRIGGER active_watchers_tr @@ -54,6 +56,8 @@ END active_watchers_tr; / BEGIN map2users('active_watchers'); END; / +CREATE INDEX ORA_active_watchers_expires ON active_watchers (expires); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( id NUMBER(10) PRIMARY KEY, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 104e5bf..6b61de6 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -12,6 +12,8 @@ CREATE TABLE presentity ( CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) ); +CREATE INDEX presentity_presentity_expires ON presentity (expires); + INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( id SERIAL PRIMARY KEY NOT NULL, @@ -35,9 +37,11 @@ CREATE TABLE active_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT active_watchers_active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) + CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); +CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); + INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( id SERIAL PRIMARY KEY NOT NULL,

1 0

git:master: htable: check for expired records only for tables with auto-expire set
by Elena-Ramona Modroiu 09 Mar '12

09 Mar '12

Module: sip-router Branch: master Commit: 1f5b0632e02e29b304c3d848b2df94ab8e514745 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f5b063… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Fri Mar 9 12:34:27 2012 +0100 htable: check for expired records only for tables with auto-expire set - from a patch by Krishna Kurapati --- modules_k/htable/ht_db.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules_k/htable/ht_db.c b/modules_k/htable/ht_db.c index e1a46b2..4c6fbdf 100644 --- a/modules_k/htable/ht_db.c +++ b/modules_k/htable/ht_db.c @@ -369,10 +369,12 @@ int ht_db_save_table(ht_t *ht, str *dbtable) it->name.len, it->name.s, it->value.n); } - if (it->expire <= now) { - LM_DBG("skipping expired entry"); - it = it->next; - continue; + if(ht->htexpire > 0) { + if (it->expire <= now) { + LM_DBG("skipping expired entry"); + it = it->next; + continue; + } } db_vals[0].type = DB1_STR;

1 0

git:master: modules/sipcapture fixed statistic.sql
by Alexandr Dubovikov 08 Mar '12

08 Mar '12

Module: sip-router Branch: master Commit: 082100fdc73d2938f5e736de82344a390a52a3d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=082100f… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Mar 8 11:28:49 2012 +0100 modules/sipcapture fixed statistic.sql --- modules/sipcapture/sql/statistics.sql | 1159 ++------------------------------- 1 files changed, 39 insertions(+), 1120 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=082…

1 0

[tracker] Task opened: Crash when sqlops tries to do a 'select' on db_text (Attachment added)
by sip-router 08 Mar '12

08 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Pedro Vico (pvsolano) Attached to Project - sip-router Summary - Crash when sqlops tries to do a 'select' on db_text Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - Linux Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - Using kamailio 3.1.5 Trying to do a "select * from uri" on db_text causes a segmentation fault. Modules implicated: 'sqlops' and 'db_text'. Kamailio should check that 'sqlops' is not compatible with 'db_text'. Anyway it shouldn't crash. Attached core and cfg 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=208 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