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

Flush MeetMe at appropriate times (bug #3599)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-03 23:33:11 +00:00
parent 418eefb9dc
commit 50ef0504c6
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/app_meetme.c
View File

@@ -536,6 +536,16 @@ static int confnonzero(void *ptr)
return res;
}
static void conf_flush(int fd)
{
int x;
x = ZT_FLUSH_ALL;
if (ioctl(fd, ZT_FLUSH, x)) {
ast_log(LOG_WARNING, "Error flushing channel\n");
close(fd);
}
}
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags)
{
struct ast_conference *prev=NULL, *cur;
@@ -785,6 +795,7 @@ zapretry:
ast_mutex_unlock(&conflock);
goto outrun;
}
conf_flush(fd);
ast_log(LOG_DEBUG, "Placed channel %s in ZAP conf %d\n", chan->name, conf->zapconf);
manager_event(EVENT_FLAG_CALL, "MeetmeJoin",
@@ -960,6 +971,15 @@ zapretry:
ret = 0;
break;
} else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) {
int oldconfmode = 0;
oldconfmode = ztc.confmode;
ztc.confmode = 0;
if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference\n");
close(fd);
ast_mutex_unlock(&conflock);
goto outrun;
}
if (musiconhold) {
ast_moh_stop(chan);
}
@@ -1075,6 +1095,14 @@ zapretry:
if (musiconhold) {
ast_moh_start(chan, NULL);
}
ztc.confmode = oldconfmode;
if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference\n");
close(fd);
ast_mutex_unlock(&conflock);
goto outrun;
}
conf_flush(fd);
} else if (option_debug) {
ast_log(LOG_DEBUG, "Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",chan->name,f->frametype,f->subclass);
}