Browse code

kamctl: db schema regenerated - updates to userblocklist and topos modules

Daniel-Constantin Mierla authored on 31/03/2021 19:45:14
Showing 22 changed files
... ...
@@ -8,5 +8,3 @@ METADATA_LOGFLAGS
8 8
 0
9 9
 METADATA_DEFAULTS
10 10
 NIL|''|0|NULL
11
-globalblocklist|
12
-globalblocklist|1
... ...
@@ -1,10 +1,10 @@
1 1
 METADATA_COLUMNS
2
-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)
2
+id(int) rectime(datetime) x_context(str) 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)
3 3
 METADATA_KEY
4
-4 5 6 
4
+5 6 7 
5 5
 METADATA_READONLY
6 6
 0
7 7
 METADATA_LOGFLAGS
8 8
 0
9 9
 METADATA_DEFAULTS
10
-NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|NIL|NIL|NIL|0|''|''|''|''|''|''|''
10
+NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''|NIL|NIL|NIL|0|''|''|''|''|''|''|''
... ...
@@ -1,10 +1,10 @@
1 1
 METADATA_COLUMNS
2
-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)
2
+id(int) rectime(datetime) x_context(str) 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)
3 3
 METADATA_KEY
4
-4 5 6 7 9 
4
+5 6 7 8 10 
5 5
 METADATA_READONLY
6 6
 0
7 7
 METADATA_LOGFLAGS
8 8
 0
9 9
 METADATA_DEFAULTS
10
-NIL|NIL|''|''|''|''|''|0|NIL|''|NIL|NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''
10
+NIL|NIL|''|''|''|''|''|''|0|NIL|''|NIL|NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''
... ...
@@ -8,5 +8,3 @@ METADATA_LOGFLAGS
8 8
 0
9 9
 METADATA_DEFAULTS
10 10
 NIL|''|''|''|0
11
-userblocklist|
12
-userblocklist|1
... ...
@@ -54,8 +54,8 @@ dr_gw_lists|
54 54
 dr_gw_lists|1
55 55
 dr_rules|
56 56
 dr_rules|3
57
-METADATA_DEFAULTS
58
-NIL|''|0|NULL
57
+globalblocklist|
58
+globalblocklist|1
59 59
 grp|
60 60
 grp|2
61 61
 htable|
... ...
@@ -119,9 +119,9 @@ speed_dial|2
119 119
 subscriber|
120 120
 subscriber|7
121 121
 topos_d|
122
-topos_d|1
122
+topos_d|2
123 123
 topos_t|
124
-topos_t|1
124
+topos_t|2
125 125
 trusted|
126 126
 trusted|6
127 127
 uacreg|
... ...
@@ -142,8 +142,8 @@ uid_user_attrs|
142 142
 uid_user_attrs|3
143 143
 uri|
144 144
 uri|1
145
-METADATA_DEFAULTS
146
-NIL|''|''|''|0
145
+userblocklist|
146
+userblocklist|1
147 147
 usr_preferences|
148 148
 usr_preferences|2
149 149
 watchers|
... ...
@@ -1,2 +1,2 @@
1
-id/int,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,
2
-1
1
+id/int,rectime/int,x_context/string,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,
2
+2
... ...
@@ -1,2 +1,2 @@
1
-id/int,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,
2
-1
1
+id/int,rectime/int,x_context/string,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,
2
+2
... ...
@@ -1,6 +1,7 @@
1 1
 CREATE TABLE topos_d (
2 2
     id INTEGER PRIMARY KEY NOT NULL,
3 3
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
4
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
4 5
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
5 6
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
6 7
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -30,11 +31,12 @@ CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
30 31
 CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid);
31 32
 CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid);
32 33
 
33
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
34
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
34 35
 
35 36
 CREATE TABLE topos_t (
36 37
     id INTEGER PRIMARY KEY NOT NULL,
37 38
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
39
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
38 40
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
39 41
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
40 42
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -65,5 +67,5 @@ CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
65 67
 CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch);
66 68
 CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid);
67 69
 
68
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
70
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
69 71
 
... ...
@@ -1,2 +1 @@
1 1
 id(int,auto) prefix(string) allowlist(int) description(string,null) 
2
-0:globalblocklist:1
... ...
@@ -1 +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,null) b_rr(string,null) s_rr(string,null) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 
1
+id(int,auto) rectime(int) x_context(string) 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,null) b_rr(string,null) s_rr(string,null) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) 
... ...
@@ -1 +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,null) x_vbranch(string) x_rr(string,null) y_rr(string,null) s_rr(string,null) 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) 
1
+id(int,auto) rectime(int) x_context(string) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string,null) x_vbranch(string) x_rr(string,null) y_rr(string,null) s_rr(string,null) 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) 
... ...
@@ -1,2 +1 @@
1 1
 id(int,auto) username(string) domain(string) prefix(string) allowlist(int) 
2
-0:userblocklist:1
... ...
@@ -22,7 +22,7 @@ id(int,auto) table_name(string) table_version(int)
22 22
 0:dr_groups:2
23 23
 0:dr_gw_lists:1
24 24
 0:dr_rules:3
25
-id(int,auto) prefix(string) whitelist(int) description(string,null) 
25
+0:globalblocklist:1
26 26
 0:grp:2
27 27
 0:htable:2
28 28
 0:imc_members:1
... ...
@@ -54,8 +54,8 @@ id(int,auto) prefix(string) whitelist(int) description(string,null)
54 54
 0:sip_trace:4
55 55
 0:speed_dial:2
56 56
 0:subscriber:7
57
-0:topos_d:1
58
-0:topos_t:1
57
+0:topos_d:2
58
+0:topos_t:2
59 59
 0:trusted:6
60 60
 0:uacreg:4
61 61
 0:uid_credentials:7
... ...
@@ -66,7 +66,7 @@ id(int,auto) prefix(string) whitelist(int) description(string,null)
66 66
 0:uid_uri_attrs:2
67 67
 0:uid_user_attrs:3
68 68
 0:uri:1
69
-id(int,auto) username(string) domain(string) prefix(string) whitelist(int) 
69
+0:userblocklist:1
70 70
 0:usr_preferences:2
71 71
 0:watchers:3
72 72
 0:xcap:4
... ...
@@ -1,6 +1,6 @@
1 1
 {
2 2
   "name": "topos_d",
3
-  "version": 1,
3
+  "version": 2,
4 4
   "columns": [
5 5
     "id": {
6 6
       "type": "int",
... ...
@@ -12,6 +12,11 @@
12 12
       "default": null,
13 13
       "null": false
14 14
     },
15
+    "x_context": {
16
+      "type": "string",
17
+      "default": "",
18
+      "null": false
19
+    },
15 20
     "s_method": {
16 21
       "type": "string",
17 22
       "default": "",
... ...
@@ -1,6 +1,6 @@
1 1
 {
2 2
   "name": "topos_t",
3
-  "version": 1,
3
+  "version": 2,
4 4
   "columns": [
5 5
     "id": {
6 6
       "type": "int",
... ...
@@ -12,6 +12,11 @@
12 12
       "default": null,
13 13
       "null": false
14 14
     },
15
+    "x_context": {
16
+      "type": "string",
17
+      "default": "",
18
+      "null": false
19
+    },
15 20
     "s_method": {
16 21
       "type": "string",
17 22
       "default": "",
... ...
@@ -22,7 +22,7 @@ db.getCollection("version").insert({ table_name: "dr_gateways", table_version: N
22 22
 db.getCollection("version").insert({ table_name: "dr_groups", table_version: NumberInt(2) });
23 23
 db.getCollection("version").insert({ table_name: "dr_gw_lists", table_version: NumberInt(1) });
24 24
 db.getCollection("version").insert({ table_name: "dr_rules", table_version: NumberInt(3) });
25
-db.getCollection("version").insert({ table_name: "globalblacklist", table_version: NumberInt(1) });
25
+db.getCollection("version").insert({ table_name: "globalblocklist", table_version: NumberInt(1) });
26 26
 db.getCollection("version").insert({ table_name: "grp", table_version: NumberInt(2) });
27 27
 db.getCollection("version").insert({ table_name: "htable", table_version: NumberInt(2) });
28 28
 db.getCollection("version").insert({ table_name: "imc_members", table_version: NumberInt(1) });
... ...
@@ -54,8 +54,8 @@ db.getCollection("version").insert({ table_name: "silo", table_version: NumberIn
54 54
 db.getCollection("version").insert({ table_name: "sip_trace", table_version: NumberInt(4) });
55 55
 db.getCollection("version").insert({ table_name: "speed_dial", table_version: NumberInt(2) });
56 56
 db.getCollection("version").insert({ table_name: "subscriber", table_version: NumberInt(7) });
57
-db.getCollection("version").insert({ table_name: "topos_d", table_version: NumberInt(1) });
58
-db.getCollection("version").insert({ table_name: "topos_t", table_version: NumberInt(1) });
57
+db.getCollection("version").insert({ table_name: "topos_d", table_version: NumberInt(2) });
58
+db.getCollection("version").insert({ table_name: "topos_t", table_version: NumberInt(2) });
59 59
 db.getCollection("version").insert({ table_name: "trusted", table_version: NumberInt(6) });
60 60
 db.getCollection("version").insert({ table_name: "uacreg", table_version: NumberInt(4) });
61 61
 db.getCollection("version").insert({ table_name: "uid_credentials", table_version: NumberInt(7) });
... ...
@@ -66,7 +66,7 @@ db.getCollection("version").insert({ table_name: "uid_uri", table_version: Numbe
66 66
 db.getCollection("version").insert({ table_name: "uid_uri_attrs", table_version: NumberInt(2) });
67 67
 db.getCollection("version").insert({ table_name: "uid_user_attrs", table_version: NumberInt(3) });
68 68
 db.getCollection("version").insert({ table_name: "uri", table_version: NumberInt(1) });
69
-db.getCollection("version").insert({ table_name: "userblacklist", table_version: NumberInt(1) });
69
+db.getCollection("version").insert({ table_name: "userblocklist", table_version: NumberInt(1) });
70 70
 db.getCollection("version").insert({ table_name: "usr_preferences", table_version: NumberInt(2) });
71 71
 db.getCollection("version").insert({ table_name: "watchers", table_version: NumberInt(3) });
72 72
 db.getCollection("version").insert({ table_name: "xcap", table_version: NumberInt(4) });
... ...
@@ -1,6 +1,7 @@
1 1
 CREATE TABLE `topos_d` (
2 2
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
3 3
     `rectime` DATETIME NOT NULL,
4
+    `x_context` VARCHAR(64) DEFAULT '' NOT NULL,
4 5
     `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
5 6
     `s_cseq` VARCHAR(64) DEFAULT '' NOT NULL,
6 7
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -30,11 +31,12 @@ CREATE INDEX a_callid_idx ON topos_d (`a_callid`);
30 31
 CREATE INDEX a_uuid_idx ON topos_d (`a_uuid`);
31 32
 CREATE INDEX b_uuid_idx ON topos_d (`b_uuid`);
32 33
 
33
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
34
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
34 35
 
35 36
 CREATE TABLE `topos_t` (
36 37
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
37 38
     `rectime` DATETIME NOT NULL,
39
+    `x_context` VARCHAR(64) DEFAULT '' NOT NULL,
38 40
     `s_method` VARCHAR(64) DEFAULT '' NOT NULL,
39 41
     `s_cseq` VARCHAR(64) DEFAULT '' NOT NULL,
40 42
     `a_callid` VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -65,5 +67,5 @@ CREATE INDEX a_callid_idx ON topos_t (`a_callid`);
65 67
 CREATE INDEX x_vbranch_idx ON topos_t (`x_vbranch`);
66 68
 CREATE INDEX a_uuid_idx ON topos_t (`a_uuid`);
67 69
 
68
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
70
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
69 71
 
... ...
@@ -1,6 +1,7 @@
1 1
 CREATE TABLE topos_d (
2 2
     id NUMBER(10) PRIMARY KEY,
3 3
     rectime DATE,
4
+    x_context VARCHAR2(64) DEFAULT '',
4 5
     s_method VARCHAR2(64) DEFAULT '',
5 6
     s_cseq VARCHAR2(64) DEFAULT '',
6 7
     a_callid VARCHAR2(255) DEFAULT '',
... ...
@@ -38,11 +39,12 @@ CREATE INDEX topos_d_a_callid_idx  ON topos_d (a_callid);
38 39
 CREATE INDEX topos_d_a_uuid_idx  ON topos_d (a_uuid);
39 40
 CREATE INDEX topos_d_b_uuid_idx  ON topos_d (b_uuid);
40 41
 
41
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
42
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
42 43
 
43 44
 CREATE TABLE topos_t (
44 45
     id NUMBER(10) PRIMARY KEY,
45 46
     rectime DATE,
47
+    x_context VARCHAR2(64) DEFAULT '',
46 48
     s_method VARCHAR2(64) DEFAULT '',
47 49
     s_cseq VARCHAR2(64) DEFAULT '',
48 50
     a_callid VARCHAR2(255) DEFAULT '',
... ...
@@ -81,5 +83,5 @@ CREATE INDEX topos_t_a_callid_idx  ON topos_t (a_callid);
81 83
 CREATE INDEX topos_t_x_vbranch_idx  ON topos_t (x_vbranch);
82 84
 CREATE INDEX topos_t_a_uuid_idx  ON topos_t (a_uuid);
83 85
 
84
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
86
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
85 87
 
... ...
@@ -1,6 +1,7 @@
1 1
 CREATE TABLE topos_d (
2 2
     id SERIAL PRIMARY KEY NOT NULL,
3 3
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
4
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
4 5
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
5 6
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
6 7
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -30,11 +31,12 @@ CREATE INDEX topos_d_a_callid_idx ON topos_d (a_callid);
30 31
 CREATE INDEX topos_d_a_uuid_idx ON topos_d (a_uuid);
31 32
 CREATE INDEX topos_d_b_uuid_idx ON topos_d (b_uuid);
32 33
 
33
-INSERT INTO version (table_name, table_version) values ('topos_d','1');
34
+INSERT INTO version (table_name, table_version) values ('topos_d','2');
34 35
 
35 36
 CREATE TABLE topos_t (
36 37
     id SERIAL PRIMARY KEY NOT NULL,
37 38
     rectime TIMESTAMP WITHOUT TIME ZONE NOT NULL,
39
+    x_context VARCHAR(64) DEFAULT '' NOT NULL,
38 40
     s_method VARCHAR(64) DEFAULT '' NOT NULL,
39 41
     s_cseq VARCHAR(64) DEFAULT '' NOT NULL,
40 42
     a_callid VARCHAR(255) DEFAULT '' NOT NULL,
... ...
@@ -65,5 +67,5 @@ CREATE INDEX topos_t_a_callid_idx ON topos_t (a_callid);
65 67
 CREATE INDEX topos_t_x_vbranch_idx ON topos_t (x_vbranch);
66 68
 CREATE INDEX topos_t_a_uuid_idx ON topos_t (a_uuid);
67 69
 
68
-INSERT INTO version (table_name, table_version) values ('topos_t','1');
70
+INSERT INTO version (table_name, table_version) values ('topos_t','2');
69 71
 
... ...
@@ -768,6 +768,7 @@
768 768
 		<db_url_id>mysql</db_url_id>
769 769
 		<column><field>id</field><type>DB1_INT</type></column>
770 770
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
771
+		<column><field>x_context</field><type>DB1_STR</type></column>
771 772
 		<column><field>s_method</field><type>DB1_STR</type></column>
772 773
 		<column><field>s_cseq</field><type>DB1_STR</type></column>
773 774
 		<column><field>a_callid</field><type>DB1_STR</type></column>
... ...
@@ -797,6 +798,7 @@
797 798
 		<db_url_id>mysql</db_url_id>
798 799
 		<column><field>id</field><type>DB1_INT</type></column>
799 800
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
801
+		<column><field>x_context</field><type>DB1_STR</type></column>
800 802
 		<column><field>s_method</field><type>DB1_STR</type></column>
801 803
 		<column><field>s_cseq</field><type>DB1_STR</type></column>
802 804
 		<column><field>a_callid</field><type>DB1_STR</type></column>
... ...
@@ -931,25 +933,6 @@
931 933
 		<column><field>uri_user</field><type>DB1_STR</type></column>
932 934
 		<column><field>last_modified</field><type>DB1_DATETIME</type></column>
933 935
 	</db_table>
934
-	<!-- Declaration of userblacklist table-->
935
-	<db_table id="userblacklist">
936
-		<table_name>userblacklist</table_name>
937
-		<db_url_id>mysql</db_url_id>
938
-		<column><field>id</field><type>DB1_INT</type></column>
939
-		<column><field>username</field><type>DB1_STR</type></column>
940
-		<column><field>domain</field><type>DB1_STR</type></column>
941
-		<column><field>prefix</field><type>DB1_STR</type></column>
942
-		<column><field>whitelist</field><type>DB1_INT</type></column>
943
-	</db_table>
944
-	<!-- Declaration of globalblacklist table-->
945
-	<db_table id="globalblacklist">
946
-		<table_name>globalblacklist</table_name>
947
-		<db_url_id>mysql</db_url_id>
948
-		<column><field>id</field><type>DB1_INT</type></column>
949
-		<column><field>prefix</field><type>DB1_STR</type></column>
950
-		<column><field>whitelist</field><type>DB1_INT</type></column>
951
-		<column><field>description</field><type>DB1_STR</type></column>
952
-	</db_table>
953 936
 	<!-- Declaration of userblocklist table-->
954 937
 	<db_table id="userblocklist">
955 938
 		<table_name>userblocklist</table_name>
... ...
@@ -4041,6 +4024,7 @@
4041 4024
 			<query_cols>
4042 4025
 				<col><field>id</field><link_cmd>update</link_cmd></col>
4043 4026
 				<col><field>rectime</field></col>
4027
+				<col><field>x_context</field></col>
4044 4028
 				<col><field>s_method</field></col>
4045 4029
 				<col><field>s_cseq</field></col>
4046 4030
 				<col><field>a_callid</field></col>
... ...
@@ -4070,6 +4054,7 @@
4070 4054
 			<cmd_type>DB1_INSERT</cmd_type>
4071 4055
 			<query_cols>
4072 4056
 				<col><field>rectime</field></col>
4057
+				<col><field>x_context</field></col>
4073 4058
 				<col><field>s_method</field></col>
4074 4059
 				<col><field>s_cseq</field></col>
4075 4060
 				<col><field>a_callid</field></col>
... ...
@@ -4102,6 +4087,7 @@
4102 4087
 			</clause_cols>
4103 4088
 			<query_cols>
4104 4089
 				<col><field>rectime</field></col>
4090
+				<col><field>x_context</field></col>
4105 4091
 				<col><field>s_method</field></col>
4106 4092
 				<col><field>s_cseq</field></col>
4107 4093
 				<col><field>a_callid</field></col>
... ...
@@ -4142,6 +4128,7 @@
4142 4128
 			<query_cols>
4143 4129
 				<col><field>id</field><link_cmd>update</link_cmd></col>
4144 4130
 				<col><field>rectime</field></col>
4131
+				<col><field>x_context</field></col>
4145 4132
 				<col><field>s_method</field></col>
4146 4133
 				<col><field>s_cseq</field></col>
4147 4134
 				<col><field>a_callid</field></col>
... ...
@@ -4172,6 +4159,7 @@
4172 4159
 			<cmd_type>DB1_INSERT</cmd_type>
4173 4160
 			<query_cols>
4174 4161
 				<col><field>rectime</field></col>
4162
+				<col><field>x_context</field></col>
4175 4163
 				<col><field>s_method</field></col>
4176 4164
 				<col><field>s_cseq</field></col>
4177 4165
 				<col><field>a_callid</field></col>
... ...
@@ -4205,6 +4193,7 @@
4205 4193
 			</clause_cols>
4206 4194
 			<query_cols>
4207 4195
 				<col><field>rectime</field></col>
4196
+				<col><field>x_context</field></col>
4208 4197
 				<col><field>s_method</field></col>
4209 4198
 				<col><field>s_cseq</field></col>
4210 4199
 				<col><field>a_callid</field></col>
... ...
@@ -4694,91 +4683,6 @@
4694 4683
 			</clause_cols>
4695 4684
 		</cmd>
4696 4685
 	</mod>
4697
-	<!-- userblacklist provisionning -->
4698
-	<mod><mod_name>userblacklist</mod_name>
4699
-		<cmd><cmd_name>show</cmd_name>
4700
-			<db_table_id>userblacklist</db_table_id>
4701
-			<cmd_type>DB1_QUERY</cmd_type>
4702
-			<query_cols>
4703
-				<col><field>id</field><link_cmd>update</link_cmd></col>
4704
-				<col><field>username</field></col>
4705
-				<col><field>domain</field></col>
4706
-				<col><field>prefix</field></col>
4707
-				<col><field>whitelist</field></col>
4708
-			</query_cols>
4709
-		</cmd>
4710
-		<cmd><cmd_name>add</cmd_name>
4711
-			<db_table_id>userblacklist</db_table_id>
4712
-			<cmd_type>DB1_INSERT</cmd_type>
4713
-			<query_cols>
4714
-				<col><field>username</field></col>
4715
-				<col><field>domain</field></col>
4716
-				<col><field>prefix</field></col>
4717
-				<col><field>whitelist</field></col>
4718
-			</query_cols>
4719
-		</cmd>
4720
-		<cmd><cmd_name>update</cmd_name>
4721
-			<db_table_id>userblacklist</db_table_id>
4722
-			<cmd_type>DB1_UPDATE</cmd_type>
4723
-			<clause_cols>
4724
-				<col><field>id</field><operator>=</operator></col>
4725
-			</clause_cols>
4726
-			<query_cols>
4727
-				<col><field>username</field></col>
4728
-				<col><field>domain</field></col>
4729
-				<col><field>prefix</field></col>
4730
-				<col><field>whitelist</field></col>
4731
-			</query_cols>
4732
-		</cmd>
4733
-		<cmd><cmd_name>delete</cmd_name>
4734
-			<db_table_id>userblacklist</db_table_id>
4735
-			<cmd_type>DB1_DELETE</cmd_type>
4736
-			<clause_cols>
4737
-				<col><field>id</field><operator>=</operator></col>
4738
-			</clause_cols>
4739
-		</cmd>
4740
-	</mod>
4741
-	<!-- globalblacklist provisionning -->
4742
-	<mod><mod_name>globalblacklist</mod_name>
4743
-		<cmd><cmd_name>show</cmd_name>
4744
-			<db_table_id>globalblacklist</db_table_id>
4745
-			<cmd_type>DB1_QUERY</cmd_type>
4746
-			<query_cols>
4747
-				<col><field>id</field><link_cmd>update</link_cmd></col>
4748
-				<col><field>prefix</field></col>
4749
-				<col><field>whitelist</field></col>
4750
-				<col><field>description</field></col>
4751
-			</query_cols>
4752
-		</cmd>
4753
-		<cmd><cmd_name>add</cmd_name>
4754
-			<db_table_id>globalblacklist</db_table_id>
4755
-			<cmd_type>DB1_INSERT</cmd_type>
4756
-			<query_cols>
4757
-				<col><field>prefix</field></col>
4758
-				<col><field>whitelist</field></col>
4759
-				<col><field>description</field></col>
4760
-			</query_cols>
4761
-		</cmd>
4762
-		<cmd><cmd_name>update</cmd_name>
4763
-			<db_table_id>globalblacklist</db_table_id>
4764
-			<cmd_type>DB1_UPDATE</cmd_type>
4765
-			<clause_cols>
4766
-				<col><field>id</field><operator>=</operator></col>
4767
-			</clause_cols>
4768
-			<query_cols>
4769
-				<col><field>prefix</field></col>
4770
-				<col><field>whitelist</field></col>
4771
-				<col><field>description</field></col>
4772
-			</query_cols>
4773
-		</cmd>
4774
-		<cmd><cmd_name>delete</cmd_name>
4775
-			<db_table_id>globalblacklist</db_table_id>
4776
-			<cmd_type>DB1_DELETE</cmd_type>
4777
-			<clause_cols>
4778
-				<col><field>id</field><operator>=</operator></col>
4779
-			</clause_cols>
4780
-		</cmd>
4781
-	</mod>
4782 4686
 	<!-- userblocklist provisionning -->
4783 4687
 	<mod><mod_name>userblocklist</mod_name>
4784 4688
 		<cmd><cmd_name>show</cmd_name>
... ...
@@ -6,6 +6,7 @@
6 6
 			<query_cols>
7 7
 				<col><field>id</field><link_cmd>update</link_cmd></col>
8 8
 				<col><field>rectime</field></col>
9
+				<col><field>x_context</field></col>
9 10
 				<col><field>s_method</field></col>
10 11
 				<col><field>s_cseq</field></col>
11 12
 				<col><field>a_callid</field></col>
... ...
@@ -35,6 +36,7 @@
35 36
 			<cmd_type>DB1_INSERT</cmd_type>
36 37
 			<query_cols>
37 38
 				<col><field>rectime</field></col>
39
+				<col><field>x_context</field></col>
38 40
 				<col><field>s_method</field></col>
39 41
 				<col><field>s_cseq</field></col>
40 42
 				<col><field>a_callid</field></col>
... ...
@@ -67,6 +69,7 @@
67 69
 			</clause_cols>
68 70
 			<query_cols>
69 71
 				<col><field>rectime</field></col>
72
+				<col><field>x_context</field></col>
70 73
 				<col><field>s_method</field></col>
71 74
 				<col><field>s_cseq</field></col>
72 75
 				<col><field>a_callid</field></col>
... ...
@@ -107,6 +110,7 @@
107 110
 			<query_cols>
108 111
 				<col><field>id</field><link_cmd>update</link_cmd></col>
109 112
 				<col><field>rectime</field></col>
113
+				<col><field>x_context</field></col>
110 114
 				<col><field>s_method</field></col>
111 115
 				<col><field>s_cseq</field></col>
112 116
 				<col><field>a_callid</field></col>
... ...
@@ -137,6 +141,7 @@
137 141
 			<cmd_type>DB1_INSERT</cmd_type>
138 142
 			<query_cols>
139 143
 				<col><field>rectime</field></col>
144
+				<col><field>x_context</field></col>
140 145
 				<col><field>s_method</field></col>
141 146
 				<col><field>s_cseq</field></col>
142 147
 				<col><field>a_callid</field></col>
... ...
@@ -170,6 +175,7 @@
170 175
 			</clause_cols>
171 176
 			<query_cols>
172 177
 				<col><field>rectime</field></col>
178
+				<col><field>x_context</field></col>
173 179
 				<col><field>s_method</field></col>
174 180
 				<col><field>s_cseq</field></col>
175 181
 				<col><field>a_callid</field></col>
... ...
@@ -4,6 +4,7 @@
4 4
 		<db_url_id>mysql</db_url_id>
5 5
 		<column><field>id</field><type>DB1_INT</type></column>
6 6
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
7
+		<column><field>x_context</field><type>DB1_STR</type></column>
7 8
 		<column><field>s_method</field><type>DB1_STR</type></column>
8 9
 		<column><field>s_cseq</field><type>DB1_STR</type></column>
9 10
 		<column><field>a_callid</field><type>DB1_STR</type></column>
... ...
@@ -33,6 +34,7 @@
33 34
 		<db_url_id>mysql</db_url_id>
34 35
 		<column><field>id</field><type>DB1_INT</type></column>
35 36
 		<column><field>rectime</field><type>DB1_DATETIME</type></column>
37
+		<column><field>x_context</field><type>DB1_STR</type></column>
36 38
 		<column><field>s_method</field><type>DB1_STR</type></column>
37 39
 		<column><field>s_cseq</field><type>DB1_STR</type></column>
38 40
 		<column><field>a_callid</field><type>DB1_STR</type></column>