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

ensure that conference created by new caller who fails to enter a PIN is destroyed (bug #4613)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-07 22:36:40 +00:00
parent f268ea2b3c
commit d39c932f20
1 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
apps/app_meetme.c
View File

@@ -568,9 +568,50 @@ static void conf_flush(int fd)
ast_log(LOG_WARNING, "Error flushing channel\n"); ast_log(LOG_WARNING, "Error flushing channel\n");
} }
/* Remove the conference from the list and free it.
We assume that this was called while holding conflock. */
static int conf_free(struct ast_conference *conf)
{
struct ast_conference *prev = NULL, *cur = confs;
while(cur) {
if (cur == conf) {
if (prev)
prev->next = conf->next;
else
confs = conf->next;
break;
}
prev = cur;
cur = cur->next;
}
if (!cur)
ast_log(LOG_WARNING, "Conference not found\n");
if (conf->recording == MEETME_RECORD_ACTIVE) {
conf->recording = MEETME_RECORD_TERMINATE;
ast_mutex_unlock(&conflock);
while (1) {
ast_mutex_lock(&conflock);
if (conf->recording == MEETME_RECORD_OFF)
break;
ast_mutex_unlock(&conflock);
}
}
if (conf->chan)
ast_hangup(conf->chan);
else
close(conf->fd);
free(conf);
return 0;
}
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags) static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags)
{ {
struct ast_conference *prev=NULL, *cur;
struct ast_conf_user *user = malloc(sizeof(struct ast_conf_user)); struct ast_conf_user *user = malloc(sizeof(struct ast_conf_user));
struct ast_conf_user *usr = NULL; struct ast_conf_user *usr = NULL;
int fd; int fd;
@@ -1278,41 +1319,12 @@ outrun:
"Meetme: %s\r\n" "Meetme: %s\r\n"
"Usernum: %d\r\n", "Usernum: %d\r\n",
chan->name, chan->uniqueid, conf->confno, user->user_no); chan->name, chan->uniqueid, conf->confno, user->user_no);
prev = NULL;
conf->users--; conf->users--;
if (confflags & CONFFLAG_MARKEDUSER) if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers--; conf->markedusers--;
cur = confs;
if (!conf->users) { if (!conf->users) {
/* No more users -- close this one out */ /* No more users -- close this one out */
while(cur) { conf_free(conf);
if (cur == conf) {
if (prev)
prev->next = conf->next;
else
confs = conf->next;
break;
}
prev = cur;
cur = cur->next;
}
if (!cur)
ast_log(LOG_WARNING, "Conference not found\n");
if (conf->recording == MEETME_RECORD_ACTIVE) {
conf->recording = MEETME_RECORD_TERMINATE;
ast_mutex_unlock(&conflock);
while (1) {
ast_mutex_lock(&conflock);
if (conf->recording == MEETME_RECORD_OFF)
break;
ast_mutex_unlock(&conflock);
}
}
if (conf->chan)
ast_hangup(conf->chan);
else
close(conf->fd);
free(conf);
} else { } else {
/* Remove the user struct */ /* Remove the user struct */
if (user == conf->firstuser) { if (user == conf->firstuser) {
@@ -1678,8 +1690,15 @@ static int conf_exec(struct ast_channel *chan, void *data)
confno[0] = '\0'; confno[0] = '\0';
} }
} else { } else {
/* failed when getting the pin */
res = -1; res = -1;
allowretry = 0; allowretry = 0;
/* see if we need to get rid of the conference */
ast_mutex_lock(&conflock);
if (!cnf->users) {
conf_free(cnf);
}
ast_mutex_unlock(&conflock);
break; break;
} }
@@ -1698,8 +1717,9 @@ static int conf_exec(struct ast_channel *chan, void *data)
} }
} }
} while (allowretry); } while (allowretry);
/* Do the conference */
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return res; return res;
} }