kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meetme fixes (bug #1729)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-27 14:35:26 +00:00
parent b820fd0075
commit 03cb980dc2
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/app_meetme.c
View File

@@ -47,8 +47,9 @@ static char *synopsis3 = "MeetMe conference Administration";
static char *descrip = static char *descrip =
" MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe conference.\n" " MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe conference.\n"
"If the conference number is omitted, the user will be prompted to enter\n" "If the conference number is omitted, the user will be prompted to enter\n"
"one. This application always returns -1. A ZAPTEL INTERFACE MUST BE\n" "one. \n"
"INSTALLED FOR CONFERENCING TO WORK!\n\n" "MeetMe returns 0 if user pressed # to exit (see option 'p'), otherwise -1.\n"
"Please note: A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING TO WORK!\n\n"
"The option string may contain zero or more of the following characters:\n" "The option string may contain zero or more of the following characters:\n"
" 'm' -- set monitor only mode (Listen only, no talking)\n" " 'm' -- set monitor only mode (Listen only, no talking)\n"
@@ -1021,7 +1022,7 @@ static int count_exec(struct ast_channel *chan, void *data)
char *confnum, *localdata; char *confnum, *localdata;
char val[80] = "0"; char val[80] = "0";
if (!data || !strlen(data)) { if (!data || ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "MeetMeCount requires an argument (conference number)\n"); ast_log(LOG_WARNING, "MeetMeCount requires an argument (conference number)\n");
return -1; return -1;
} }
@@ -1034,7 +1035,7 @@ static int count_exec(struct ast_channel *chan, void *data)
else else
count = 0; count = 0;
if (localdata && strlen(localdata)){ if (localdata && !ast_strlen_zero(localdata)){
/* have var so load it and exit */ /* have var so load it and exit */
snprintf(val,sizeof(val), "%i",count); snprintf(val,sizeof(val), "%i",count);
pbx_builtin_setvar_helper(chan, localdata,val); pbx_builtin_setvar_helper(chan, localdata,val);
@@ -1061,7 +1062,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
int empty = 0, empty_no_pin = 0; int empty = 0, empty_no_pin = 0;
char *notdata, *info, *inflags = NULL, *inpin = NULL, the_pin[AST_MAX_EXTENSION] = ""; char *notdata, *info, *inflags = NULL, *inpin = NULL, the_pin[AST_MAX_EXTENSION] = "";
if (!data || !strlen(data)) { if (!data || ast_strlen_zero(data)) {
allowretry = 1; allowretry = 1;
notdata = ""; notdata = "";
} else { } else {
@@ -1076,7 +1077,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
if (info) { if (info) {
char *tmp = strsep(&info, "|"); char *tmp = strsep(&info, "|");
strncpy(confno, tmp, sizeof(confno)); strncpy(confno, tmp, sizeof(confno));
if (strlen(confno) == 0) { if (ast_strlen_zero(confno)) {
allowretry = 1; allowretry = 1;
} }
} }
@@ -1198,7 +1199,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
} }
/* Not found? */ /* Not found? */
if (!strlen(confno)) { if (ast_strlen_zero(confno)) {
res = ast_streamfile(chan, "conf-noempty", chan->language); res = ast_streamfile(chan, "conf-noempty", chan->language);
if (!res) if (!res)
ast_waitstream(chan, ""); ast_waitstream(chan, "");
@@ -1212,7 +1213,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
} }
} }
} }
while (allowretry && (!strlen(confno)) && (++retrycnt < 4)) { while (allowretry && (ast_strlen_zero(confno)) && (++retrycnt < 4)) {
/* Prompt user for conference number */ /* Prompt user for conference number */
res = ast_app_getdata(chan, "conf-getconfno", confno, sizeof(confno) - 1, 0); res = ast_app_getdata(chan, "conf-getconfno", confno, sizeof(confno) - 1, 0);
if (res < 0) { if (res < 0) {
@@ -1222,7 +1223,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
break; break;
} }
} }
if (strlen(confno)) { if (!ast_strlen_zero(confno)) {
/* Check the validity of the conference */ /* Check the validity of the conference */
cnf = find_conf(chan, confno, 1, dynamic, the_pin); cnf = find_conf(chan, confno, 1, dynamic, the_pin);
if (!cnf) { if (!cnf) {
@@ -1233,7 +1234,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
if (allowretry) if (allowretry)
strcpy(confno, ""); strcpy(confno, "");
} else { } else {
if (strlen(cnf->pin)) { if (!ast_strlen_zero(cnf->pin)) {
char pin[AST_MAX_EXTENSION]; char pin[AST_MAX_EXTENSION];
if (*the_pin) { if (*the_pin) {
@@ -1301,7 +1302,7 @@ static int admin_exec(struct ast_channel *chan, void *data) {
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
/* The param has the conference number the user and the command to execute */ /* The param has the conference number the user and the command to execute */
if (data && strlen(data)) { if (data && !ast_strlen_zero(data)) {
params = ast_strdupa((char *) data); params = ast_strdupa((char *) data);
conf = strsep(&params, "|"); conf = strsep(&params, "|");
command = strsep(&params, "|"); command = strsep(&params, "|");