From f8b9bbdcb95575b90bd75dba71b6117c76127bc1 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Mon, 21 Mar 2016 14:46:23 +0100 Subject: [PATCH] kamctl: db script with larger topos fields --- utils/kamctl/db_berkeley/kamailio/topos_t | 4 ++-- utils/kamctl/db_sqlite/topos-create.sql | 12 +++++++++--- utils/kamctl/dbtext/kamailio/topos_t | 2 +- utils/kamctl/mysql/topos-create.sql | 12 +++++++++--- utils/kamctl/oracle/topos-create.sql | 12 +++++++++--- utils/kamctl/postgres/topos-create.sql | 12 +++++++++--- utils/kamctl/xhttp_pi/pi_framework.xml | 24 +++++++++++++++++++++++ utils/kamctl/xhttp_pi/topos-mod | 18 +++++++++++++++++ utils/kamctl/xhttp_pi/topos-table | 6 ++++++ 9 files changed, 87 insertions(+), 15 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/topos_t b/utils/kamctl/db_berkeley/kamailio/topos_t index 558982e9ec5..7e1164c4dce 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_t +++ b/utils/kamctl/db_berkeley/kamailio/topos_t @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) rectime(datetime) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) y_rr(str) s_rr(str) x_uri(str) x_tag(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str) +id(int) rectime(datetime) s_method(str) s_cseq(str) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_vbranch(str) x_rr(str) y_rr(str) s_rr(str) x_uri(str) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) x_tag(str) a_tag(str) b_tag(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str) METADATA_KEY 4 5 6 7 9 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|''|''|''|''|''|0|''|''|''|''|''|''|''|''|''|''|'' +NIL|NIL|''|''|''|''|''|0|''|''|''|''|''|''|''|''|''|''|''|''|''|''|''|''|'' diff --git a/utils/kamctl/db_sqlite/topos-create.sql b/utils/kamctl/db_sqlite/topos-create.sql index f1ff9eea7b5..a74c81758d6 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -10,8 +10,8 @@ CREATE TABLE topos_d ( b_contact VARCHAR(128) DEFAULT '' 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_tag VARCHAR(255) DEFAULT '' NOT NULL, + b_tag VARCHAR(255) DEFAULT '' NOT NULL, a_rr TEXT DEFAULT '' NOT NULL, b_rr TEXT DEFAULT '' NOT NULL, s_rr TEXT DEFAULT '' NOT NULL, @@ -45,7 +45,13 @@ CREATE TABLE topos_t ( y_rr TEXT DEFAULT '' NOT NULL, s_rr TEXT DEFAULT '' NOT NULL, x_uri VARCHAR(128) DEFAULT '' NOT NULL, - x_tag VARCHAR(64) DEFAULT '' NOT NULL, + a_contact VARCHAR(128) DEFAULT '' NOT NULL, + b_contact VARCHAR(128) DEFAULT '' NOT NULL, + as_contact VARCHAR(128) DEFAULT '' NOT NULL, + bs_contact VARCHAR(128) DEFAULT '' NOT NULL, + x_tag VARCHAR(255) DEFAULT '' NOT NULL, + a_tag VARCHAR(255) DEFAULT '' NOT NULL, + b_tag VARCHAR(255) DEFAULT '' NOT NULL, a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, a_socket VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/topos_t b/utils/kamctl/dbtext/kamailio/topos_t index d553c28d917..dbb28aa6113 100644 --- a/utils/kamctl/dbtext/kamailio/topos_t +++ b/utils/kamctl/dbtext/kamailio/topos_t @@ -1 +1 @@ -id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) y_rr(string) s_rr(string) x_uri(string) x_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) +id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) y_rr(string) s_rr(string) x_uri(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) x_tag(string) a_tag(string) b_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index 496f4235fff..b3a61d3c62d 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -10,8 +10,8 @@ CREATE TABLE `topos_d` ( `b_contact` VARCHAR(128) DEFAULT '' 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_tag` VARCHAR(255) DEFAULT '' NOT NULL, + `b_tag` VARCHAR(255) DEFAULT '' NOT NULL, `a_rr` MEDIUMTEXT DEFAULT '' NOT NULL, `b_rr` MEDIUMTEXT DEFAULT '' NOT NULL, `s_rr` MEDIUMTEXT DEFAULT '' NOT NULL, @@ -45,7 +45,13 @@ CREATE TABLE `topos_t` ( `y_rr` MEDIUMTEXT DEFAULT '' NOT NULL, `s_rr` MEDIUMTEXT DEFAULT '' NOT NULL, `x_uri` VARCHAR(128) DEFAULT '' NOT NULL, - `x_tag` VARCHAR(64) DEFAULT '' NOT NULL, + `a_contact` VARCHAR(128) DEFAULT '' NOT NULL, + `b_contact` VARCHAR(128) DEFAULT '' NOT NULL, + `as_contact` VARCHAR(128) DEFAULT '' NOT NULL, + `bs_contact` VARCHAR(128) DEFAULT '' NOT NULL, + `x_tag` VARCHAR(255) DEFAULT '' NOT NULL, + `a_tag` VARCHAR(255) DEFAULT '' NOT NULL, + `b_tag` VARCHAR(255) DEFAULT '' NOT NULL, `a_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, `b_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, `a_socket` VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index eae72a60a86..5ad40c3268c 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -10,8 +10,8 @@ CREATE TABLE topos_d ( b_contact VARCHAR2(128) DEFAULT '', as_contact VARCHAR2(128) DEFAULT '', bs_contact VARCHAR2(128) DEFAULT '', - a_tag VARCHAR2(64) DEFAULT '', - b_tag VARCHAR2(64) DEFAULT '', + a_tag VARCHAR2(255) DEFAULT '', + b_tag VARCHAR2(255) DEFAULT '', a_rr CLOB DEFAULT '', b_rr CLOB DEFAULT '', s_rr CLOB DEFAULT '', @@ -53,7 +53,13 @@ CREATE TABLE topos_t ( y_rr CLOB DEFAULT '', s_rr CLOB DEFAULT '', x_uri VARCHAR2(128) DEFAULT '', - x_tag VARCHAR2(64) DEFAULT '', + a_contact VARCHAR2(128) DEFAULT '', + b_contact VARCHAR2(128) DEFAULT '', + as_contact VARCHAR2(128) DEFAULT '', + bs_contact VARCHAR2(128) DEFAULT '', + x_tag VARCHAR2(255) DEFAULT '', + a_tag VARCHAR2(255) DEFAULT '', + b_tag VARCHAR2(255) DEFAULT '', a_srcaddr VARCHAR2(128) DEFAULT '', b_srcaddr VARCHAR2(128) DEFAULT '', a_socket VARCHAR2(128) DEFAULT '', diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index 0ee900c7f6c..1a52b33f883 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -10,8 +10,8 @@ CREATE TABLE topos_d ( b_contact VARCHAR(128) DEFAULT '' 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_tag VARCHAR(255) DEFAULT '' NOT NULL, + b_tag VARCHAR(255) DEFAULT '' NOT NULL, a_rr TEXT DEFAULT '' NOT NULL, b_rr TEXT DEFAULT '' NOT NULL, s_rr TEXT DEFAULT '' NOT NULL, @@ -45,7 +45,13 @@ CREATE TABLE topos_t ( y_rr TEXT DEFAULT '' NOT NULL, s_rr TEXT DEFAULT '' NOT NULL, x_uri VARCHAR(128) DEFAULT '' NOT NULL, - x_tag VARCHAR(64) DEFAULT '' NOT NULL, + a_contact VARCHAR(128) DEFAULT '' NOT NULL, + b_contact VARCHAR(128) DEFAULT '' NOT NULL, + as_contact VARCHAR(128) DEFAULT '' NOT NULL, + bs_contact VARCHAR(128) DEFAULT '' NOT NULL, + x_tag VARCHAR(255) DEFAULT '' NOT NULL, + a_tag VARCHAR(255) DEFAULT '' NOT NULL, + b_tag VARCHAR(255) DEFAULT '' NOT NULL, a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, a_socket VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index fd946872ac9..ddf2b2e36f9 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -796,7 +796,13 @@ y_rrDB1_BLOB s_rrDB1_BLOB x_uriDB1_STR + a_contactDB1_STR + b_contactDB1_STR + as_contactDB1_STR + bs_contactDB1_STR x_tagDB1_STR + a_tagDB1_STR + b_tagDB1_STR a_srcaddrDB1_STR b_srcaddrDB1_STR a_socketDB1_STR @@ -4008,7 +4014,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket @@ -4032,7 +4044,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket @@ -4059,7 +4077,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket diff --git a/utils/kamctl/xhttp_pi/topos-mod b/utils/kamctl/xhttp_pi/topos-mod index a0437821242..71ef999e18f 100644 --- a/utils/kamctl/xhttp_pi/topos-mod +++ b/utils/kamctl/xhttp_pi/topos-mod @@ -119,7 +119,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket @@ -143,7 +149,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket @@ -170,7 +182,13 @@ y_rr s_rr x_uri + a_contact + b_contact + as_contact + bs_contact x_tag + a_tag + b_tag a_srcaddr b_srcaddr a_socket diff --git a/utils/kamctl/xhttp_pi/topos-table b/utils/kamctl/xhttp_pi/topos-table index 5f0f539027c..cafb219782c 100644 --- a/utils/kamctl/xhttp_pi/topos-table +++ b/utils/kamctl/xhttp_pi/topos-table @@ -45,7 +45,13 @@ y_rrDB1_BLOB s_rrDB1_BLOB x_uriDB1_STR + a_contactDB1_STR + b_contactDB1_STR + as_contactDB1_STR + bs_contactDB1_STR x_tagDB1_STR + a_tagDB1_STR + b_tagDB1_STR a_srcaddrDB1_STR b_srcaddrDB1_STR a_socketDB1_STR