kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't increment user count until after name has been recorded (if enabled).

Browse Source 
Issue 11048, tested by pep.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@92617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-12-12 21:15:45 +00:00
parent f4bb168b66
commit 4a869fa0c3
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
apps/app_meetme.c
View File

@@ -1406,6 +1406,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
ZT_BUFFERINFO bi; ZT_BUFFERINFO bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET; char *buf = __buf + AST_FRIENDLY_OFFSET;
int setusercount = 0;
if (!(user = ast_calloc(1, sizeof(*user)))) if (!(user = ast_calloc(1, sizeof(*user))))
return ret; return ret;
@@ -1464,9 +1465,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
goto outrun; goto outrun;
} }
if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers++;
ast_mutex_lock(&conf->playlock); ast_mutex_lock(&conf->playlock);
if (AST_LIST_EMPTY(&conf->userlist)) if (AST_LIST_EMPTY(&conf->userlist))
@@ -1480,10 +1478,30 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
user->userflags = confflags; user->userflags = confflags;
user->adminflags = (confflags & CONFFLAG_STARTMUTED) ? ADMINFLAG_SELFMUTED : 0; user->adminflags = (confflags & CONFFLAG_STARTMUTED) ? ADMINFLAG_SELFMUTED : 0;
user->talking = -1; user->talking = -1;
ast_mutex_unlock(&conf->playlock);
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
snprintf(user->namerecloc, sizeof(user->namerecloc),
"%s/meetme/meetme-username-%s-%d", ast_config_AST_SPOOL_DIR,
conf->confno, user->user_no);
if (confflags & CONFFLAG_INTROUSERNOREVIEW)
res = ast_play_and_record(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, 128, 0, NULL);
else
res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
}
ast_mutex_lock(&conf->playlock);
if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers++;
conf->users++; conf->users++;
/* Update table */ /* Update table */
snprintf(members, sizeof(members), "%d", conf->users); snprintf(members, sizeof(members), "%d", conf->users);
ast_update_realtime("meetme", "confno", conf->confno, "members", members , NULL); ast_update_realtime("meetme", "confno", conf->confno, "members", members , NULL);
setusercount = 1;
/* This device changed state now - if this is the first user */ /* This device changed state now - if this is the first user */
if (conf->users == 1) if (conf->users == 1)
@@ -1500,18 +1518,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
ast_copy_string(exitcontext, chan->context, sizeof(exitcontext)); ast_copy_string(exitcontext, chan->context, sizeof(exitcontext));
} }
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
snprintf(user->namerecloc, sizeof(user->namerecloc),
"%s/meetme/meetme-username-%s-%d", ast_config_AST_SPOOL_DIR,
conf->confno, user->user_no);
if (confflags & CONFFLAG_INTROUSERNOREVIEW)
res = ast_play_and_record(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, 128, 0, NULL);
else
res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
}
if ( !(confflags & (CONFFLAG_QUIET | CONFFLAG_NOONLYPERSON)) ) { if ( !(confflags & (CONFFLAG_QUIET | CONFFLAG_NOONLYPERSON)) ) {
if (conf->users == 1 && !(confflags & CONFFLAG_WAITMARKED)) if (conf->users == 1 && !(confflags & CONFFLAG_WAITMARKED))
if (!ast_streamfile(chan, "conf-onlyperson", chan->language)) if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
@@ -2274,12 +2280,14 @@ bailoutandtrynormal:
(long)(now - user->jointime)); (long)(now - user->jointime));
} }
conf->users--; if (setusercount) {
/* Update table */ conf->users--;
snprintf(members, sizeof(members), "%d", conf->users); /* Update table */
ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL); snprintf(members, sizeof(members), "%d", conf->users);
if (confflags & CONFFLAG_MARKEDUSER) ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL);
conf->markedusers--; if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers--;
}
/* Remove ourselves from the list */ /* Remove ourselves from the list */
AST_LIST_REMOVE(&conf->userlist, user, list); AST_LIST_REMOVE(&conf->userlist, user, list);