Merged revisions 317805 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317805 | russell | 2011-05-06 14:14:39 -0500 (Fri, 06 May 2011) | 7 lines
  
  Add a new sipfriends.sql for MySQL that has more fields in it.
  
  (closes issue #16399)
  Reported by: pabelanger
  Patches:
        sipfriends.sql.v3 uploaded by pabelanger (license 224)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317807 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 93 insertions, 51 deletions

diff --git a/contrib/realtime/mysql/sipfriends.sql b/contrib/realtime/mysql/sipfriends.sql
index 967cdf7d0..12047d399 100644
--- a/contrib/realtime/mysql/sipfriends.sql
+++ b/contrib/realtime/mysql/sipfriends.sql
@@ -2,55 +2,97 @@
 # Table structure for table `sipfriends`
 #
 
-CREATE TABLE `sipfriends` (
-  `name` 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 '',
-  `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(40) NOT NULL default '',
-  `defaultip` varchar(20),
-  `dtmfmode` varchar(7) default NULL,
-  `port` int(6) NOT NULL default '0',
-  `fullcontact` varchar(40),
-  `insecure` varchar(20),
-  `qualify` varchar(15),
-  `regseconds` int(11) NOT NULL default '0',
-  `regexten` varchar(20),
-  `regserver` varchar(20),
-  `rtptimeout` varchar(15),
-  `rtpholdtimeout` varchar(15),
-  `rtpkeepalive` varchar(15),
-  `lastms` int(11) NOT NULL default '-1',
-  `setvar` varchar(200),
-  PRIMARY KEY  (`name`),
-  INDEX host (host, port),
-  INDEX ipaddr (ipaddr, port)
+CREATE TABLE IF NOT EXISTS `sipfriends` (
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `name` varchar(10) NOT NULL,
+      `ipaddr` varchar(15) DEFAULT NULL,
+      `port` int(5) DEFAULT NULL,
+      `regseconds` int(11) DEFAULT NULL,
+      `defaultuser` varchar(10) DEFAULT NULL,
+      `fullcontact` varchar(35) DEFAULT NULL,
+      `regserver` varchar(20) DEFAULT NULL,
+      `useragent` varchar(20) DEFAULT NULL,
+      `lastms` int(11) DEFAULT NULL,
+      `host` varchar(40) DEFAULT NULL,
+      `type` enum('friend','user','peer') DEFAULT NULL,
+      `context` varchar(40) DEFAULT NULL,
+      `permit` varchar(40) DEFAULT NULL,
+      `deny` varchar(40) DEFAULT NULL,
+      `secret` varchar(40) DEFAULT NULL,
+      `md5secret` varchar(40) DEFAULT NULL,
+      `remotesecret` varchar(40) DEFAULT NULL,
+      `transport` enum('udp','tcp','udp,tcp','tcp,udp') DEFAULT NULL,
+      `dtmfmode` enum('rfc2833','info','shortinfo','inband','auto') DEFAULT NULL,
+      `directmedia` enum('yes','no','nonat','update') DEFAULT NULL,
+      `nat` enum('yes','no','never','route') DEFAULT NULL,
+      `callgroup` varchar(40) DEFAULT NULL,
+      `pickupgroup` varchar(40) DEFAULT NULL,
+      `language` varchar(40) DEFAULT NULL,
+      `allow` varchar(40) DEFAULT NULL,
+      `disallow` varchar(40) DEFAULT NULL,
+      `insecure` varchar(40) DEFAULT NULL,
+      `trustrpid` enum('yes','no') DEFAULT NULL,
+      `progressinband` enum('yes','no','never') DEFAULT NULL,
+      `promiscredir` enum('yes','no') DEFAULT NULL,
+      `useclientcode` enum('yes','no') DEFAULT NULL,
+      `accountcode` varchar(40) DEFAULT NULL,
+      `setvar` varchar(40) DEFAULT NULL,
+      `callerid` varchar(40) DEFAULT NULL,
+      `amaflags` varchar(40) DEFAULT NULL,
+      `callcounter` enum('yes','no') DEFAULT NULL,
+      `busylevel` int(11) DEFAULT NULL,
+      `allowoverlap` enum('yes','no') DEFAULT NULL,
+      `allowsubscribe` enum('yes','no') DEFAULT NULL,
+      `videosupport` enum('yes','no') DEFAULT NULL,
+      `maxcallbitrate` int(11) DEFAULT NULL,
+      `rfc2833compensate` enum('yes','no') DEFAULT NULL,
+      `mailbox` varchar(40) DEFAULT NULL,
+      `session-timers` enum('accept','refuse','originate') DEFAULT NULL,
+      `session-expires` int(11) DEFAULT NULL,
+      `session-minse` int(11) DEFAULT NULL,
+      `session-refresher` enum('uac','uas') DEFAULT NULL,
+      `t38pt_usertpsource` varchar(40) DEFAULT NULL,
+      `regexten` varchar(40) DEFAULT NULL,
+      `fromdomain` varchar(40) DEFAULT NULL,
+      `fromuser` varchar(40) DEFAULT NULL,
+      `qualify` varchar(40) DEFAULT NULL,
+      `defaultip` varchar(40) DEFAULT NULL,
+      `rtptimeout` int(11) DEFAULT NULL,
+      `rtpholdtimeout` int(11) DEFAULT NULL,
+      `sendrpid` enum('yes','no') DEFAULT NULL,
+      `outboundproxy` varchar(40) DEFAULT NULL,
+      `callbackextension` varchar(40) DEFAULT NULL,
+      `registertrying` enum('yes','no') DEFAULT NULL,
+      `timert1` int(11) DEFAULT NULL,
+      `timerb` int(11) DEFAULT NULL,
+      `qualifyfreq` int(11) DEFAULT NULL,
+      `constantssrc` enum('yes','no') DEFAULT NULL,
+      `contactpermit` varchar(40) DEFAULT NULL,
+      `contactdeny` varchar(40) DEFAULT NULL,
+      `usereqphone` enum('yes','no') DEFAULT NULL,
+      `textsupport` enum('yes','no') DEFAULT NULL,
+      `faxdetect` enum('yes','no') DEFAULT NULL,
+      `buggymwi` enum('yes','no') DEFAULT NULL,
+      `auth` varchar(40) DEFAULT NULL,
+      `fullname` varchar(40) DEFAULT NULL,
+      `trunkname` varchar(40) DEFAULT NULL,
+      `cid_number` varchar(40) DEFAULT NULL,
+      `callingpres` enum('allowed_not_screened','allowed_passed_screen','allowed_failed_screen','allowed','prohib_not_screened','prohib_passed_screen','prohib_failed_screen','prohib') DEFAULT NULL,
+      `mohinterpret` varchar(40) DEFAULT NULL,
+      `mohsuggest` varchar(40) DEFAULT NULL,
+      `parkinglot` varchar(40) DEFAULT NULL,
+      `hasvoicemail` enum('yes','no') DEFAULT NULL,
+      `subscribemwi` enum('yes','no') DEFAULT NULL,
+      `vmexten` varchar(40) DEFAULT NULL,
+      `autoframing` enum('yes','no') DEFAULT NULL,
+      `rtpkeepalive` int(11) DEFAULT NULL,
+      `call-limit` int(11) DEFAULT NULL,
+      `g726nonstandard` enum('yes','no') DEFAULT NULL,
+      `ignoresdpversion` enum('yes','no') DEFAULT NULL,
+      `allowtransfer` enum('yes','no') DEFAULT NULL,
+      `dynamic` enum('yes','no') DEFAULT NULL,
+      PRIMARY KEY (`id`),
+      UNIQUE KEY `name` (`name`),
+      KEY `ipaddr` (`ipaddr`,`port`),
+      KEY `host` (`host`,`port`)
 ) ENGINE=MyISAM;