sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

by Juha Heinanen

i'm also seeing these: Sep 30 12:21:42 sip /usr/sbin/sip-proxy[27211]: ERROR: <core> [db.c:291]: cannot parse URL 'mysql://user:pass@localhost/ser' -- juha

13 years, 2 months

git:master: modules:sipcapture: ETHHDR moved from .h to .c, changed method check in kamailio.cfg

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: de1509aa7f2ade90074c2fe3b9b13e65224c4b43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de1509a… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Sep 30 11:37:35 2011 +0200 modules:sipcapture: ETHHDR moved from .h to .c, changed method check in kamailio.cfg --- modules/sipcapture/examples/kamailio.cfg | 7 ++++--- modules/sipcapture/sipcapture.c | 3 +++ modules/sipcapture/sipcapture.h | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/sipcapture/examples/kamailio.cfg b/modules/sipcapture/examples/kamailio.cfg index a4e7a07..eaf57fa 100644 --- a/modules/sipcapture/examples/kamailio.cfg +++ b/modules/sipcapture/examples/kamailio.cfg @@ -25,6 +25,7 @@ mpath="/usr/local/lib64/kamailio/modules_k/:/usr/local/lib64/kamailio/modules/" loadmodule "pv.so" loadmodule "db_mysql.so" loadmodule "sipcapture.so" +loadmodule "textops.so" # ----- mi_fifo params ----- @@ -58,7 +59,7 @@ modparam("sipcapture", "raw_sock_children", 4) route { #For example, you can capture only needed methods... - #if (method =~ "^(INVITE|UPDATE|NOTIFY|SUBSCRIBE|OPTIONS|REGISTER|BYE)") { + #if (is_method("INVITE|UPDATE|NOTIFY|SUBSCRIBE|OPTIONS|REGISTER|BYE")) { sip_capture(); #} exit; @@ -67,8 +68,8 @@ route { onreply_route { #And replies of request methods - #if(status =~ "^(1[0-9][0-9]|[3[0-9][0-9]|4[0-9]|[56][0-9][0-9])") { - #if($rm =~ "^(INVITE|UPDATE|NOTIFY|SUBSCRIBE|OPTIONS|REGISTER|BYE)") { + #if(status =~ "^(1[0-9][0-9]|[3[0-9][0-9]|4[0-9]|[56][0-9][0-9])$") { + #if($rm =~ "^(INVITE|UPDATE|NOTIFY|SUBSCRIBE|OPTIONS|REGISTER|BYE)$") { sip_capture(); #} exit; diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 9dd357e..2d4d459 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -76,6 +76,7 @@ #include "../../lib/kcore/statistics.h" #endif + MODULE_VERSION struct _sipcapture_object { @@ -119,6 +120,8 @@ struct _sipcapture_object { #endif }; +#define ETHHDR 14 /* sizeof of ethhdr structure */ + #define EMPTY_STR(val) val.s=""; val.len=0; #define TABLE_LEN 256 diff --git a/modules/sipcapture/sipcapture.h b/modules/sipcapture/sipcapture.h index 1e670c4..0ee665c 100644 --- a/modules/sipcapture/sipcapture.h +++ b/modules/sipcapture/sipcapture.h @@ -45,8 +45,6 @@ struct hep_ip6hdr { }; #endif -#define ETHHDR 14 /* sizeof of ethhdr structure */ - /* Make it independed */ /* Copied from linux/filter.h */ struct my_sock_filter /* Filter block */

13 years, 2 months

Dialog2 and proxy initiated early dialog termination

by Jason Penton

Hi All, Ok Dialog2 progressing nicely. We now have dialogs and their associated out dialogs (branches / forking) stored and managed within the dialog2 module. For the moment, we have excluded DB support but will add once we check in to git. One thing we need a little assistance with: We have just finished the prototype for proxy initiated early dialog termination, but we are concerned with the way it has been done. Basically as mentioned in the wiki ( http://www.kamailio.org/dokuwiki/doku.php/modules-new-design:dialog-module-…), - It should be possible to terminate dialogs in the “early” state, i.e., sending out BYE/CANCEL requests in order to terminate all branches appropriately. - ibc: IMHO it would be easier just to cancel the transaction as when fr_inv_timer expires, this is, by sending a CANCEL to all the pending branches and a 408 to the UAC (perhaps in this case a 480 would be more appropriate). The only way we could think of doing this was to send a fake reply via the TM module. We have therefore exposed the fake_reply function from the TM module and using that to terminate early dialogs. It works in the test scenarios we have performed, but the main drawback we can see here is that the dialog module needs to hold a pointer to the transaction for each dialog (not sure how bad this is as my experience with tm is not expert yet ;) ) So any thoughts/ideas. Is this the correct way to do it? Would it be okay to expose a fake_reply function through TM API? Cheers Jason

13 years, 2 months

git:jh/33plus DELETED: modules_k/sqlops: use signed int to string conversion for sql.val transformation

by Juha Heinanen

Module: sip-router Branch: jh/33plus DELETED Commit: 81d63a1737506c0b34e4450b5867ab37ad584faf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d63a1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Sep 29 13:03:47 2011 +0200 modules_k/sqlops: use signed int to string conversion for sql.val transformation integer variables in kamailio are signed by default, conversion to string should be signed also. --- modules_k/sqlops/sql_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_trans.c b/modules_k/sqlops/sql_trans.c index eaf3fb8..2710fc3 100644 --- a/modules_k/sqlops/sql_trans.c +++ b/modules_k/sqlops/sql_trans.c @@ -42,7 +42,7 @@ static int _tr_eval_sql_val(pv_value_t *val) static char _tr_buffer[TR_BUFFER_SIZE]; if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { - val->rs.s = int2str(val->ri, &val->rs.len); + val->rs.s = sint2str(val->ri, &val->rs.len); val->flags = PV_VAL_STR; return 0; }

13 years, 2 months

git:jh/32plus: lib/srdb1/schema/mtrees.xml: schema upgrade

by Juha Heinanen

Module: sip-router Branch: jh/32plus Commit: 20b73cb697705de6c8d2a058fcee753015d6036e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20b73cb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Sep 30 11:37:11 2011 +0300 lib/srdb1/schema/mtrees.xml: schema upgrade - Added tvalue to unique index, because each prefix can now be associated with more than one value. --- lib/srdb1/schema/mtrees.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/mtrees.xml b/lib/srdb1/schema/mtrees.xml index fb3e3f9..eb3f1ab 100644 --- a/lib/srdb1/schema/mtrees.xml +++ b/lib/srdb1/schema/mtrees.xml @@ -9,7 +9,7 @@ <table id="mtrees" xmlns:db="http://docbook.org/ns/docbook"> <name>mtrees</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the mtree module to load values in shared memory trees at start up. More information about the mtree module can be found at: &KAMAILIO_MOD_DOC;mtree.html @@ -51,9 +51,10 @@ </column> <index> - <name>tname_tprefix_idx</name> + <name>tname_tprefix_tvalue_idx</name> <colref linkend="tname"/> <colref linkend="tprefix"/> + <colref linkend="tvalue"/> <unique/> </index>

13 years, 2 months

git:jh/33plus: modules_k/sqlops: use signed int to string conversion for sql.val transformation

by Juha Heinanen

Module: sip-router Branch: jh/33plus Commit: 81d63a1737506c0b34e4450b5867ab37ad584faf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d63a1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Sep 29 13:03:47 2011 +0200 modules_k/sqlops: use signed int to string conversion for sql.val transformation integer variables in kamailio are signed by default, conversion to string should be signed also. --- modules_k/sqlops/sql_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_trans.c b/modules_k/sqlops/sql_trans.c index eaf3fb8..2710fc3 100644 --- a/modules_k/sqlops/sql_trans.c +++ b/modules_k/sqlops/sql_trans.c @@ -42,7 +42,7 @@ static int _tr_eval_sql_val(pv_value_t *val) static char _tr_buffer[TR_BUFFER_SIZE]; if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { - val->rs.s = int2str(val->ri, &val->rs.len); + val->rs.s = sint2str(val->ri, &val->rs.len); val->flags = PV_VAL_STR; return 0; }

13 years, 2 months

git:master: modules:sipcapture: fixed mirroring mode, added BPF functionality.

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 81cd64fe78847ad777f51316c50ff45becf1764c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81cd64f… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 29 14:26:45 2011 +0200 modules:sipcapture: fixed mirroring mode, added BPF functionality. --- modules/sipcapture/README | 29 +++- modules/sipcapture/doc/sipcapture_admin.xml | 21 +++ modules/sipcapture/examples/kamailio.cfg | 10 +- modules/sipcapture/sipcapture.c | 255 +++++++++++++++++++++----- modules/sipcapture/sipcapture.h | 55 ++++++ 5 files changed, 311 insertions(+), 59 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=81c…

13 years, 2 months

git:master: modules_k/sqlops: use signed int to string conversion for sql. val transformation

by Alex Hermann

Module: sip-router Branch: master Commit: 81d63a1737506c0b34e4450b5867ab37ad584faf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d63a1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Sep 29 13:03:47 2011 +0200 modules_k/sqlops: use signed int to string conversion for sql.val transformation integer variables in kamailio are signed by default, conversion to string should be signed also. --- modules_k/sqlops/sql_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_trans.c b/modules_k/sqlops/sql_trans.c index eaf3fb8..2710fc3 100644 --- a/modules_k/sqlops/sql_trans.c +++ b/modules_k/sqlops/sql_trans.c @@ -42,7 +42,7 @@ static int _tr_eval_sql_val(pv_value_t *val) static char _tr_buffer[TR_BUFFER_SIZE]; if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { - val->rs.s = int2str(val->ri, &val->rs.len); + val->rs.s = sint2str(val->ri, &val->rs.len); val->flags = PV_VAL_STR; return 0; }

13 years, 2 months

git:adubovikov/homer: modules_k:registrar: added description for lookup function (flag support)

by Alexandr Dubovikov

Module: sip-router Branch: adubovikov/homer Commit: 61820242d44105fe8dbbf413d6a916fe3beaaa5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6182024… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 29 15:24:40 2011 +0200 modules_k:registrar: added description for lookup function (flag support) --- modules_k/registrar/README | 7 ++++++- modules_k/registrar/doc/registrar_admin.xml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/README b/modules_k/registrar/README index d060982..c3b7016 100644 --- a/modules_k/registrar/README +++ b/modules_k/registrar/README @@ -669,7 +669,12 @@ switch ($retcode) { 4.4. lookup(domain,flags) Same as lookup() but it accepts a set of flags for controlling its - behaviour. + behaviour. This method allows you to make choose between different AOR + connnected to the same user id. Example: you can register the same user + multiple times and after lookup you will distribute incoming calls + between these AORs. If you have 4 registration, each AOR will receive + 25% of all incoming calls. It can help to buid a cluster system based + on user registration. Meaning of the parameters is as follows: * domain - Name of table that should be used for the lookup. diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index 74ed609..722c885 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -811,7 +811,12 @@ switch ($retcode) { </title> <para> Same as lookup() but it accepts a set of flags for controlling its - behaviour. + behaviour. This method allows you to make choose between + different AOR connnected to the same user id. Example: you can register + the same user multiple times and after lookup you will distribute + incoming calls between these AORs. If you have 4 registration, each + AOR will receive 25% of all incoming calls. It can help to buid a cluster + system based on user registration. </para> <para>Meaning of the parameters is as follows:</para>

13 years, 2 months

git:master: modules:sipcapture: fixed rotation scripts (maxvalue) and SQL schema.

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: 6f8973719551dec797c89452ba1abb87ef1ad894 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f89737… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 29 15:03:46 2011 +0200 modules:sipcapture: fixed rotation scripts (maxvalue) and SQL schema. Thanks Dorn B. <djbinter(a)gmail.com> for reports and fixes. --- modules/sipcapture/examples/partrotate_todays.pl | 5 +++-- .../examples/partrotate_unixtimestamp.pl | 9 ++++++--- .../sipcapture/sql/create_part_unixtimestamp.sql | 7 ++----- modules/sipcapture/sql/sipcapture-create.sql | 8 ++------ 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/modules/sipcapture/examples/partrotate_todays.pl b/modules/sipcapture/examples/partrotate_todays.pl index f9e9059..e831743 100644 --- a/modules/sipcapture/examples/partrotate_todays.pl +++ b/modules/sipcapture/examples/partrotate_todays.pl @@ -74,8 +74,9 @@ for(my $i=0; $i<$newparts; $i++) { if(!$exist) { - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM)"; + # Fix MAXVALUE. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; $db->do($query); if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n"; diff --git a/modules/sipcapture/examples/partrotate_unixtimestamp.pl b/modules/sipcapture/examples/partrotate_unixtimestamp.pl index 40d36a4..6be3a66 100644 --- a/modules/sipcapture/examples/partrotate_unixtimestamp.pl +++ b/modules/sipcapture/examples/partrotate_unixtimestamp.pl @@ -82,10 +82,13 @@ for(my $i=0; $i<$newparts; $i++) { $exist+=0; if(!$exist) { - - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM)"; + + # Fix MAXVALUE. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; + $db->do($query); + if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n"; } diff --git a/modules/sipcapture/sql/create_part_unixtimestamp.sql b/modules/sipcapture/sql/create_part_unixtimestamp.sql index fdcc895..a7f8645 100644 --- a/modules/sipcapture/sql/create_part_unixtimestamp.sql +++ b/modules/sipcapture/sql/create_part_unixtimestamp.sql @@ -5,7 +5,7 @@ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `sip_capture` ( - `id` int(20) NOT NULL AUTO_INCREMENT, + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `micro_ts` bigint(18) NOT NULL DEFAULT '0', `method` varchar(50) NOT NULL DEFAULT '', @@ -42,7 +42,7 @@ CREATE TABLE `sip_capture` ( `rtp_stat` varchar(256) NOT NULL, `type` int(2) NOT NULL, `node` varchar(125) NOT NULL, - `msg` longblob NOT NULL, + `msg` blob NOT NULL, PRIMARY KEY (`id`,`date`), KEY `ruri_user` (`ruri_user`), KEY `from_user` (`from_user`), @@ -81,6 +81,3 @@ PARTITION p2011082523 VALUES LESS THAN (1314298800) ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN (MAXVALUE) ); - -/* if your mysql < 5.5 drop maxvalue partition */ -/* alter table homer_capture drop partition pmax; */ diff --git a/modules/sipcapture/sql/sipcapture-create.sql b/modules/sipcapture/sql/sipcapture-create.sql index e12a382..155dff2 100644 --- a/modules/sipcapture/sql/sipcapture-create.sql +++ b/modules/sipcapture/sql/sipcapture-create.sql @@ -4,7 +4,7 @@ DROP TABLE IF EXISTS `sip_capture`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `sip_capture` ( - `id` int(20) NOT NULL AUTO_INCREMENT, + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `micro_ts` bigint(18) NOT NULL DEFAULT '0', `method` varchar(50) NOT NULL DEFAULT '', @@ -41,7 +41,7 @@ CREATE TABLE `sip_capture` ( `rtp_stat` varchar(256) NOT NULL, `type` int(2) NOT NULL, `node` varchar(125) NOT NULL, - `msg` longblob NOT NULL, + `msg` blob NOT NULL, PRIMARY KEY (`id`,`date`), KEY `ruri_user` (`ruri_user`), KEY `from_user` (`from_user`), @@ -66,7 +66,3 @@ PARTITION p20110902 VALUES LESS THAN (734748) ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN (MAXVALUE) ); -/* alter table homer_capture add partition (PARTITION p20110903 VALUES LESS THAN (734749) ENGINE = MyISAM); */ -/* if your mysql < 5.5 drop maxvalue partition */ -/* alter table sip_capture drop partition pmax; */ -

13 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011