From fedf9e8875791ff53188fb812a6d97aae9b1ceba Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Mon, 21 Mar 2016 14:24:25 +0100 Subject: [PATCH] kamctl: further updates to topos db scripts --- utils/kamctl/db_berkeley/kamailio/topos_d | 4 +-- utils/kamctl/db_berkeley/kamailio/topos_t | 4 +-- utils/kamctl/db_sqlite/topos-create.sql | 12 +++++-- utils/kamctl/dbtext/kamailio/topos_d | 2 +- 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 | 40 ++++++++++++++++++----- utils/kamctl/xhttp_pi/topos-mod | 30 +++++++++++++---- utils/kamctl/xhttp_pi/topos-table | 10 ++++-- 11 files changed, 106 insertions(+), 34 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/topos_d b/utils/kamctl/db_berkeley/kamailio/topos_d index ef3c2f510b8..557f3810ceb 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_d +++ b/utils/kamctl/db_berkeley/kamailio/topos_d @@ -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) a_contact(str) b_contact(str) as_contact(str) bs_contact(str) a_tag(str) b_tag(str) a_rr(str) b_rr(str) s_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(str) 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) s_rr(str) iflags(int) a_uri(str) b_uri(str) r_uri(str) a_srcaddr(str) b_srcaddr(str) a_socket(str) b_socket(str) METADATA_KEY 4 5 6 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_berkeley/kamailio/topos_t b/utils/kamctl/db_berkeley/kamailio/topos_t index 376a90272b2..558982e9ec5 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) +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) 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 3a9907bba86..f1ff9eea7b5 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -19,8 +19,10 @@ CREATE TABLE topos_d ( 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 + a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + a_socket VARCHAR(128) DEFAULT '' NOT NULL, + b_socket VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); @@ -43,7 +45,11 @@ 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 + x_tag VARCHAR(64) DEFAULT '' NOT NULL, + a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + a_socket VARCHAR(128) DEFAULT '' NOT NULL, + b_socket VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); diff --git a/utils/kamctl/dbtext/kamailio/topos_d b/utils/kamctl/dbtext/kamailio/topos_d index 3b3fcf444f6..ff0cb58b6dd 100644 --- a/utils/kamctl/dbtext/kamailio/topos_d +++ b/utils/kamctl/dbtext/kamailio/topos_d @@ -1 +1 @@ -id(int,auto) rectime(int) s_method(string) s_cseq(string) 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) s_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(string) 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) s_rr(string) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) diff --git a/utils/kamctl/dbtext/kamailio/topos_t b/utils/kamctl/dbtext/kamailio/topos_t index 524ebaf06ec..d553c28d917 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) +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) diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index f8c18b38880..496f4235fff 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -19,8 +19,10 @@ CREATE TABLE `topos_d` ( `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 + `a_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, + `b_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, + `a_socket` VARCHAR(128) DEFAULT '' NOT NULL, + `b_socket` VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX rectime_idx ON topos_d (`rectime`); @@ -43,7 +45,11 @@ 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 + `x_tag` VARCHAR(64) DEFAULT '' NOT NULL, + `a_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, + `b_srcaddr` VARCHAR(128) DEFAULT '' NOT NULL, + `a_socket` VARCHAR(128) DEFAULT '' NOT NULL, + `b_socket` VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX rectime_idx ON topos_t (`rectime`); diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index 3226ddac513..eae72a60a86 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -19,8 +19,10 @@ CREATE TABLE topos_d ( 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 '' + a_srcaddr VARCHAR2(128) DEFAULT '', + b_srcaddr VARCHAR2(128) DEFAULT '', + a_socket VARCHAR2(128) DEFAULT '', + b_socket VARCHAR2(128) DEFAULT '' ); CREATE OR REPLACE TRIGGER topos_d_tr @@ -51,7 +53,11 @@ CREATE TABLE topos_t ( y_rr CLOB DEFAULT '', s_rr CLOB DEFAULT '', x_uri VARCHAR2(128) DEFAULT '', - x_tag VARCHAR2(64) DEFAULT '' + x_tag VARCHAR2(64) DEFAULT '', + a_srcaddr VARCHAR2(128) DEFAULT '', + b_srcaddr VARCHAR2(128) DEFAULT '', + a_socket VARCHAR2(128) DEFAULT '', + b_socket VARCHAR2(128) DEFAULT '' ); CREATE OR REPLACE TRIGGER topos_t_tr diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index 28f44ab3254..0ee900c7f6c 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -19,8 +19,10 @@ CREATE TABLE topos_d ( 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 + a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + a_socket VARCHAR(128) DEFAULT '' NOT NULL, + b_socket VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX topos_d_rectime_idx ON topos_d (rectime); @@ -43,7 +45,11 @@ 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 + x_tag VARCHAR(64) DEFAULT '' NOT NULL, + a_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + b_srcaddr VARCHAR(128) DEFAULT '' NOT NULL, + a_socket VARCHAR(128) DEFAULT '' NOT NULL, + b_socket VARCHAR(128) DEFAULT '' NOT NULL ); CREATE INDEX topos_t_rectime_idx ON topos_t (rectime); diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index 9e0adcd35ad..fd946872ac9 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -773,8 +773,10 @@ a_uriDB1_STR b_uriDB1_STR r_uriDB1_STR - a_srcipDB1_STR - b_srcipDB1_STR + a_srcaddrDB1_STR + b_srcaddrDB1_STR + a_socketDB1_STR + b_socketDB1_STR @@ -795,6 +797,10 @@ s_rrDB1_BLOB x_uriDB1_STR x_tagDB1_STR + a_srcaddrDB1_STR + b_srcaddrDB1_STR + a_socketDB1_STR + b_socketDB1_STR @@ -3907,8 +3913,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket add @@ -3934,8 +3942,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket update @@ -3964,8 +3974,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket delete @@ -3997,6 +4009,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket add @@ -4017,6 +4033,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket update @@ -4040,6 +4060,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket delete diff --git a/utils/kamctl/xhttp_pi/topos-mod b/utils/kamctl/xhttp_pi/topos-mod index 50092ee2665..a0437821242 100644 --- a/utils/kamctl/xhttp_pi/topos-mod +++ b/utils/kamctl/xhttp_pi/topos-mod @@ -24,8 +24,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket add @@ -51,8 +53,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket update @@ -81,8 +85,10 @@ a_uri b_uri r_uri - a_srcip - b_srcip + a_srcaddr + b_srcaddr + a_socket + b_socket delete @@ -114,6 +120,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket add @@ -134,6 +144,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket update @@ -157,6 +171,10 @@ s_rr x_uri x_tag + a_srcaddr + b_srcaddr + a_socket + b_socket delete diff --git a/utils/kamctl/xhttp_pi/topos-table b/utils/kamctl/xhttp_pi/topos-table index 12eb36b45e3..5f0f539027c 100644 --- a/utils/kamctl/xhttp_pi/topos-table +++ b/utils/kamctl/xhttp_pi/topos-table @@ -22,8 +22,10 @@ a_uriDB1_STR b_uriDB1_STR r_uriDB1_STR - a_srcipDB1_STR - b_srcipDB1_STR + a_srcaddrDB1_STR + b_srcaddrDB1_STR + a_socketDB1_STR + b_socketDB1_STR @@ -44,4 +46,8 @@ s_rrDB1_BLOB x_uriDB1_STR x_tagDB1_STR + a_srcaddrDB1_STR + b_srcaddrDB1_STR + a_socketDB1_STR + b_socketDB1_STR