[asterisk-commits] tilghman: branch 1.6.2 r206598 - in /branches/1.6.2: ./ apps/ contrib/scripts/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 14 15:26:36 2009
New Revision: 206598

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206598
Log:
Merged revisions 206567 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r206567 | tilghman | 2009-07-14 15:14:45 -0500 (Tue, 14 Jul 2009) | 6 lines
  
  Document all meetme realtime fields, and in the process, make some field lengths more consistent.
  (closes issue #15493)
   Reported by: lasko
   Patches: 
         meetme.diff uploaded by lasko (license 833)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c
    branches/1.6.2/contrib/scripts/meetme.sql

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

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=206598&r1=206597&r2=206598
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Tue Jul 14 15:26:36 2009
@@ -584,7 +584,7 @@
 
 #define MAX_CONFNUM 80
 #define MAX_PIN     80
-#define OPTIONS_LEN 32
+#define OPTIONS_LEN 100
 
 enum announcetypes {
 	CONF_HASJOIN,
@@ -1816,7 +1816,7 @@
 	struct timeval now;
 	struct ast_tm tm;
 	struct ast_variable *var, *orig_var;
-	char bookid[8]; 
+	char bookid[51];
 
 	if (!extendby) {
 		return 0;
@@ -3357,13 +3357,13 @@
 		int maxusers = 0;
 		struct timeval now;
 		char recordingfilename[256] = "";
-		char recordingformat[10] = "";
+		char recordingformat[11] = "";
 		char currenttime[19] = "";
 		char eatime[19] = "";
-		char bookid[19] = "";
+		char bookid[51] = "";
 		char recordingtmp[AST_MAX_EXTENSION] = "";
-		char useropts[OPTIONS_LEN]; /* Used for RealTime conferences */
-		char adminopts[OPTIONS_LEN];
+		char useropts[OPTIONS_LEN + 1]; /* Used for RealTime conferences */
+		char adminopts[OPTIONS_LEN + 1];
 		struct ast_tm tm, etm;
 		struct timeval endtime = { .tv_sec = 0 };
 		const char *var2;
@@ -3427,11 +3427,11 @@
 			} else if (!strcasecmp(var->name, "bookId")) {
 				ast_copy_string(bookid, var->value, sizeof(bookid));
 			} else if (!strcasecmp(var->name, "opts")) {
-				ast_copy_string(useropts, var->value, sizeof(char[OPTIONS_LEN]));
+				ast_copy_string(useropts, var->value, sizeof(char[OPTIONS_LEN + 1]));
 			} else if (!strcasecmp(var->name, "maxusers")) {
 				maxusers = atoi(var->value);
 			} else if (!strcasecmp(var->name, "adminopts")) {
-				ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN]));
+				ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN + 1]));
 			} else if (!strcasecmp(var->name, "recordingfilename")) {
 				ast_copy_string(recordingfilename, var->value, sizeof(recordingfilename));
 			} else if (!strcasecmp(var->name, "recordingformat")) {

Modified: branches/1.6.2/contrib/scripts/meetme.sql
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/contrib/scripts/meetme.sql?view=diff&rev=206598&r1=206597&r2=206598
==============================================================================
--- branches/1.6.2/contrib/scripts/meetme.sql (original)
+++ branches/1.6.2/contrib/scripts/meetme.sql Tue Jul 14 15:26:36 2009
@@ -4,17 +4,27 @@
 
 CREATE TABLE meetme (
 	confno char(80) DEFAULT '0' NOT NULL,
+	-- Web booking id for the conference
+	bookId char(50) NULL,
 	-- Must set schedule=yes in meetme.conf to use starttime and endtime
 	starttime datetime NULL,
 	endtime datetime NULL,
 	-- PIN to enter the conference, if any
-	pin char(20) NULL,
+	pin char(30) NULL,
+	-- Options to associate with normal users of the conference
+	opts char(100) NULL,
 	-- PIN to enter the conference as an administrator, if any
-	adminpin char(20) NULL,
+	adminpin char(30) NULL,
+	-- Options to associate with administrator users of the conference
+	adminopts char(100) NULL,
 	-- Current count of conference participants
 	members integer DEFAULT 0 NOT NULL,
 	-- Maximum conference participants allowed concurrently
 	maxusers integer DEFAULT 0 NOT NULL,
+	-- Recording of the conference, if any
+	recordingfilename char(255) NULL,
+	-- File format of the conference recording, if any
+	recordingformat char(10) NULL,
 	PRIMARY KEY (confno, starttime)
 );