updated types of attributes

Makefile

@@ -51,10 +51,10 @@ skip_modules?=
 exclude_modules?= 			acc cpl ext extcmd radius_acc radius_auth vm \
 							postgres snmp \
 							im \
-							jabber mysql \
+							jabber \
 							cpl-c \
 							auth_radius group_radius uri_radius avp_radius \
-							acc_radius dialog pa rls presence_b2b xcap xmlrpc osp tls \
+							acc_radius dialog pa rls presence_b2b osp tls  \
 							unixsock
 # always exclude the CVS dir
 override exclude_modules+= CVS $(skip_modules)

db/schema/attr_types.xml

@@ -116,17 +116,50 @@
 
     <row><value col="at.name">uid</value>         <value col="at.type">2</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">did</value>         <value col="at.type">2</value><value col="at.d_flags">1</value></row>
-    <row><value col="at.name">rpid</value>        <value col="at.type">2</value><value col="at.d_flags">1</value></row>
-    <row><value col="at.name">fr_timer</value>    <value col="at.type">0</value><value col="at.d_flags">1</value></row>
-    <row><value col="at.name">fr_inv_timer</value><value col="at.type">2</value><value col="at.d_flags">1</value></row>
-    <row><value col="at.name">flags</value>       <value col="at.type">0</value><value col="at.d_flags">1</value></row>
-    <row><value col="at.name">gflags</value>      <value col="at.type">0</value><value col="at.d_flags">1</value></row>
+    
+    <row><value col="at.name">rpid</value>        
+         <value col="at.type">2</value>
+         <value col="at.rich_t">string</value>
+         <value col="at.desc">remote party id</value>
+         <value col="at.d_flags">1</value>
+         <value col="at.prior">0</value>
+         <value col="at.order">0</value>
+    </row>
+	 
+    <row><value col="at.name">fr_timer</value>    
+         <value col="at.type">0</value>
+	 <value col="at.rich_t">int</value>
+         <value col="at.desc">@ff_fr_timer</value>
+         <value col="at.d_flags">33</value>
+         <value col="at.prior">1073807616</value>
+	 <value col="at.order">140</value>
+    </row>
+    
+    <row><value col="at.name">fr_inv_timer</value>
+         <value col="at.type">0</value>
+         <value col="at.rich_t">int</value>
+         <value col="at.desc">@ff_fr_inv_timer</value>
+         <value col="at.d_flags">33</value>
+         <value col="at.prior">1073807616</value>
+         <value col="at.order">150</value>
+    </row>
+    
+    <row><value col="at.name">gflags</value>     
+         <value col="at.type">0</value>
+         <value col="at.rich_t">int</value>
+         <value col="at.desc">global flags</value>
+         <value col="at.d_flags">33</value>
+         <value col="at.prior">1073741824</value>
+         <value col="at.order">0</value>
+    </row>
     
     <row><value col="at.name">digest_realm</value>
          <value col="at.type">2</value>
+         <value col="at.rich_t">string</value>
 	 <value col="at.desc">digest realm</value>
 	 <value col="at.d_flags">33</value>
 	 <value col="at.prior">65536</value>
+         <value col="at.order">0</value>
     </row>
     
     <row><value col="at.name">acl</value>
@@ -161,7 +194,7 @@
          <value col="at.type">2</value>
          <value col="at.rich_t">email_adr</value>
          <value col="at.desc">@ff_email</value>
-         <value col="at.d_flags">32</value>
+         <value col="at.d_flags">33</value>
          <value col="at.flags">2</value>
          <value col="at.prior">256</value>
          <value col="at.order">30</value>

scripts/dbtext/ser_db/attr_types

@@ -1,16 +1,15 @@
 name(str) rich_type(str) raw_type(int) type_spec(str,null) description(str,null) default_flags(int) flags(int) priority(int) ordering(int) 
 uid:string:2:::1:0:0:0
 did:string:2:::1:0:0:0
-rpid:string:2:::1:0:0:0
-fr_timer:string:0:::1:0:0:0
-fr_inv_timer:string:2:::1:0:0:0
-flags:string:0:::1:0:0:0
-gflags:string:0:::1:0:0:0
+rpid:string:2::remote party id:1:0:0:0
+fr_timer:int:0::@ff_fr_timer:33:0:1073807616:140
+fr_inv_timer:int:0::@ff_fr_inv_timer:33:0:1073807616:150
+gflags:int:0::global flags:33:0:1073741824:0
 digest_realm:string:2::digest realm:33:0:65536:0
 acl:string:2::access control list of user:33:1:0:0
 first_name:string:2::@ff_first_name:32:2:256:10
 last_name:string:2::@ff_last_name:32:2:256:20
-email:email_adr:2::@ff_email:32:2:256:30
+email:email_adr:2::@ff_email:33:2:256:30
 timezone:timezone:2::@ff_timezone:32:2:1073807616:60
 sw_allow_find:boolean:0::@ff_allow_lookup_for_me:32:0:256:110
 lang:lang:2::@ff_language:33:0:1073807616:50

scripts/mysql/my_create.sql

@@ -116,16 +116,15 @@ CREATE TABLE attr_types (
 
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('did', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('rpid', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('rpid', '2', 'string', 'remote party id', '1', '0', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_timer', '0', 'int', '@ff_fr_timer', '33', '1073807616', '140');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_inv_timer', '0', 'int', '@ff_fr_inv_timer', '33', '1073807616', '150');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('gflags', '0', 'int', 'global flags', '33', '1073741824', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('digest_realm', '2', 'string', 'digest realm', '33', '65536', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('acl', '2', 'string', 'access control list of user', '33', '1', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '33', '2', '256', '30');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');

scripts/oracle/or_create.sql

@@ -114,16 +114,15 @@ CREATE TABLE attr_types (
 
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('did', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('rpid', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('rpid', '2', 'string', 'remote party id', '1', '0', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_timer', '0', 'int', '@ff_fr_timer', '33', '1073807616', '140');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_inv_timer', '0', 'int', '@ff_fr_inv_timer', '33', '1073807616', '150');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('gflags', '0', 'int', 'global flags', '33', '1073741824', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('digest_realm', '2', 'string', 'digest realm', '33', '65536', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('acl', '2', 'string', 'access control list of user', '33', '1', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '33', '2', '256', '30');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');

scripts/postgres/pg_create.sql

@@ -120,16 +120,15 @@ CREATE TABLE attr_types (
 
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('did', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('rpid', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
-INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('rpid', '2', 'string', 'remote party id', '1', '0', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_timer', '0', 'int', '@ff_fr_timer', '33', '1073807616', '140');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('fr_inv_timer', '0', 'int', '@ff_fr_inv_timer', '33', '1073807616', '150');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('gflags', '0', 'int', 'global flags', '33', '1073741824', '0');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, priority, ordering) VALUES ('digest_realm', '2', 'string', 'digest realm', '33', '65536', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('acl', '2', 'string', 'access control list of user', '33', '1', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('first_name', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('last_name', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('email', '2', 'email_adr', '@ff_email', '33', '2', '256', '30');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'lang', '@ff_language', '33', '0', '1073807616', '50');