kamctl: updated scripts for topos db

utils/kamctl/db_berkeley/kamailio/topos_d

@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) a_tag(str) b_tag(str) a_rr(str) b_rr(str) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcip(str) b_srcip(str)
+id(int) rectime(datetime) s_method(str) s_cseq(int) a_callid(str) a_uuid(str) b_uuid(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) a_tag(str) b_tag(str) a_rr(str) b_rr(str) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcip(str) b_srcip(str)
 METADATA_KEY
-2 3 4 
+4 5 6 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|''
+NIL|NIL|''|0|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|''

utils/kamctl/db_berkeley/kamailio/topos_t

@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) x_uri(str) x_tag(str)
+id(int) rectime(datetime) s_method(str) s_cseq(int) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) x_uri(str) x_tag(str)
 METADATA_KEY
-2 3 4 5 7 
+4 5 6 7 9 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|0|''|''|''|''|''
+NIL|NIL|''|0|''|''|''|0|''|''|''|''|''

utils/kamctl/db_sqlite/topos-create.sql

@@ -1,6 +1,8 @@
 CREATE TABLE topos_d (
     id INTEGER PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    s_method VARCHAR(64) DEFAULT '' NOT NULL,
+    s_cseq INTEGER DEFAULT 0 NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1');
 CREATE TABLE topos_t (
     id INTEGER PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    s_method VARCHAR(64) DEFAULT '' NOT NULL,
+    s_cseq INTEGER DEFAULT 0 NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,

utils/kamctl/dbtext/kamailio/topos_d

@@ -1 +1 @@
-id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string) b_rr(string) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcip(string) b_srcip(string) 
+id(int,auto) rectime(int) s_method(string) s_cseq(int) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string) b_rr(string) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcip(string) b_srcip(string) 

utils/kamctl/dbtext/kamailio/topos_t

@@ -1 +1 @@
-id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) x_uri(string) x_tag(string) 
+id(int,auto) rectime(int) s_method(string) s_cseq(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) x_uri(string) x_tag(string) 

utils/kamctl/mysql/topos-create.sql

@@ -1,6 +1,8 @@
 CREATE TABLE `topos_d` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `rectime` DATETIME NOT NULL,
+    `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
+    `s_cseq` INT UNSIGNED DEFAULT 0 NOT NULL,
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
     `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
@@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1');
 CREATE TABLE `topos_t` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `rectime` DATETIME NOT NULL,
+    `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
+    `s_cseq` INT UNSIGNED DEFAULT 0 NOT NULL,
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
     `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL,

utils/kamctl/oracle/topos-create.sql

@@ -1,6 +1,8 @@
 CREATE TABLE topos_d (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
+    s_method VARCHAR2(64) DEFAULT '',
+    s_cseq NUMBER(10) DEFAULT 0 NOT NULL,
     a_callid VARCHAR2(255) DEFAULT '',
     a_uuid VARCHAR2(255) DEFAULT '',
     b_uuid VARCHAR2(255) DEFAULT '',
@@ -36,6 +38,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1');
 CREATE TABLE topos_t (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
+    s_method VARCHAR2(64) DEFAULT '',
+    s_cseq NUMBER(10) DEFAULT 0 NOT NULL,
     a_callid VARCHAR2(255) DEFAULT '',
     a_uuid VARCHAR2(255) DEFAULT '',
     b_uuid VARCHAR2(255) DEFAULT '',

utils/kamctl/postgres/topos-create.sql

@@ -1,6 +1,8 @@
 CREATE TABLE topos_d (
     id SERIAL PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    s_method VARCHAR(64) DEFAULT '' NOT NULL,
+    s_cseq INTEGER DEFAULT 0 NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
@@ -28,6 +30,8 @@ INSERT INTO version (table_name, table_version) values ('topos_d','1');
 CREATE TABLE topos_t (
     id SERIAL PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    s_method VARCHAR(64) DEFAULT '' NOT NULL,
+    s_cseq INTEGER DEFAULT 0 NOT NULL,
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -754,6 +754,8 @@
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
+		<column><field>s_method</field><type>DB1_STR</type></column>
+		<column><field>s_cseq</field><type>DB1_INT</type></column>
 		<column><field>a_callid</field><type>DB1_STR</type></column>
 		<column><field>a_uuid</field><type>DB1_STR</type></column>
 		<column><field>b_uuid</field><type>DB1_STR</type></column>
@@ -778,6 +780,8 @@
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
+		<column><field>s_method</field><type>DB1_STR</type></column>
+		<column><field>s_cseq</field><type>DB1_INT</type></column>
 		<column><field>a_callid</field><type>DB1_STR</type></column>
 		<column><field>a_uuid</field><type>DB1_STR</type></column>
 		<column><field>b_uuid</field><type>DB1_STR</type></column>
@@ -3879,6 +3883,8 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -3903,6 +3909,8 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -3930,6 +3938,8 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -3965,6 +3975,8 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -3981,6 +3993,8 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -4000,6 +4014,8 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>

utils/kamctl/xhttp_pi/topos-mod

@@ -6,6 +6,8 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -30,6 +32,8 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -57,6 +61,8 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -92,6 +98,8 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -108,6 +116,8 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
@@ -127,6 +137,8 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
+				<col><field>s_method</field></col>
+				<col><field>s_cseq</field></col>
 				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>

utils/kamctl/xhttp_pi/topos-table

@@ -4,6 +4,8 @@
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
+		<column><field>s_method</field><type>DB1_STR</type></column>
+		<column><field>s_cseq</field><type>DB1_INT</type></column>
 		<column><field>a_callid</field><type>DB1_STR</type></column>
 		<column><field>a_uuid</field><type>DB1_STR</type></column>
 		<column><field>b_uuid</field><type>DB1_STR</type></column>
@@ -28,6 +30,8 @@
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
+		<column><field>s_method</field><type>DB1_STR</type></column>
+		<column><field>s_cseq</field><type>DB1_INT</type></column>
 		<column><field>a_callid</field><type>DB1_STR</type></column>
 		<column><field>a_uuid</field><type>DB1_STR</type></column>
 		<column><field>b_uuid</field><type>DB1_STR</type></column>