sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:a786c3f4: kamctl: get aliases table db scripts up to date

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a786c3f4a108f7df94cb555ee25444227c7e5c3b URL: https://github.com/kamailio/kamailio/commit/a786c3f4a108f7df94cb555ee254442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:55:44+02:00 kamctl: get aliases table db scripts up to date --- Modified: utils/kamctl/db_berkeley/kamailio/aliases Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/registrar-create.sql Modified: utils/kamctl/dbtext/kamailio/aliases Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/registrar-create.sql Modified: utils/kamctl/oracle/registrar-create.sql Modified: utils/kamctl/postgres/registrar-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/registrar-table --- Diff: https://github.com/kamailio/kamailio/commit/a786c3f4a108f7df94cb555ee254442… Patch: https://github.com/kamailio/kamailio/commit/a786c3f4a108f7df94cb555ee254442…

9 years, 6 months

git:master:7046d224: lib/srdb1: aliases table needs to be same structure as location

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7046d22486b80fe7f9facf2facc844fd0c0267d7 URL: https://github.com/kamailio/kamailio/commit/7046d22486b80fe7f9facf2facc844f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:54:29+02:00 lib/srdb1: aliases table needs to be same structure as location --- Modified: lib/srdb1/schema/aliases.xml --- Diff: https://github.com/kamailio/kamailio/commit/7046d22486b80fe7f9facf2facc844f… Patch: https://github.com/kamailio/kamailio/commit/7046d22486b80fe7f9facf2facc844f… --- diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 5f135b9..449ca60 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>6</version> + <version>8</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. @@ -35,23 +35,23 @@ <natural/> </column> - <column id="username"> + <column id="username"> <name>&USERCOL;</name> <type>string</type> <size>&user_len;</size> <default/> + <description>Username / phone number </description> <natural/> - <description>Alias Username / Phone Number </description> </column> <column id="domain"> <name>domain</name> <type>string</type> <size>&domain_len;</size> - <null/> - <default><null/></default> - <natural/> + <null/> + <default><null/></default> <description>Domain name</description> + <natural/> </column> <column id="contact"> @@ -74,13 +74,13 @@ <column> <name>path</name> <type>string</type> - <size>&uri_len;</size> + <size>&long_hf_len;</size> <null/> <default><null/></default> <description>Path Header(s) per RFC 3327</description> </column> - <column> + <column id="expires"> <name>expires</name> <type>datetime</type> <default>&DEFAULT_ALIASES_EXPIRES;</default> @@ -125,7 +125,7 @@ <type>int</type> <size>&flag_len;</size> <default>0</default> - <description>Flags</description> + <description>Internal flags</description> </column> <column> @@ -133,7 +133,7 @@ <type>int</type> <size>&flag_len;</size> <default>0</default> - <description>CFlags</description> + <description>Branch and contact flags</description> </column> <column> @@ -179,9 +179,42 @@ <description>The value of reg-id contact parameter</description> </column> + <column> + <name>server_id</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value of server_id from configuration file</description> + </column> + + <column> + <name>connection_id</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value of connection id for location record</description> + </column> + + <column> + <name>keepalive</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value to control sending keep alive requests</description> + </column> + - <index> - <name>alias_idx</name> + <column> + <name>partition</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value to of the partition for keep alive requests</description> + </column> + + + <index> + <name>account_contact_idx</name> <colref linkend="username"/> <colref linkend="domain"/> <colref linkend="contact"/> @@ -191,5 +224,9 @@ <colref linkend="ruid"/> <unique/> </index> + <index> + <name>expires_idx</name> + <colref linkend="expires"/> + </index> </table>

9 years, 6 months

git:master:70727c69: kamctl: regenerated db creation scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70727c69b950d2e8e6fc56c4aee868d35a9e3a70 URL: https://github.com/kamailio/kamailio/commit/70727c69b950d2e8e6fc56c4aee868d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:42:06+02:00 kamctl: regenerated db creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/70727c69b950d2e8e6fc56c4aee868d… Patch: https://github.com/kamailio/kamailio/commit/70727c69b950d2e8e6fc56c4aee868d… --- diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 3957a76..d4bd56c 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -69,7 +69,7 @@ lcr_rule|2 lcr_rule_target| lcr_rule_target|1 location| -location|7 +location|8 location_attrs| location_attrs|1 matrix| diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index b9920ec..cc3a378 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','7'); +INSERT INTO version (table_name, table_version) values ('location','8'); 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 b57cb6b..d82c69b 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -29,7 +29,7 @@ imc_rooms:1 lcr_gw:3 lcr_rule:2 lcr_rule_target:1 -location:7 +location:8 location_attrs:1 matrix:1 missed_calls:4 diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 4d96bde..7cf9918 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','7'); +INSERT INTO version (table_name, table_version) values ('location','8'); 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/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 04a5179..c2d0b99 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','7'); +INSERT INTO version (table_name, table_version) values ('location','8'); CREATE TABLE location ( id NUMBER(10) PRIMARY KEY, ruid VARCHAR2(64) DEFAULT '', diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index ea9ace3..cd096b2 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','7'); +INSERT INTO version (table_name, table_version) values ('location','8'); CREATE TABLE location ( id SERIAL PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL,

9 years, 6 months

git:master:762d3309: usrloc: table version for location set to 8

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 762d3309e42e8b9fb56e764c57153535f58dd82d URL: https://github.com/kamailio/kamailio/commit/762d3309e42e8b9fb56e764c5715353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:44:20+02:00 usrloc: table version for location set to 8 --- Modified: modules/usrloc/ul_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/762d3309e42e8b9fb56e764c5715353… Patch: https://github.com/kamailio/kamailio/commit/762d3309e42e8b9fb56e764c5715353… --- diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index 7dd28c7..1e3b08d 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -39,7 +39,7 @@ */ -#define UL_TABLE_VERSION 7 +#define UL_TABLE_VERSION 8 extern str ruid_col; extern str user_col;

9 years, 6 months

git:master:b01d40e8: lib/srdb1: location table version set to 8 in sql schema

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b01d40e86300aa45e147e2526cbe3f43115725e3 URL: https://github.com/kamailio/kamailio/commit/b01d40e86300aa45e147e2526cbe3f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:41:42+02:00 lib/srdb1: location table version set to 8 in sql schema --- Modified: lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/b01d40e86300aa45e147e2526cbe3f4… Patch: https://github.com/kamailio/kamailio/commit/b01d40e86300aa45e147e2526cbe3f4… --- diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index decd95f..698fcc0 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>7</version> + <version>8</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

9 years, 6 months

git:master:5d298d69: kamctl: regenerated db schema for location table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d298d69cbb24a6d099418b2ad6f3e980be6d017 URL: https://github.com/kamailio/kamailio/commit/5d298d69cbb24a6d099418b2ad6f3e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:39:15+02:00 kamctl: regenerated db schema for location table --- Modified: utils/kamctl/db_berkeley/kamailio/location Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/dbtext/kamailio/location Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/usrloc-mod Modified: utils/kamctl/xhttp_pi/usrloc-table --- Diff: https://github.com/kamailio/kamailio/commit/5d298d69cbb24a6d099418b2ad6f3e9… Patch: https://github.com/kamailio/kamailio/commit/5d298d69cbb24a6d099418b2ad6f3e9…

9 years, 6 months

git:master:3f45175d: nathelper: set the max partition for keepalives in usrloc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f45175dec711f1ece8b377469054a3dbd7cc72c URL: https://github.com/kamailio/kamailio/commit/3f45175dec711f1ece8b377469054a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:39:15+02:00 nathelper: set the max partition for keepalives in usrloc - used to distribute registration records for db only mode in usrloc --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3f45175dec711f1ece8b377469054a3… Patch: https://github.com/kamailio/kamailio/commit/3f45175dec711f1ece8b377469054a3… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 81d2cac..14880a7 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -675,6 +675,7 @@ mod_init(void) LM_ERR("bad config - natping_processes must be >= 0\n"); return -1; } + ul.set_max_partition(natping_processes*natping_interval); sipping_flag = (sipping_flag==-1)?0:(1<<sipping_flag); natping_disable_flag = (natping_disable_flag==-1)?0:(1<<natping_disable_flag);

9 years, 6 months

git:master:8f8d4f5d: usrloc: fetching of records for nat keepalives in db only is done using partion column

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f8d4f5d8c4e492f3864cb82bb898d6a82605005 URL: https://github.com/kamailio/kamailio/commit/8f8d4f5d8c4e492f3864cb82bb898d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:39:15+02:00 usrloc: fetching of records for nat keepalives in db only is done using partion column - don't use the module over auto incremented column, not being common to all db engines --- Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/ucontact.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/usrloc.c Modified: modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/8f8d4f5d8c4e492f3864cb82bb898d6… Patch: https://github.com/kamailio/kamailio/commit/8f8d4f5d8c4e492f3864cb82bb898d6…

9 years, 6 months

git:master:65651271: srdb1: added partition column for location table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65651271cadd5499f8469b77d4d4ad38fa6867e8 URL: https://github.com/kamailio/kamailio/commit/65651271cadd5499f8469b77d4d4ad3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:39:15+02:00 srdb1: added partition column for location table - to be used for db-only nat keepalives distribution --- Modified: lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/65651271cadd5499f8469b77d4d4ad3… Patch: https://github.com/kamailio/kamailio/commit/65651271cadd5499f8469b77d4d4ad3… --- diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index a39cd52..decd95f 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -204,6 +204,15 @@ </column> + <column> + <name>partition</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value to of the partition for keep alive requests</description> + </column> + + <index> <name>account_contact_idx</name> <colref linkend="username"/>

9 years, 6 months

git:master:39112fce: Merge pull request #153 from sn4kebite/pv-vn-fix

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 39112fce88d53e842a261d87b7d0d323b00d3dd7 URL: https://github.com/kamailio/kamailio/commit/39112fce88d53e842a261d87b7d0d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-08T09:29:41+02:00 Merge pull request #153 from sn4kebite/pv-vn-fix pv: Fixed assigning $null to $vn(name) pvs --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/39112fce88d53e842a261d87b7d0d32… Patch: https://github.com/kamailio/kamailio/commit/39112fce88d53e842a261d87b7d0d32… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index a4eab9a..9cbad39 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1968,8 +1968,13 @@ int pv_set_scriptvar(struct sip_msg* msg, pv_param_t *param, } if((val==NULL) || (val->flags&PV_VAL_NULL)) { - avp_val.n = 0; - set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0); + if(((script_var_t*)param->pvn.u.dname)->v.flags&VAR_TYPE_NULL) + { + set_var_value((script_var_t*)param->pvn.u.dname, NULL, 0); + } else { + avp_val.n = 0; + set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0); + } return 0; } flags = 0;

9 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015