kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document all meetme realtime fields, and in the process, make some field lengths more consistent.

Browse Source 
(closes issue #15493)
 Reported by: lasko
 Patches: 
       meetme.diff uploaded by lasko (license 833)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@206567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-07-14 20:14:45 +00:00
parent b9e898017e
commit b13740d1b1
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_meetme.c
View File

@@ -658,7 +658,7 @@ static int rt_log_members;
#define MAX_CONFNUM 80 #define MAX_CONFNUM 80
#define MAX_PIN 80 #define MAX_PIN 80
#define OPTIONS_LEN 32 #define OPTIONS_LEN 100
enum announcetypes { enum announcetypes {
CONF_HASJOIN, CONF_HASJOIN,
@@ -1892,7 +1892,7 @@ static int rt_extend_conf(const char *confno)
struct timeval now; struct timeval now;
struct ast_tm tm; struct ast_tm tm;
struct ast_variable *var, *orig_var; struct ast_variable *var, *orig_var;
char bookid[8]; char bookid[51];
if (!extendby) { if (!extendby) {
return 0; return 0;
@@ -3433,13 +3433,13 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
int maxusers = 0; int maxusers = 0;
struct timeval now; struct timeval now;
char recordingfilename[256] = ""; char recordingfilename[256] = "";
char recordingformat[10] = ""; char recordingformat[11] = "";
char currenttime[19] = ""; char currenttime[19] = "";
char eatime[19] = ""; char eatime[19] = "";
char bookid[19] = ""; char bookid[51] = "";
char recordingtmp[AST_MAX_EXTENSION] = ""; char recordingtmp[AST_MAX_EXTENSION] = "";
char useropts[OPTIONS_LEN]; /* Used for RealTime conferences */ char useropts[OPTIONS_LEN + 1]; /* Used for RealTime conferences */
char adminopts[OPTIONS_LEN]; char adminopts[OPTIONS_LEN + 1];
struct ast_tm tm, etm; struct ast_tm tm, etm;
struct timeval endtime = { .tv_sec = 0 }; struct timeval endtime = { .tv_sec = 0 };
const char *var2; const char *var2;
@@ -3503,11 +3503,11 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
} else if (!strcasecmp(var->name, "bookId")) { } else if (!strcasecmp(var->name, "bookId")) {
ast_copy_string(bookid, var->value, sizeof(bookid)); ast_copy_string(bookid, var->value, sizeof(bookid));
} else if (!strcasecmp(var->name, "opts")) { } 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")) { } else if (!strcasecmp(var->name, "maxusers")) {
maxusers = atoi(var->value); maxusers = atoi(var->value);
} else if (!strcasecmp(var->name, "adminopts")) { } 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")) { } else if (!strcasecmp(var->name, "recordingfilename")) {
ast_copy_string(recordingfilename, var->value, sizeof(recordingfilename)); ast_copy_string(recordingfilename, var->value, sizeof(recordingfilename));
} else if (!strcasecmp(var->name, "recordingformat")) { } else if (!strcasecmp(var->name, "recordingformat")) {

14
contrib/scripts/meetme.sql
View File

@@ -4,17 +4,27 @@
CREATE TABLE meetme ( CREATE TABLE meetme (
confno char(80) DEFAULT '0' NOT NULL, 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 -- Must set schedule=yes in meetme.conf to use starttime and endtime
starttime datetime NULL, starttime datetime NULL,
endtime datetime NULL, endtime datetime NULL,
-- PIN to enter the conference, if any -- 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 -- 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 -- Current count of conference participants
members integer DEFAULT 0 NOT NULL, members integer DEFAULT 0 NOT NULL,
-- Maximum conference participants allowed concurrently -- Maximum conference participants allowed concurrently
maxusers integer DEFAULT 0 NOT NULL, 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) PRIMARY KEY (confno, starttime)
); );