From 6b76de9f7d991ed3fdc5f2f28dde7bcb1962108b Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 17 Jun 2015 16:24:53 +0200 Subject: [PATCH] kamctl: regenerated database creation scripts --- utils/kamctl/db_berkeley/kamailio/trusted | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/permissions-create.sql | 6 ++++-- utils/kamctl/dbtext/kamailio/trusted | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/permissions-create.sql | 6 ++++-- utils/kamctl/oracle/permissions-create.sql | 6 ++++-- utils/kamctl/postgres/permissions-create.sql | 6 ++++-- utils/kamctl/xhttp_pi/permissions-mod | 6 ++++++ utils/kamctl/xhttp_pi/permissions-table | 2 ++ utils/kamctl/xhttp_pi/pi_framework.xml | 8 ++++++++ 11 files changed, 37 insertions(+), 13 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/trusted b/utils/kamctl/db_berkeley/kamailio/trusted index 48660ca27a5..a85a36dace7 100644 --- a/utils/kamctl/db_berkeley/kamailio/trusted +++ b/utils/kamctl/db_berkeley/kamailio/trusted @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) src_ip(str) proto(str) from_pattern(str) tag(str) +id(int) src_ip(str) proto(str) from_pattern(str) ruri_pattern(str) tag(str) priority(int) METADATA_KEY 1 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NULL|NIL +NIL|NIL|NIL|NULL|NULL|NIL|0 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index a3495136b7d..de38c485fd0 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -113,7 +113,7 @@ speed_dial|2 subscriber| subscriber|6 trusted| -trusted|5 +trusted|6 uacreg| uacreg|1 uid_credentials| diff --git a/utils/kamctl/db_sqlite/permissions-create.sql b/utils/kamctl/db_sqlite/permissions-create.sql index 087543171cc..faf3d68caf4 100644 --- a/utils/kamctl/db_sqlite/permissions-create.sql +++ b/utils/kamctl/db_sqlite/permissions-create.sql @@ -1,10 +1,12 @@ -INSERT INTO version (table_name, table_version) values ('trusted','5'); +INSERT INTO version (table_name, table_version) values ('trusted','6'); CREATE TABLE trusted ( id INTEGER PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(64) + ruri_pattern VARCHAR(64) DEFAULT NULL, + tag VARCHAR(64), + priority INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX trusted_peer_idx ON trusted (src_ip); diff --git a/utils/kamctl/dbtext/kamailio/trusted b/utils/kamctl/dbtext/kamailio/trusted index 4ff59027106..0116b140e8e 100644 --- a/utils/kamctl/dbtext/kamailio/trusted +++ b/utils/kamctl/dbtext/kamailio/trusted @@ -1 +1 @@ -id(int,auto) src_ip(string) proto(string) from_pattern(string,null) tag(string,null) +id(int,auto) src_ip(string) proto(string) from_pattern(string,null) ruri_pattern(string,null) tag(string,null) priority(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 3d92d612a39..899ab5a5081 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -51,7 +51,7 @@ silo:8 sip_trace:4 speed_dial:2 subscriber:6 -trusted:5 +trusted:6 uacreg:1 uid_credentials:7 uid_domain:2 diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index 47d4fa4d086..86cfe0faa5f 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -1,10 +1,12 @@ -INSERT INTO version (table_name, table_version) values ('trusted','5'); +INSERT INTO version (table_name, table_version) values ('trusted','6'); CREATE TABLE `trusted` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, `src_ip` VARCHAR(50) NOT NULL, `proto` VARCHAR(4) NOT NULL, `from_pattern` VARCHAR(64) DEFAULT NULL, - `tag` VARCHAR(64) + `ruri_pattern` VARCHAR(64) DEFAULT NULL, + `tag` VARCHAR(64), + `priority` INT DEFAULT 0 NOT NULL ); CREATE INDEX peer_idx ON trusted (`src_ip`); diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 32ccb22db7b..3d31ec94a16 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -1,10 +1,12 @@ -INSERT INTO version (table_name, table_version) values ('trusted','5'); +INSERT INTO version (table_name, table_version) values ('trusted','6'); CREATE TABLE trusted ( id NUMBER(10) PRIMARY KEY, src_ip VARCHAR2(50), proto VARCHAR2(4), from_pattern VARCHAR2(64) DEFAULT NULL, - tag VARCHAR2(64) + ruri_pattern VARCHAR2(64) DEFAULT NULL, + tag VARCHAR2(64), + priority NUMBER(10) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER trusted_tr diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 95f13dee3a6..92f8e68db43 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -1,10 +1,12 @@ -INSERT INTO version (table_name, table_version) values ('trusted','5'); +INSERT INTO version (table_name, table_version) values ('trusted','6'); CREATE TABLE trusted ( id SERIAL PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(64) + ruri_pattern VARCHAR(64) DEFAULT NULL, + tag VARCHAR(64), + priority INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX trusted_peer_idx ON trusted (src_ip); diff --git a/utils/kamctl/xhttp_pi/permissions-mod b/utils/kamctl/xhttp_pi/permissions-mod index 5c14a4c63fc..5bbd4bfd5f8 100644 --- a/utils/kamctl/xhttp_pi/permissions-mod +++ b/utils/kamctl/xhttp_pi/permissions-mod @@ -8,7 +8,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority add @@ -18,7 +20,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority update @@ -31,7 +35,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority delete diff --git a/utils/kamctl/xhttp_pi/permissions-table b/utils/kamctl/xhttp_pi/permissions-table index b4a7e0fcb7e..991602f559e 100644 --- a/utils/kamctl/xhttp_pi/permissions-table +++ b/utils/kamctl/xhttp_pi/permissions-table @@ -6,7 +6,9 @@ src_ipDB1_STR protoDB1_STR from_patternDB1_STR + ruri_patternDB1_STR tagDB1_STR + priorityDB1_INT diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index d0583be6f3f..367fb9f6746 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -468,7 +468,9 @@ src_ipDB1_STR protoDB1_STR from_patternDB1_STR + ruri_patternDB1_STR tagDB1_STR + priorityDB1_INT @@ -2744,7 +2746,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority add @@ -2754,7 +2758,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority update @@ -2767,7 +2773,9 @@ src_ip proto from_pattern + ruri_pattern tag + priority delete