kamctl: regenerated db schema - updates to sip_trace and presentity

utils/kamctl/db_berkeley/kamailio/presentity

@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) username(str) domain(str) event(str) etag(str) expires(int) received_time(int) body(str) sender(str)
+id(int) username(str) domain(str) event(str) etag(str) expires(int) received_time(int) body(str) sender(str) priority(int)
 METADATA_KEY
 1 2 3 
 METADATA_READONLY
@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL
+NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0

utils/kamctl/db_berkeley/kamailio/sip_trace

@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) time_stamp(datetime) time_us(int) callid(str) traced_user(str) msg(str) method(str) status(str) fromip(str) toip(str) fromtag(str) direction(str)
+id(int) time_stamp(datetime) time_us(int) callid(str) traced_user(str) msg(str) method(str) status(str) fromip(str) toip(str) fromtag(str) totag(str) direction(str)
 METADATA_KEY
 3 
 METADATA_READONLY
@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|'1900-01-01 00:00:01'|0|''|''|NIL|''|''|''|''|''|''
+NIL|'1900-01-01 00:00:01'|0|''|''|NIL|''|''|''|''|''|''|''

utils/kamctl/db_berkeley/kamailio/version

@@ -89,7 +89,7 @@ pdt|1
 pl_pipes|
 pl_pipes|1
 presentity|
-presentity|3
+presentity|4
 pua|
 pua|7
 purplemap|
@@ -107,7 +107,7 @@ sca_subscriptions|1
 silo|
 silo|7
 sip_trace|
-sip_trace|3
+sip_trace|4
 speed_dial|
 speed_dial|2
 subscriber|

utils/kamctl/db_sqlite/presence-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('presentity','3');
+INSERT INTO version (table_name, table_version) values ('presentity','4');
 CREATE TABLE presentity (
     id INTEGER PRIMARY KEY NOT NULL,
     username VARCHAR(64) NOT NULL,
@@ -9,6 +9,7 @@ CREATE TABLE presentity (
     received_time INTEGER NOT NULL,
     body BLOB NOT NULL,
     sender VARCHAR(128) NOT NULL,
+    priority INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag)
 );
 

utils/kamctl/db_sqlite/siptrace-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('sip_trace','3');
+INSERT INTO version (table_name, table_version) values ('sip_trace','4');
 CREATE TABLE sip_trace (
     id INTEGER PRIMARY KEY NOT NULL,
     time_stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL,
@@ -11,6 +11,7 @@ CREATE TABLE sip_trace (
     fromip VARCHAR(50) DEFAULT '' NOT NULL,
     toip VARCHAR(50) DEFAULT '' NOT NULL,
     fromtag VARCHAR(64) DEFAULT '' NOT NULL,
+    totag VARCHAR(64) DEFAULT '' NOT NULL,
     direction VARCHAR(4) DEFAULT '' NOT NULL
 );
 

utils/kamctl/dbtext/kamailio/dialplan

@@ -1 +1 @@
-id(int,auto) dpid(int) pr(int) match_op(int) match_exp(string) match_len(int) subst_exp(string,null) repl_exp(string,null) attrs(string,null) 
+id(int,auto) dpid(int) pr(int) match_op(int) match_exp(string) match_len(int) subst_exp(string) repl_exp(string) attrs(string) 

utils/kamctl/dbtext/kamailio/presentity

@@ -1 +1 @@
-id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(string) sender(string) 
+id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(string) sender(string) priority(int) 

utils/kamctl/dbtext/kamailio/sip_trace

@@ -1 +1 @@
-id(int,auto) time_stamp(int) time_us(int) callid(string) traced_user(string) msg(string) method(string) status(string) fromip(string) toip(string) fromtag(string) direction(string) 
+id(int,auto) time_stamp(int) time_us(int) callid(string) traced_user(string) msg(string) method(string) status(string) fromip(string) toip(string) fromtag(string) totag(string) direction(string) 

utils/kamctl/dbtext/kamailio/subscriber

@@ -1 +1 @@
-id(int,auto) username(string) domain(string) password(string) email_address(string,null) ha1(string,null) ha1b(string,null) rpid(string,null) 
+id(int,auto) username(string) domain(string) password(string) email_address(string) ha1(string) ha1b(string) rpid(string,null) 

utils/kamctl/dbtext/kamailio/version

@@ -39,7 +39,7 @@ mtree:1
 mtrees:2
 pdt:1
 pl_pipes:1
-presentity:3
+presentity:4
 pua:7
 purplemap:1
 re_grp:1
@@ -48,7 +48,7 @@ rls_watchers:3
 rtpproxy:1
 sca_subscriptions:1
 silo:7
-sip_trace:3
+sip_trace:4
 speed_dial:2
 subscriber:6
 trusted:5

utils/kamctl/mysql/presence-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('presentity','3');
+INSERT INTO version (table_name, table_version) values ('presentity','4');
 CREATE TABLE presentity (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     username VARCHAR(64) NOT NULL,
@@ -9,6 +9,7 @@ CREATE TABLE presentity (
     received_time INT(11) NOT NULL,
     body BLOB NOT NULL,
     sender VARCHAR(128) NOT NULL,
+    priority INT(11) DEFAULT 0 NOT NULL,
     CONSTRAINT presentity_idx UNIQUE (username, domain, event, etag)
 );
 

utils/kamctl/mysql/siptrace-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('sip_trace','3');
+INSERT INTO version (table_name, table_version) values ('sip_trace','4');
 CREATE TABLE sip_trace (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     time_stamp DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
@@ -11,6 +11,7 @@ CREATE TABLE sip_trace (
     fromip VARCHAR(50) DEFAULT '' NOT NULL,
     toip VARCHAR(50) DEFAULT '' NOT NULL,
     fromtag VARCHAR(64) DEFAULT '' NOT NULL,
+    totag VARCHAR(64) DEFAULT '' NOT NULL,
     direction VARCHAR(4) DEFAULT '' NOT NULL
 );
 

utils/kamctl/oracle/presence-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('presentity','3');
+INSERT INTO version (table_name, table_version) values ('presentity','4');
 CREATE TABLE presentity (
     id NUMBER(10) PRIMARY KEY,
     username VARCHAR2(64),
@@ -9,6 +9,7 @@ CREATE TABLE presentity (
     received_time NUMBER(10),
     body BLOB,
     sender VARCHAR2(128),
+    priority NUMBER(10) DEFAULT 0 NOT NULL,
     CONSTRAINT presentity_presentity_idx  UNIQUE (username, domain, event, etag)
 );
 

utils/kamctl/oracle/siptrace-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('sip_trace','3');
+INSERT INTO version (table_name, table_version) values ('sip_trace','4');
 CREATE TABLE sip_trace (
     id NUMBER(10) PRIMARY KEY,
     time_stamp DATE DEFAULT to_date('1900-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss'),
@@ -11,6 +11,7 @@ CREATE TABLE sip_trace (
     fromip VARCHAR2(50) DEFAULT '',
     toip VARCHAR2(50) DEFAULT '',
     fromtag VARCHAR2(64) DEFAULT '',
+    totag VARCHAR2(64) DEFAULT '',
     direction VARCHAR2(4) DEFAULT ''
 );
 

utils/kamctl/postgres/presence-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('presentity','3');
+INSERT INTO version (table_name, table_version) values ('presentity','4');
 CREATE TABLE presentity (
     id SERIAL PRIMARY KEY NOT NULL,
     username VARCHAR(64) NOT NULL,
@@ -9,6 +9,7 @@ CREATE TABLE presentity (
     received_time INTEGER NOT NULL,
     body BYTEA NOT NULL,
     sender VARCHAR(128) NOT NULL,
+    priority INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag)
 );
 

utils/kamctl/postgres/siptrace-create.sql

@@ -1,4 +1,4 @@
-INSERT INTO version (table_name, table_version) values ('sip_trace','3');
+INSERT INTO version (table_name, table_version) values ('sip_trace','4');
 CREATE TABLE sip_trace (
     id SERIAL PRIMARY KEY NOT NULL,
     time_stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL,
@@ -11,6 +11,7 @@ CREATE TABLE sip_trace (
     fromip VARCHAR(50) DEFAULT '' NOT NULL,
     toip VARCHAR(50) DEFAULT '' NOT NULL,
     fromtag VARCHAR(64) DEFAULT '' NOT NULL,
+    totag VARCHAR(64) DEFAULT '' NOT NULL,
     direction VARCHAR(4) DEFAULT '' NOT NULL
 );
 

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -503,6 +503,7 @@
 		<column><field>received_time</field><type>DB1_INT</type></column>
 		<column><field>body</field><type>DB1_BLOB</type></column>
 		<column><field>sender</field><type>DB1_STR</type></column>
+		<column><field>priority</field><type>DB1_INT</type></column>
 	</db_table>
 	<!-- Declaration of active_watchers table-->
 	<db_table id="active_watchers">
@@ -706,6 +707,7 @@
 		<column><field>fromip</field><type>DB1_STR</type></column>
 		<column><field>toip</field><type>DB1_STR</type></column>
 		<column><field>fromtag</field><type>DB1_STR</type></column>
+		<column><field>totag</field><type>DB1_STR</type></column>
 		<column><field>direction</field><type>DB1_STR</type></column>
 	</db_table>
 	<!-- Declaration of speed_dial table-->
@@ -2871,6 +2873,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -2885,6 +2888,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -2902,6 +2906,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>
@@ -3630,6 +3635,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>
@@ -3647,6 +3653,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>
@@ -3667,6 +3674,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>

utils/kamctl/xhttp_pi/presence-mod

@@ -13,6 +13,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -27,6 +28,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -44,6 +46,7 @@
 				<col><field>received_time</field></col>
 				<col><field>body</field></col>
 				<col><field>sender</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/presence-table

@@ -11,6 +11,7 @@
 		<column><field>received_time</field><type>DB1_INT</type></column>
 		<column><field>body</field><type>DB1_BLOB</type></column>
 		<column><field>sender</field><type>DB1_STR</type></column>
+		<column><field>priority</field><type>DB1_INT</type></column>
 	</db_table>
 	<!-- Declaration of active_watchers table-->
 	<db_table id="active_watchers">

utils/kamctl/xhttp_pi/siptrace-mod

@@ -15,6 +15,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>
@@ -32,6 +33,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>
@@ -52,6 +54,7 @@
 				<col><field>fromip</field></col>
 				<col><field>toip</field></col>
 				<col><field>fromtag</field></col>
+				<col><field>totag</field></col>
 				<col><field>direction</field></col>
 			</query_cols>
 		</cmd>

utils/kamctl/xhttp_pi/siptrace-table

@@ -13,5 +13,6 @@
 		<column><field>fromip</field><type>DB1_STR</type></column>
 		<column><field>toip</field><type>DB1_STR</type></column>
 		<column><field>fromtag</field><type>DB1_STR</type></column>
+		<column><field>totag</field><type>DB1_STR</type></column>
 		<column><field>direction</field><type>DB1_STR</type></column>
 	</db_table>