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

More meetme locking fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-17 05:21:54 +00:00
parent e5629ea138
commit d11177774a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_meetme.c
View File

@@ -513,7 +513,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} }
} }
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
if (conf->firstuser == NULL) { if (conf->firstuser == NULL) {
/* Fill the first new User struct */ /* Fill the first new User struct */
user->user_no = 1; user->user_no = 1;
@@ -906,13 +906,14 @@ zapretry:
conf_play(conf, LEAVE); conf_play(conf, LEAVE);
outrun: outrun:
ast_mutex_lock(&conflock);
if (user->user_no) { /* Only cleanup users who really joined! */ if (user->user_no) { /* Only cleanup users who really joined! */
manager_event(EVENT_FLAG_CALL, "MeetmeLeave", manager_event(EVENT_FLAG_CALL, "MeetmeLeave",
"Channel: %s\r\n" "Channel: %s\r\n"
"Uniqueid: %s\r\n" "Uniqueid: %s\r\n"
"Meetme: %s\r\n", "Meetme: %s\r\n",
chan->name, chan->uniqueid, conf->confno); chan->name, chan->uniqueid, conf->confno);
ast_mutex_lock(&conflock); prev = NULL;
conf->users--; conf->users--;
cur = confs; cur = confs;
if (!conf->users) { if (!conf->users) {