new attribute 'contact_email'

db/schema/attr_types.xml

@@ -373,6 +373,16 @@
          <value col="at.order">170</value>
 	 <value col="at.type_spec">a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}</value>
     </row>
+    <row><value col="at.name">contact_email</value>
+         <value col="at.type">2</value>
+         <value col="at.rich_t">email_adr</value>
+         <value col="at.desc">@ff_contact_email</value>
+         <value col="at.d_flags">32</value>
+         <value col="at.flags">4096</value>
+         <value col="at.prior">1073807360</value>
+         <value col="at.order">0</value>
+    </row>
+
 								      
 
 </table>

scripts/dbtext/ser_db/attr_types

@@ -30,3 +30,4 @@ sw_require_confirm:boolean:0::@ff_reg_confirmation:32:0:1073807360:120
 sw_send_missed:boolean:0::@ff_send_daily_missed_calls:32:0:1073807616:130
 uid_format:list:2:a\:3\:{i\:0;s\:14\:"username@realm";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_uid_format:32:0:1073741824:160
 did_format:list:2:a\:3\:{i\:0;s\:11\:"domain name";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_did_format:32:0:1073741824:170
+contact_email:email_adr:2::@ff_contact_email:32:4096:1073807360:0

scripts/dbtext/ser_db/location

@@ -1 +1 @@
-uid(str) contact(str) received(str,null) expires(int) q(double) callid(str,null) cseq(int,null) flags(int) user_agent(str,null) instance(str,null) 
+uid(str) aor(str) contact(str) received(str,null) expires(int) q(double) callid(str,null) cseq(int,null) flags(int) user_agent(str,null) instance(str,null) 

scripts/mysql/my_create.sql

@@ -123,6 +123,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('contact_email', '2', 'email_adr', '@ff_contact_email', '32', '4096', '1073807360', '0');
 
 INSERT INTO version (table_name, table_version) values ('global_attrs','1');
 CREATE TABLE global_attrs (
@@ -576,4 +577,4 @@ CREATE TABLE customers (
     UNIQUE KEY cu_idx (cid)
 );
 
- 
+ 

scripts/oracle/or_create.sql

@@ -121,6 +121,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('contact_email', '2', 'email_adr', '@ff_contact_email', '32', '4096', '1073807360', '0');
 
 INSERT INTO version (table_name, table_version) values ('global_attrs','1');
 CREATE TABLE global_attrs (
@@ -193,9 +194,10 @@ CREATE TABLE domain_settings (
 
 );
 
-INSERT INTO version (table_name, table_version) values ('location','8');
+INSERT INTO version (table_name, table_version) values ('location','9');
 CREATE TABLE location (
     uid string(64) NOT NULL,
+    aor string(255) NOT NULL,
     contact string(255) NOT NULL,
     received string(255),
     expires datetime NOT NULL DEFAULT '1970-01-01 00:00:00',

scripts/postgres/pg_create.sql

@@ -123,6 +123,7 @@ INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, f
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('uid_format', '2', 'list', '@ff_uid_format', '32', '0', '1073741824', '160', 'a:3:{i:0;s:14:"username@realm";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('did_format', '2', 'list', '@ff_did_format', '32', '0', '1073741824', '170', 'a:3:{i:0;s:11:"domain name";i:1;s:21:"integer (incremental)";i:2;s:15:"UUID by RFC4122";}');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('contact_email', '2', 'email_adr', '@ff_contact_email', '32', '4096', '1073807360', '0');
 
 CREATE TABLE global_attrs (
     name VARCHAR(32) NOT NULL,
@@ -193,6 +194,7 @@ CREATE INDEX ds_df ON domain_settings (did, filename);
 
 CREATE TABLE location (
     uid VARCHAR(64) NOT NULL,
+    aor VARCHAR(255) NOT NULL,
     contact VARCHAR(255) NOT NULL,
     received VARCHAR(255),
     expires TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',