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

Fix meetme flushing stupidity (doh!) (bug #3599)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-05 15:25:08 +00:00
parent a397a88192
commit b9027295d7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@@ -540,10 +540,8 @@ static void conf_flush(int fd)
{ {
int x; int x;
x = ZT_FLUSH_ALL; x = ZT_FLUSH_ALL;
if (ioctl(fd, ZT_FLUSH, x)) { if (ioctl(fd, ZT_FLUSH, &x))
ast_log(LOG_WARNING, "Error flushing channel\n"); ast_log(LOG_WARNING, "Error flushing channel\n");
close(fd);
}
} }
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)
@@ -795,7 +793,6 @@ zapretry:
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
goto outrun; goto outrun;
} }
conf_flush(fd);
ast_log(LOG_DEBUG, "Placed channel %s in ZAP conf %d\n", chan->name, conf->zapconf); ast_log(LOG_DEBUG, "Placed channel %s in ZAP conf %d\n", chan->name, conf->zapconf);
manager_event(EVENT_FLAG_CALL, "MeetmeJoin", manager_event(EVENT_FLAG_CALL, "MeetmeJoin",
@@ -810,6 +807,7 @@ zapretry:
if (!(confflags & CONFFLAG_QUIET)) if (!(confflags & CONFFLAG_QUIET))
conf_play(chan, conf, ENTER); conf_play(chan, conf, ENTER);
} }
conf_flush(fd);
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
if (confflags & CONFFLAG_AGI) { if (confflags & CONFFLAG_AGI) {