sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
173 discussions

SIPTrace and IPv6
by Carsten Bock 11 Sep '12

11 Sep '12

Hi, did anyone ever try the SIPTrace of Kamailio 3.2 (from GIT) with IPv6? I have it enabled in my config: # SIP-Address of capturing node, if not set, capturing is disabled. #!define CAPTURE_NODE "sip:[2a00:1158:2:3300::3]" # Destination, where to send the traffic modparam("siptrace", "duplicate_uri", CAPTURE_NODE) # Trace all traffic modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", FLT_CAPTURE) modparam("siptrace", "hep_mode_on", 1) and i do sip_trace(); setflag(FLT_CAPTURE); for all my incoming requests in config, but i don't see any IPv6 INVITEs being sent to Homer (only IPv4-INVITE's). All other requests are working fine (OPTIONS, BYE, everything...) but IPv6-INVITE's seems not to be forwarded. The annoying thing is, that there is no error or warning in the log. Can someone confirm this? Otherwise i will just digg deeper into the code, to find the bug.... Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Schomburgstr. 80 D-22767 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 34927219 Fax +49 40 34927220 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

1 2

git:master: db scheme: move usrloc and alias expire time 10 years to the future, to 2030
by Henning Westerholt 11 Sep '12

11 Sep '12

Module: sip-router Branch: master Commit: 97173572a81b67dd5165de2948562d5db91168d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9717357… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Fri Sep 7 12:57:30 2012 +0200 db scheme: move usrloc and alias expire time 10 years to the future, to 2030 --- lib/srdb1/schema/entities.xml | 4 ++-- utils/kamctl/db_berkeley/kamailio/aliases | 2 +- utils/kamctl/db_berkeley/kamailio/location | 2 +- utils/kamctl/db_sqlite/registrar-create.sql | 2 +- utils/kamctl/db_sqlite/usrloc-create.sql | 2 +- utils/kamctl/kamctlrc | 2 +- utils/kamctl/kamdbctl.base | 2 +- utils/kamctl/mysql/registrar-create.sql | 2 +- utils/kamctl/mysql/usrloc-create.sql | 2 +- utils/kamctl/oracle/registrar-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 2 +- utils/kamctl/postgres/registrar-create.sql | 2 +- utils/kamctl/postgres/usrloc-create.sql | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/entities.xml b/lib/srdb1/schema/entities.xml index 8ff237d..2825157 100644 --- a/lib/srdb1/schema/entities.xml +++ b/lib/srdb1/schema/entities.xml @@ -21,8 +21,8 @@ <!ENTITY description_len "255"> <!ENTITY MYSQL_TABLE_TYPE "MyISAM"> <!ENTITY USERCOL "username"> -<!ENTITY DEFAULT_ALIASES_EXPIRES "2020-05-28 21:32:15"> -<!ENTITY DEFAULT_LOCATION_EXPIRES "2020-05-28 21:32:15"> +<!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> +<!ENTITY DEFAULT_LOCATION_EXPIRES "2030-05-28 21:32:15"> <!ENTITY DEFAULT_Q "1.0"> <!ENTITY DEFAULT_CALLID "Default-Call-ID"> <!ENTITY DEFAULT_CSEQ "1"> diff --git a/utils/kamctl/db_berkeley/kamailio/aliases b/utils/kamctl/db_berkeley/kamailio/aliases index edc1177..54a12f6 100644 --- a/utils/kamctl/db_berkeley/kamailio/aliases +++ b/utils/kamctl/db_berkeley/kamailio/aliases @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 +NIL|''|''|NULL|''|NULL|NULL|'2030-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 diff --git a/utils/kamctl/db_berkeley/kamailio/location b/utils/kamctl/db_berkeley/kamailio/location index edc1177..54a12f6 100644 --- a/utils/kamctl/db_berkeley/kamailio/location +++ b/utils/kamctl/db_berkeley/kamailio/location @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 +NIL|''|''|NULL|''|NULL|NULL|'2030-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index 8743517..bcad0f6 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -7,7 +7,7 @@ CREATE TABLE aliases ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INTEGER DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index 72fd3d9..11442f6 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -7,7 +7,7 @@ CREATE TABLE location ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INTEGER DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index ceb6f54..93be3b0 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -52,7 +52,7 @@ # in db/schema/entities.xml too. # FIXME -# FOREVER="2020-05-28 21:32:15" +# FOREVER="2030-05-28 21:32:15" # DEFAULT_ALIASES_EXPIRES=$FOREVER # DEFAULT_Q="1.0" # DEFAULT_CALLID="Default-Call-ID" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index b1cf561..60a0849 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -48,7 +48,7 @@ PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap # script and needed to be the same as in the database definitions. # FIXME -FOREVER=${FOREVER:-2020-05-28 21:32:15} +FOREVER=${FOREVER:-2030-05-28 21:32:15} DEFAULT_ALIASES_EXPIRES=${DEFAULT_ALIASES_EXPIRES:-${FOREVER}} DEFAULT_Q=${DEFAULT_Q:-1.0} DEFAULT_CALLID=${DEFAULT_CALLID:-Default-Call-ID} diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 73f808c..640f7e8 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -7,7 +7,7 @@ CREATE TABLE aliases ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires DATETIME DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL, q FLOAT(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INT(11) DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index dc1fa5a..fe26cca 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -7,7 +7,7 @@ CREATE TABLE location ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires DATETIME DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL, q FLOAT(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INT(11) DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/oracle/registrar-create.sql b/utils/kamctl/oracle/registrar-create.sql index 0409d84..d311b41 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -7,7 +7,7 @@ CREATE TABLE aliases ( contact VARCHAR2(255) DEFAULT '', received VARCHAR2(128) DEFAULT NULL, path VARCHAR2(128) DEFAULT NULL, - expires DATE DEFAULT to_date('2020-05-28 21:32:15','yyyy-mm-dd hh24:mi:ss'), + expires DATE DEFAULT to_date('2030-05-28 21:32:15','yyyy-mm-dd hh24:mi:ss'), q NUMBER(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR2(255) DEFAULT 'Default-Call-ID', cseq NUMBER(10) DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 386af40..67070c9 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -7,7 +7,7 @@ CREATE TABLE location ( contact VARCHAR2(255) DEFAULT '', received VARCHAR2(128) DEFAULT NULL, path VARCHAR2(128) DEFAULT NULL, - expires DATE DEFAULT to_date('2020-05-28 21:32:15','yyyy-mm-dd hh24:mi:ss'), + expires DATE DEFAULT to_date('2030-05-28 21:32:15','yyyy-mm-dd hh24:mi:ss'), q NUMBER(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR2(255) DEFAULT 'Default-Call-ID', cseq NUMBER(10) DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index 2771e01..1f1c382 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -7,7 +7,7 @@ CREATE TABLE aliases ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INTEGER DEFAULT 1 NOT NULL, diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index a74fe87..6125845 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -7,7 +7,7 @@ CREATE TABLE location ( contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, path VARCHAR(128) DEFAULT NULL, - expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2020-05-28 21:32:15' NOT NULL, + expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, cseq INTEGER DEFAULT 1 NOT NULL,

2 2

git:master: db scheme: add missing usrloc and aliases version increase, reported from Juha
by Henning Westerholt 11 Sep '12

11 Sep '12

Module: sip-router Branch: master Commit: 78dae896127ce6762e3fa7c2541e1b5f9b8a9023 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78dae89… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Tue Sep 11 15:13:39 2012 +0200 db scheme: add missing usrloc and aliases version increase, reported from Juha --- lib/srdb1/schema/aliases.xml | 2 +- lib/srdb1/schema/location.xml | 2 +- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/db_sqlite/registrar-create.sql | 2 +- utils/kamctl/db_sqlite/usrloc-create.sql | 2 +- utils/kamctl/dbtext/kamailio/version | 4 ++-- utils/kamctl/mysql/registrar-create.sql | 2 +- utils/kamctl/mysql/usrloc-create.sql | 2 +- utils/kamctl/oracle/registrar-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 2 +- utils/kamctl/postgres/registrar-create.sql | 2 +- utils/kamctl/postgres/usrloc-create.sql | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 29975de..5f135b9 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -9,7 +9,7 @@ <table id="aliases" xmlns:db="http://docbook.org/ns/docbook"> <name>aliases</name> - <version>5</version> + <version>6</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table for the registrar module is similar to the "location" table, (the aliases index makes lookup of missed calls much faster). Thus, the function lookup("alias") can be used to map aliases to AORs. More information is available at: &KAMAILIO_MOD_DOC;registrar.html. Most people uses the dbaliases table with the alias_db module now. diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index fc1c8e7..add435b 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -9,7 +9,7 @@ <table id="location" xmlns:db="http://docbook.org/ns/docbook"> <name>location</name> - <version>5</version> + <version>6</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent user location information for the usrloc module. More information can be found at: &KAMAILIO_MOD_DOC;usrloc.html diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index c51ace4..4d0e5ee 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -15,7 +15,7 @@ active_watchers|11 address| address|5 aliases| -aliases|5 +aliases|6 carrier_name| carrier_name|1 carrierfailureroute| @@ -67,7 +67,7 @@ lcr_rule|2 lcr_rule_target| lcr_rule_target|1 location| -location|5 +location|6 matrix| matrix|1 missed_calls| diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index f9a4cc4..b32d61c 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','5'); +INSERT INTO version (table_name, table_version) values ('aliases','6'); CREATE TABLE aliases ( id INTEGER PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index 6286179..ee86dd0 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','5'); +INSERT INTO version (table_name, table_version) values ('location','6'); CREATE TABLE location ( id INTEGER PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 0396a99..996c37f 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -2,7 +2,7 @@ table_name(string) table_version(int) acc:4 active_watchers:11 address:5 -aliases:5 +aliases:6 carrier_name:1 carrierfailureroute:2 carrierroute:3 @@ -28,7 +28,7 @@ imc_rooms:1 lcr_gw:2 lcr_rule:2 lcr_rule_target:1 -location:5 +location:6 matrix:1 missed_calls:3 mtree:1 diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 4d7d9e8..3cb5287 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','5'); +INSERT INTO version (table_name, table_version) values ('aliases','6'); CREATE TABLE aliases ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 8f4f425..4823757 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','5'); +INSERT INTO version (table_name, table_version) values ('location','6'); CREATE TABLE location ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/oracle/registrar-create.sql b/utils/kamctl/oracle/registrar-create.sql index 4c0d5ba..346564d 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','5'); +INSERT INTO version (table_name, table_version) values ('aliases','6'); CREATE TABLE aliases ( id NUMBER(10) PRIMARY KEY, ruid VARCHAR2(64) DEFAULT '', diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 8cc677e..35798f5 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','5'); +INSERT INTO version (table_name, table_version) values ('location','6'); CREATE TABLE location ( id NUMBER(10) PRIMARY KEY, ruid VARCHAR2(64) DEFAULT '', diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index 86d0b11..11306cf 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','5'); +INSERT INTO version (table_name, table_version) values ('aliases','6'); CREATE TABLE aliases ( id SERIAL PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index c161178..9998d86 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','5'); +INSERT INTO version (table_name, table_version) values ('location','6'); CREATE TABLE location ( id SERIAL PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL,

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: master Commit: ca551f7cb3770a08832758e543587415b3c6d80d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca551f7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 14:01:16 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: registrar(k): set found if lookup for uri branch is successful ---

1 0

git:master: lib/srdb1/schema: Updated indices for presence tables based on results of latest performance testing
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: master Commit: 2b62b73f8d966d2418c765839ab43b3dbc57545f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b62b73… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 13:59:55 2012 +0100 lib/srdb1/schema: Updated indices for presence tables based on results of latest performance testing - By Hugh Waite @ Crocodile RCS Ltd and Peter Dunkley @ Crocodile RCS Ltd --- lib/srdb1/schema/pr_active_watchers.xml | 5 ++++- lib/srdb1/schema/pr_pua.xml | 27 +++------------------------ lib/srdb1/schema/rls_presentity.xml | 1 + lib/srdb1/schema/rls_watchers.xml | 7 +------ utils/kamctl/db_sqlite/presence-create.sql | 11 ++++------- utils/kamctl/db_sqlite/rls-create.sql | 1 - utils/kamctl/mysql/presence-create.sql | 11 ++++------- utils/kamctl/mysql/rls-create.sql | 1 - utils/kamctl/oracle/presence-create.sql | 11 ++++------- utils/kamctl/oracle/rls-create.sql | 1 - utils/kamctl/postgres/presence-create.sql | 11 ++++------- utils/kamctl/postgres/rls-create.sql | 1 - 12 files changed, 25 insertions(+), 63 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b6…

1 0

git:master: registrar(k): set found if lookup for uri branch is successful
by Daniel-Constantin Mierla 11 Sep '12

11 Sep '12

Module: sip-router Branch: master Commit: 5ac76c501c87da24443ec56b7cf4ac93b8318f49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ac76c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 11 14:46:03 2012 +0200 registrar(k): set found if lookup for uri branch is successful - the additional branches can hit all not found, but still a found on r-uri can happen --- modules_k/registrar/lookup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 865224a..96ecfc1 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -353,6 +353,9 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) if(nr_branches_start==0) return ret; + if(ret>0) + found = 1; + /* backup r-uri branch */ ruri_b_uri = msg->new_uri; ruri_b_dst_uri = msg->dst_uri;

1 0

git:3.3: modules_k/rls: Improved check for expired subscriptions in DB only mode
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: 3.3 Commit: 3f540459b566641200e129c0c03ab26e6944fbdf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f54045… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 13:09:22 2012 +0100 modules_k/rls: Improved check for expired subscriptions in DB only mode (cherry picked from commit af8230b1ac6a88dfb10d567e784a3c39a8f1b863) --- modules_k/rls/rls_db.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 938f3b7..0e72991 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -116,7 +116,7 @@ int delete_expired_subs_rlsdb( void ) { db_key_t query_cols[3], result_cols[3], update_cols[1]; db_val_t query_vals[3], update_vals[1], *values; - db_op_t query_ops[1]; + db_op_t query_ops[2]; db_row_t *rows; db1_res_t *result = NULL; int n_query_cols = 0, n_result_cols = 0; @@ -144,6 +144,13 @@ int delete_expired_subs_rlsdb( void ) query_ops[n_query_cols]= OP_LT; n_query_cols++; + query_cols[n_query_cols]= &str_updated_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val= NO_UPDATE_TYPE; + query_ops[n_query_cols]= OP_EQ; + n_query_cols++; + result_cols[r_callid_col=n_result_cols++] = &str_callid_col; result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col;

1 0

git:3.3: modules_k/rls: Fixed issues to do with expiry and rls_expires_offset
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: 3.3 Commit: 2778f4126fdd48f4573f008726b3a3868c3d69c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2778f41… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 13:05:15 2012 +0100 modules_k/rls: Fixed issues to do with expiry and rls_expires_offset - These cause particular problems on multi-server systems. - Found and fixed by Hugh Waite @ Crocodile RCS Ltd (cherry picked from commit 6eccc8b61e848977012d6efa1fb5aae61f8d441e) --- modules_k/rls/resource_notify.c | 21 ++++++++------------- modules_k/rls/subscribe.c | 5 ++++- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 8937131..1285925 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -129,15 +129,14 @@ void get_dialog_from_did(char* did, subs_t **dialog, unsigned int *hash_code) *dialog= pres_copy_subs(s, PKG_MEM_TYPE); } - if(*dialog== NULL) - { - LM_ERR("while copying subs_t structure\n"); - } + if ((*dialog)->expires < (int)time(NULL)) + (*dialog)->expires = 0; + else + (*dialog)->expires -= (int)time(NULL); if (dbmode != RLS_DB_ONLY) lock_release(&rls_table[*hash_code].lock); - (*dialog)->expires -= (int)time(NULL); } int send_notify(xmlDocPtr * rlmi_doc, char * buf, int buf_len, @@ -994,15 +993,10 @@ static void timer_send_full_state_notifies(int round) sub.remote_cseq = VAL_INT(&values[rcseq_col]); sub.status = VAL_INT(&values[status_col]); sub.version = VAL_INT(&values[version_col]); - if (VAL_INT(&values[expires_col]) > now) + if (VAL_INT(&values[expires_col]) > now + rls_expires_offset) + { sub.expires = VAL_INT(&values[expires_col]) - now; - else - sub.expires = 0; - - if (sub.expires < rls_expires_offset) sub.expires = 0; - if (sub.expires != 0) - { if (rls_get_service_list(&sub.pres_uri, &sub.watcher_user, &sub.watcher_domain, &service_node, &doc) < 0) { @@ -1026,6 +1020,7 @@ static void timer_send_full_state_notifies(int round) } else { + sub.expires = 0; rls_send_notify(&sub, NULL, NULL, NULL); delete_rlsdb(&sub.callid, &sub.to_tag, &sub.from_tag); } @@ -1153,7 +1148,7 @@ void rls_presentity_clean(unsigned int ticks,void *param) query_ops[0]= OP_LT; query_vals[0].nul= 0; query_vals[0].type= DB1_INT; - query_vals[0].val.int_val= (int)time(NULL) - 10; + query_vals[0].val.int_val= (int)time(NULL) - rls_expires_offset; if (rlpres_dbf.use_table(rlpres_db, &rlpres_table) < 0) { diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index f719754..c9577de 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -1111,13 +1111,16 @@ void update_a_sub(subs_t *subs_copy) { xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; + int now = (int)time(NULL); - if ((subs_copy->expires -= (int)time(NULL)) <= 0) + if (subs_copy->expires < now) { + subs_copy->expires = 0; LM_WARN("found expired subscription for: %.*s\n", subs_copy->pres_uri.len, subs_copy->pres_uri.s); goto done; } + subs_copy->expires -= now; if(rls_get_service_list(&subs_copy->pres_uri, &subs_copy->watcher_user, &subs_copy->watcher_domain, &service_node, &doc)<0)

1 0

git:3.3: modules_k/pua_db: If PUA finds more than one matching dialog ( when there should only be one) delete them all
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: 3.3 Commit: 0d1af7d98cd4053b839556cfa07c9f71874fd02e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d1af7d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 12:59:08 2012 +0100 modules_k/pua_db: If PUA finds more than one matching dialog (when there should only be one) delete them all - A timing difference on multiple-servers can sometimes cause this, and (if it happens, it doesn't when the clocks are synced) you can end up with the same error coming out lots because the DB is not cleaned up. (cherry picked from commit 20475258957cbf3183e5e771e9fd41dc69336096) --- modules_k/pua/pua_db.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 05dd1e3..f42b480 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -614,6 +614,8 @@ int convert_temporary_dialog_puadb(ua_pres_t *pres) query_vals[n_query_cols].val.str_val.len = 0; n_query_cols++; + + if (pua_dbf.replace != NULL) { if (pua_dbf.replace(pua_db, query_cols, query_vals, n_query_cols, @@ -1210,11 +1212,14 @@ ua_pres_t *get_dialog_puadb(str pres_id, str *pres_uri, ua_pres_t *result, db1_r pua_dbf.free_result(pua_db, res); return(NULL); } - - if (nr_rows != 1) + else if (nr_rows > 1) { - LM_ERR("Too many rows found (%d)\n", nr_rows); + LM_ERR("Too many rows found (%d)... deleting\n", nr_rows); pua_dbf.free_result(pua_db, res); + + if (pua_dbf.delete(pua_db, q_cols, 0, q_vals, n_query_cols) < 0) + LM_ERR("deleting record(s)\n"); + return(NULL); }

1 0

git:3.3: modules_k/pua: Fixed incorrect check/use of update_period modparam
by Peter Dunkley 11 Sep '12

11 Sep '12

Module: sip-router Branch: 3.3 Commit: 64f64efb49782bb74080193863ac2d4775816add URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64f64ef… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 12:58:13 2012 +0100 modules_k/pua: Fixed incorrect check/use of update_period modparam (cherry picked from commit ef7d43fc614276b75c560660c7e4368fd18d574d) --- modules_k/pua/pua.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index b72f9e1..2297219 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -268,8 +268,13 @@ static int mod_init(void) startup_time = (int) time(NULL); - if (update_period > 0) /* probably should check > 5 here!! -croc */ + if (update_period > 5) register_timer(hashT_clean, 0, update_period- 5); + else if (update_period != 0) + { + LM_ERR("update_period must be 0 or > 5\n"); + return -1; + } if (dbmode != PUA_DB_ONLY) {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
18
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 2012