[asterisk-commits] tilghman: branch 1.6.0 r107879 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Mar 11 20:55:41 2008
New Revision: 107879

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107879
Log:
Merged revisions 107878 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107878 | tilghman | 2008-03-11 20:54:00 -0500 (Tue, 11 Mar 2008) | 10 lines

Merged revisions 107877 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107877 | tilghman | 2008-03-11 20:52:40 -0500 (Tue, 11 Mar 2008) | 2 lines

Document all of the possible realtime fields

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/iax-friends.sql
    branches/1.6.0/contrib/scripts/sip-friends.sql

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/iax-friends.sql
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/iax-friends.sql?view=diff&rev=107879&r1=107878&r2=107879
==============================================================================
--- branches/1.6.0/contrib/scripts/iax-friends.sql (original)
+++ branches/1.6.0/contrib/scripts/iax-friends.sql Tue Mar 11 20:55:41 2008
@@ -4,12 +4,51 @@
 
 CREATE TABLE `iaxfriends` (
   `name` varchar(40) NOT NULL default '',
+  `username` varchar(40) NOT NULL default '',
   `secret` varchar(40) NOT NULL default '',
+  `dbsecret` varchar(40) NOT NULL default '',
   `context` varchar(40) NOT NULL default '',
+  `regcontext` varchar(40) NOT NULL default '',
+  `host` varchar(40) NOT NULL default 'dynamic',
   `ipaddr` varchar(20) NOT NULL default '',
   `port` int(6) NOT NULL default '0',
+  `defaultip` varchar(20) NOT NULL default '',
+  `sourceaddress` varchar(20) NOT NULL default '',
+  `mask` varchar(20) NOT NULL default '',
+  `regexten` varchar(40) NOT NULL default '',
   `regseconds` int(11) NOT NULL default '0',
   `accountcode` varchar(20) NOT NULL default '', 
-  PRIMARY KEY  (`name`)
+  `mohinterpret` varchar(20) NOT NULL default '', 
+  `mohsuggest` varchar(20) NOT NULL default '', 
+  `inkeys` varchar(40) NOT NULL default '', 
+  `outkey` varchar(40) NOT NULL default '', 
+  `language` varchar(10) NOT NULL default '', 
+  `callerid` varchar(40) NOT NULL default '', 
+  `cid_number` varchar(40) NOT NULL default '', 
+  `sendani` varchar(10) NOT NULL default '', 
+  `fullname` varchar(40) NOT NULL default '', 
+  `trunk` varchar(10) NOT NULL default '', 
+  `auth` varchar(20) NOT NULL default '', 
+  `maxauthreq` varchar(15) NOT NULL default '', 
+  `encryption` varchar(20) NOT NULL default '', 
+  `transfer` varchar(10) NOT NULL default '', 
+  `jitterbuffer` varchar(10) NOT NULL default '', 
+  `forcejitterbuffer` varchar(10) NOT NULL default '', 
+  `disallow` varchar(40) NOT NULL default 'all', 
+  `allow` varchar(40) NOT NULL default '', 
+  `codecpriority` varchar(40) NOT NULL default '', 
+  `qualify` varchar(10) NOT NULL default '', 
+  `qualifysmoothing` varchar(10) NOT NULL default '', 
+  `qualifyfreqok` varchar(10) NOT NULL default '', 
+  `qualifyfreqnotok` varchar(10) NOT NULL default '', 
+  `timezone` varchar(20) NOT NULL default '', 
+  `adsi` varchar(10) NOT NULL default '', 
+  `amaflags` varchar(20) NOT NULL default '', 
+  `setvar` varchar(200) NOT NULL default '', 
+  PRIMARY KEY  (`name`),
+  INDEX name (name, host),
+  INDEX name2 (name, ipaddr, port),
+  INDEX ipaddr (ipaddr, port),
+  INDEX host (host, port),
 ) TYPE=MyISAM;
 

Modified: branches/1.6.0/contrib/scripts/sip-friends.sql
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/sip-friends.sql?view=diff&rev=107879&r1=107878&r2=107879
==============================================================================
--- branches/1.6.0/contrib/scripts/sip-friends.sql (original)
+++ branches/1.6.0/contrib/scripts/sip-friends.sql Tue Mar 11 20:55:41 2008
@@ -4,11 +4,51 @@
 
 CREATE TABLE `sipfriends` (
   `name` varchar(40) NOT NULL default '',
-  `secret` varchar(40) NOT NULL default '',
+  `type` varchar(10) NOT NULL default '',
+  `username` varchar(40),
+  `fromuser` varchar(40),
+  `fromdomain` varchar(40),
+  `secret` varchar(40),
+  `md5secret` varchar(40),
+  `auth` varchar(10),
+  `mailbox` varchar(20),
+  `subscribemwi` varchar(10), -- yes/no
+  `vmexten` varchar(20),
+  `callerid` varchar(40),
+  `cid_number` varchar(40),
+  `callingpres` varchar(20),
+  `usereqphone` varchar(10),
+  `language` varchar(10),
+  `incominglimit` varchar(10),
   `context` varchar(40) NOT NULL default '',
-  `username` varchar(40) default '',
+  `subscribecontext` varchar(40),
+  `amaflags` varchar(20),
+  `accountcode` varchar(20),
+  `musicclass` varchar(20),
+  `mohsuggest` varchar(20),
+  `allowtransfer` varchar(20),
+  `callgroup` varchar(20),
+  `pickupgroup` varchar(20),
+  `autoframing` varchar(10), -- yes/no
+  `disallow` varchar(20) default 'all',
+  `allow` varchar(20),
+  `maxcallbitrate` varchar(15),
+  `host` varchar(40) default 'dynamic',
+  `outboundproxy` varchar(40),
   `ipaddr` varchar(20) NOT NULL default '',
+  `defaultip` varchar(20),
   `port` int(6) NOT NULL default '0',
+  `fullcontact` varchar(40),
+  `insecure` varchar(20),
+  `qualify` varchar(15),
   `regseconds` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`name`)
+  `regexten` varchar(20),
+  `regserver` varchar(20),
+  `rtptimeout` varchar(15),
+  `rtpholdtimeout` varchar(15),
+  `rtpkeepalive` varchar(15),
+  `setvar` varchar(200),
+  PRIMARY KEY  (`name`),
+  INDEX host (host, port),
+  INDEX ipaddr (ipaddr, port),
 ) TYPE=MyISAM;