From b9027295d73bb51b75326ea2d09d74a451e1ac34 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 5 Mar 2005 15:25:08 +0000
Subject: [PATCH] Fix meetme flushing stupidity (doh!) (bug #3599)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_meetme.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 269e6c5ea4..ff70b5e654 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -540,10 +540,8 @@ static void conf_flush(int fd)
{
int x;
x = ZT_FLUSH_ALL;
- if (ioctl(fd, ZT_FLUSH, x)) {
+ 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)
@@ -795,7 +793,6 @@ 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",
@@ -810,6 +807,7 @@ zapretry:
if (!(confflags & CONFFLAG_QUIET))
conf_play(chan, conf, ENTER);
}
+ conf_flush(fd);
ast_mutex_unlock(&conflock);
if (confflags & CONFFLAG_AGI) {
--
GitLab