kamctl: refreshed db creation scripts

utils/kamctl/db_berkeley/kamailio/topos_d

@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) callid(str) a_uuid(str) b_uuid(str) a_contact(str) b_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) 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 
 METADATA_READONLY
@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|''|''|NIL|NIL|NIL|NIL|0|NIL|NIL|NIL|''|''
+NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|''

utils/kamctl/db_berkeley/kamailio/topos_t

@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str)
+id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_tag(str)
 METADATA_KEY
 2 3 4 5 
 METADATA_READONLY
@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|0|NIL
+NIL|NIL|''|''|''|0|''|''

utils/kamctl/db_sqlite/topos-create.sql

@@ -1,40 +1,43 @@
 CREATE TABLE topos_d (
     id INTEGER PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
+    a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     a_contact VARCHAR(128) DEFAULT '' NOT NULL,
     b_contact VARCHAR(128) DEFAULT '' NOT NULL,
-    a_tag VARCHAR(64) NOT NULL,
-    b_tag VARCHAR(64) NOT NULL,
-    a_rr TEXT NOT NULL,
-    b_rr TEXT NOT NULL,
+    as_contact VARCHAR(128) DEFAULT '' NOT NULL,
+    bs_contact VARCHAR(128) DEFAULT '' NOT NULL,
+    a_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    b_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    a_rr TEXT DEFAULT '' NOT NULL,
+    b_rr TEXT DEFAULT '' NOT NULL,
     iflags INTEGER DEFAULT 0 NOT NULL,
-    a_uri VARCHAR(128) NOT NULL,
-    b_uri VARCHAR(128) NOT NULL,
-    r_uri VARCHAR(128) NOT NULL,
+    a_uri VARCHAR(128) DEFAULT '' NOT NULL,
+    b_uri VARCHAR(128) DEFAULT '' NOT NULL,
+    r_uri VARCHAR(128) DEFAULT '' NOT NULL,
     a_srcip VARCHAR(50) DEFAULT '' NOT NULL,
     b_srcip VARCHAR(50) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_d_rectime_idx ON topos_d (rectime);
-CREATE INDEX topos_d_a_callid_idx ON topos_d (callid);
+CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
 
 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,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
+    a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     direction INTEGER DEFAULT 0 NOT NULL,
-    x_via TEXT NOT NULL
+    x_via TEXT DEFAULT '' NOT NULL,
+    x_tag VARCHAR(64) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_t_rectime_idx ON topos_t (rectime);
-CREATE INDEX topos_t_a_callid_idx ON topos_t (callid);
+CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
 
 INSERT INTO version (table_name, table_version) values ('topos_t','1');
 

utils/kamctl/dbtext/kamailio/topos_d

@@ -1 +1 @@
-id(int,auto) rectime(int) callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_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) 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) callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) 
+id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_tag(string) 

utils/kamctl/mysql/topos-create.sql

@@ -1,40 +1,43 @@
 CREATE TABLE `topos_d` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `rectime` DATETIME NOT NULL,
-    `callid` VARCHAR(255) DEFAULT '' NOT NULL,
+    `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
     `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `a_contact` VARCHAR(128) DEFAULT '' NOT NULL,
     `b_contact` VARCHAR(128) DEFAULT '' NOT NULL,
-    `a_tag` VARCHAR(64) NOT NULL,
-    `b_tag` VARCHAR(64) NOT NULL,
-    `a_rr` MEDIUMTEXT NOT NULL,
-    `b_rr` MEDIUMTEXT NOT NULL,
+    `as_contact` VARCHAR(128) DEFAULT '' NOT NULL,
+    `bs_contact` VARCHAR(128) DEFAULT '' NOT NULL,
+    `a_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `b_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `a_rr` MEDIUMTEXT DEFAULT '' NOT NULL,
+    `b_rr` MEDIUMTEXT DEFAULT '' NOT NULL,
     `iflags` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    `a_uri` VARCHAR(128) NOT NULL,
-    `b_uri` VARCHAR(128) NOT NULL,
-    `r_uri` VARCHAR(128) NOT NULL,
+    `a_uri` VARCHAR(128) DEFAULT '' NOT NULL,
+    `b_uri` VARCHAR(128) DEFAULT '' NOT NULL,
+    `r_uri` VARCHAR(128) DEFAULT '' NOT NULL,
     `a_srcip` VARCHAR(50) DEFAULT '' NOT NULL,
     `b_srcip` VARCHAR(50) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX rectime_idx ON topos_d (`rectime`);
-CREATE INDEX a_callid_idx ON topos_d (`callid`);
+CREATE INDEX a_callid_idx ON topos_d (`a_callid`);
 
 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,
-    `callid` VARCHAR(255) DEFAULT '' NOT NULL,
+    `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
     `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `direction` INT DEFAULT 0 NOT NULL,
-    `x_via` MEDIUMTEXT NOT NULL
+    `x_via` MEDIUMTEXT DEFAULT '' NOT NULL,
+    `x_tag` VARCHAR(64) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX rectime_idx ON topos_t (`rectime`);
-CREATE INDEX a_callid_idx ON topos_t (`callid`);
+CREATE INDEX a_callid_idx ON topos_t (`a_callid`);
 
 INSERT INTO version (table_name, table_version) values ('topos_t','1');
 

utils/kamctl/oracle/topos-create.sql

@@ -1,19 +1,21 @@
 CREATE TABLE topos_d (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
-    callid VARCHAR2(255) DEFAULT '',
+    a_callid VARCHAR2(255) DEFAULT '',
     a_uuid VARCHAR2(255) DEFAULT '',
     b_uuid VARCHAR2(255) DEFAULT '',
     a_contact VARCHAR2(128) DEFAULT '',
     b_contact VARCHAR2(128) DEFAULT '',
-    a_tag VARCHAR2(64),
-    b_tag VARCHAR2(64),
-    a_rr CLOB,
-    b_rr CLOB,
+    as_contact VARCHAR2(128) DEFAULT '',
+    bs_contact VARCHAR2(128) DEFAULT '',
+    a_tag VARCHAR2(64) DEFAULT '',
+    b_tag VARCHAR2(64) DEFAULT '',
+    a_rr CLOB DEFAULT '',
+    b_rr CLOB DEFAULT '',
     iflags NUMBER(10) DEFAULT 0 NOT NULL,
-    a_uri VARCHAR2(128),
-    b_uri VARCHAR2(128),
-    r_uri VARCHAR2(128),
+    a_uri VARCHAR2(128) DEFAULT '',
+    b_uri VARCHAR2(128) DEFAULT '',
+    r_uri VARCHAR2(128) DEFAULT '',
     a_srcip VARCHAR2(50) DEFAULT '',
     b_srcip VARCHAR2(50) DEFAULT ''
 );
@@ -27,18 +29,19 @@ END topos_d_tr;
 BEGIN map2users('topos_d'); END;
 /
 CREATE INDEX topos_d_rectime_idx  ON topos_d (rectime);
-CREATE INDEX topos_d_a_callid_idx  ON topos_d (callid);
+CREATE INDEX topos_d_a_callid_idx  ON topos_d (a_callid);
 
 INSERT INTO version (table_name, table_version) values ('topos_d','1');
 
 CREATE TABLE topos_t (
     id NUMBER(10) PRIMARY KEY,
     rectime DATE,
-    callid VARCHAR2(255) DEFAULT '',
+    a_callid VARCHAR2(255) DEFAULT '',
     a_uuid VARCHAR2(255) DEFAULT '',
     b_uuid VARCHAR2(255) DEFAULT '',
     direction NUMBER(10) DEFAULT 0 NOT NULL,
-    x_via CLOB
+    x_via CLOB DEFAULT '',
+    x_tag VARCHAR2(64) DEFAULT ''
 );
 
 CREATE OR REPLACE TRIGGER topos_t_tr
@@ -50,7 +53,7 @@ END topos_t_tr;
 BEGIN map2users('topos_t'); END;
 /
 CREATE INDEX topos_t_rectime_idx  ON topos_t (rectime);
-CREATE INDEX topos_t_a_callid_idx  ON topos_t (callid);
+CREATE INDEX topos_t_a_callid_idx  ON topos_t (a_callid);
 
 INSERT INTO version (table_name, table_version) values ('topos_t','1');
 

utils/kamctl/postgres/topos-create.sql

@@ -1,40 +1,43 @@
 CREATE TABLE topos_d (
     id SERIAL PRIMARY KEY NOT NULL,
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
+    a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     a_contact VARCHAR(128) DEFAULT '' NOT NULL,
     b_contact VARCHAR(128) DEFAULT '' NOT NULL,
-    a_tag VARCHAR(64) NOT NULL,
-    b_tag VARCHAR(64) NOT NULL,
-    a_rr TEXT NOT NULL,
-    b_rr TEXT NOT NULL,
+    as_contact VARCHAR(128) DEFAULT '' NOT NULL,
+    bs_contact VARCHAR(128) DEFAULT '' NOT NULL,
+    a_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    b_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    a_rr TEXT DEFAULT '' NOT NULL,
+    b_rr TEXT DEFAULT '' NOT NULL,
     iflags INTEGER DEFAULT 0 NOT NULL,
-    a_uri VARCHAR(128) NOT NULL,
-    b_uri VARCHAR(128) NOT NULL,
-    r_uri VARCHAR(128) NOT NULL,
+    a_uri VARCHAR(128) DEFAULT '' NOT NULL,
+    b_uri VARCHAR(128) DEFAULT '' NOT NULL,
+    r_uri VARCHAR(128) DEFAULT '' NOT NULL,
     a_srcip VARCHAR(50) DEFAULT '' NOT NULL,
     b_srcip VARCHAR(50) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_d_rectime_idx ON topos_d (rectime);
-CREATE INDEX topos_d_a_callid_idx ON topos_d (callid);
+CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
 
 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,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
+    a_callid VARCHAR(255) DEFAULT '' NOT NULL,
     a_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     direction INTEGER DEFAULT 0 NOT NULL,
-    x_via TEXT NOT NULL
+    x_via TEXT DEFAULT '' NOT NULL,
+    x_tag VARCHAR(64) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_t_rectime_idx ON topos_t (rectime);
-CREATE INDEX topos_t_a_callid_idx ON topos_t (callid);
+CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
 
 INSERT INTO version (table_name, table_version) values ('topos_t','1');
 

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -752,11 +752,13 @@
 		<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>callid</field><type>DB1_STR</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>
 		<column><field>a_contact</field><type>DB1_STR</type></column>
 		<column><field>b_contact</field><type>DB1_STR</type></column>
+		<column><field>as_contact</field><type>DB1_STR</type></column>
+		<column><field>bs_contact</field><type>DB1_STR</type></column>
 		<column><field>a_tag</field><type>DB1_STR</type></column>
 		<column><field>b_tag</field><type>DB1_STR</type></column>
 		<column><field>a_rr</field><type>DB1_BLOB</type></column>
@@ -774,11 +776,12 @@
 		<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>callid</field><type>DB1_STR</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>
 		<column><field>direction</field><type>DB1_INT</type></column>
 		<column><field>x_via</field><type>DB1_BLOB</type></column>
+		<column><field>x_tag</field><type>DB1_STR</type></column>
 	</db_table>
 	<!-- Declaration of uacreg table-->
 	<db_table id="uacreg">
@@ -3865,11 +3868,13 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -3887,11 +3892,13 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -3912,11 +3919,13 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -3945,11 +3954,12 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -3957,11 +3967,12 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -3972,11 +3983,12 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/topos-mod

@@ -6,11 +6,13 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -28,11 +30,13 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -53,11 +57,13 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>a_contact</field></col>
 				<col><field>b_contact</field></col>
+				<col><field>as_contact</field></col>
+				<col><field>bs_contact</field></col>
 				<col><field>a_tag</field></col>
 				<col><field>b_tag</field></col>
 				<col><field>a_rr</field></col>
@@ -86,11 +92,12 @@
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -98,11 +105,12 @@
 			<cmd_type>DB1_INSERT</cmd_type>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -113,11 +121,12 @@
 			</clause_cols>
 			<query_cols>
 				<col><field>rectime</field></col>
-				<col><field>callid</field></col>
+				<col><field>a_callid</field></col>
 				<col><field>a_uuid</field></col>
 				<col><field>b_uuid</field></col>
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
+				<col><field>x_tag</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/topos-table

@@ -4,11 +4,13 @@
 		<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>callid</field><type>DB1_STR</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>
 		<column><field>a_contact</field><type>DB1_STR</type></column>
 		<column><field>b_contact</field><type>DB1_STR</type></column>
+		<column><field>as_contact</field><type>DB1_STR</type></column>
+		<column><field>bs_contact</field><type>DB1_STR</type></column>
 		<column><field>a_tag</field><type>DB1_STR</type></column>
 		<column><field>b_tag</field><type>DB1_STR</type></column>
 		<column><field>a_rr</field><type>DB1_BLOB</type></column>
@@ -26,9 +28,10 @@
 		<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>callid</field><type>DB1_STR</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>
 		<column><field>direction</field><type>DB1_INT</type></column>
 		<column><field>x_via</field><type>DB1_BLOB</type></column>
+		<column><field>x_tag</field><type>DB1_STR</type></column>
 	</db_table>