dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Add a missing unlock and properly handle the 'maxusers' setting on MeetMe 

conferences.  We were using the 'user number' field to compare against the
maximum allowed users, which works assuming users with lower user numbers
didn't leave the conference.

(closes issue #14117)
Reported by: sergedevorop
Patches:
      20090114__bug14117-2.diff.txt uploaded by seanbright (license 71)
Tested by: sergedevorop


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@168705 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
seanbright 2009-01-15 15:33:18 +00:00
parent 8b3460cd69
commit e9b322f930
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@ -2187,10 +2187,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
user->user_no = AST_LIST_LAST(&conf->userlist)->user_no + 1;
if (rt_schedule && conf->maxusers)
if (user->user_no > conf->maxusers) {
if (conf->users >= conf->maxusers) {
/* Sorry, but this confernce has reached the participant limit! */
if (!ast_streamfile(chan, "conf-full", chan->language))
ast_waitstream(chan, "");
ast_mutex_unlock(&conf->playlock);
user->user_no = 0;
goto outrun;
}