From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 16 Jul 2010 04:18:58 +0000 (+0000)
Subject: Allow ipaddress to contain the maximum IPv6 address.
X-Git-Tag: 11.0.0-beta1~2651
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd3824171cf3440fde1b431f0a7d1cf64d26970;p=thirdparty%2Fasterisk.git

Allow ipaddress to contain the maximum IPv6 address.

Also, update meetme to the full list of supported fields.


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

diff --git a/contrib/realtime/mysql/iaxfriends.sql b/contrib/realtime/mysql/iaxfriends.sql
index a83d8ce469..3b3bbb3c79 100644
--- a/contrib/realtime/mysql/iaxfriends.sql
+++ b/contrib/realtime/mysql/iaxfriends.sql
@@ -12,7 +12,7 @@ CREATE TABLE `iaxfriends` (
   `context` varchar(40) NULL,
   `regcontext` varchar(40) NULL,
   `host` varchar(40) NULL default 'dynamic',
-  `ipaddr` varchar(20) NULL, -- Must be updateable by Asterisk user
+  `ipaddr` varchar(40) NULL, -- Must be updateable by Asterisk user
   `port` int(5) NULL, -- Must be updateable by Asterisk user
   `defaultip` varchar(20) NULL,
   `sourceaddress` varchar(20) NULL,
diff --git a/contrib/realtime/mysql/meetme.sql b/contrib/realtime/mysql/meetme.sql
index 19c4ed7453..7e79a8c747 100644
--- a/contrib/realtime/mysql/meetme.sql
+++ b/contrib/realtime/mysql/meetme.sql
@@ -3,10 +3,19 @@
 -- 
 
 CREATE TABLE meetme (
+	bookid int(11) auto_increment,
 	confno char(80) DEFAULT '0' NOT NULL,
+	starttime datetime default '1900-01-01 12:00:00',
+	endtime datetime default '2038-01-01 12:00:00',
 	pin char(20) NULL,
 	adminpin char(20) NULL,
+	opts char(20) NULL,
+	adminopts char(20) NULL,
+	recordingfilename char(80) NULL,
+	recordingformat char(10) NULL,
+	maxusers int(11) NULL,
 	members integer DEFAULT 0 NOT NULL,
-	PRIMARY KEY (confno)
+	index confno (confno,starttime,endtime)
+	PRIMARY KEY (bookid),
 );
 
diff --git a/contrib/realtime/mysql/sipfriends.sql b/contrib/realtime/mysql/sipfriends.sql
index a9c94e8dcf..c7f10e934e 100644
--- a/contrib/realtime/mysql/sipfriends.sql
+++ b/contrib/realtime/mysql/sipfriends.sql
@@ -35,7 +35,7 @@ CREATE TABLE `sipfriends` (
   `maxcallbitrate` varchar(15),
   `host` varchar(40) default 'dynamic',
   `outboundproxy` varchar(40),
-  `ipaddr` varchar(20) NOT NULL default '',
+  `ipaddr` varchar(40) NOT NULL default '',
   `defaultip` varchar(20),
   `port` int(6) NOT NULL default '0',
   `fullcontact` varchar(40),
diff --git a/contrib/realtime/postgresql/realtime.sql b/contrib/realtime/postgresql/realtime.sql
index 7eab141364..74b895738f 100644
--- a/contrib/realtime/postgresql/realtime.sql
+++ b/contrib/realtime/postgresql/realtime.sql
@@ -65,7 +65,7 @@ disallow character varying(100) DEFAULT 'all',
 allow character varying(100) DEFAULT 'g729;ilbc;gsm;ulaw;alaw',
 musiconhold character varying(100),
 regseconds bigint DEFAULT 0::bigint NOT NULL,
-ipaddr character varying(15) DEFAULT '' NOT NULL,
+ipaddr character varying(40) DEFAULT '' NOT NULL,
 regexten character varying(80) DEFAULT '' NOT NULL,
 cancallforward character varying(3) DEFAULT 'yes',
 lastms integer DEFAULT -1 NOT NULL