kamctl: regenerated database creation scripts

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

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|

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);

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) 

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

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`);

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

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);

utils/kamctl/xhttp_pi/permissions-mod

@@ -8,7 +8,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -18,7 +20,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -31,7 +35,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/permissions-table

@@ -6,7 +6,9 @@
 		<column><field>src_ip</field><type>DB1_STR</type></column>
 		<column><field>proto</field><type>DB1_STR</type></column>
 		<column><field>from_pattern</field><type>DB1_STR</type></column>
+		<column><field>ruri_pattern</field><type>DB1_STR</type></column>
 		<column><field>tag</field><type>DB1_STR</type></column>
+		<column><field>priority</field><type>DB1_INT</type></column>
 	</db_table>
 	<!-- Declaration of address table-->
 	<db_table id="address">

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -468,7 +468,9 @@
 		<column><field>src_ip</field><type>DB1_STR</type></column>
 		<column><field>proto</field><type>DB1_STR</type></column>
 		<column><field>from_pattern</field><type>DB1_STR</type></column>
+		<column><field>ruri_pattern</field><type>DB1_STR</type></column>
 		<column><field>tag</field><type>DB1_STR</type></column>
+		<column><field>priority</field><type>DB1_INT</type></column>
 	</db_table>
 	<!-- Declaration of address table-->
 	<db_table id="address">
@@ -2744,7 +2746,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -2754,7 +2758,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -2767,7 +2773,9 @@
 				<col><field>src_ip</field></col>
 				<col><field>proto</field></col>
 				<col><field>from_pattern</field></col>
+				<col><field>ruri_pattern</field></col>
 				<col><field>tag</field></col>
+				<col><field>priority</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>