aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-02-05 22:28:44 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-02-05 22:28:44 +0000
commit266746c628ac9e8b2db20924b36581c5bfc041f6 (patch)
tree9b7ff5e287339655cfc12fc3b20faa0867c6c47c /apps/app_meetme.c
parenta6d4b1d513f5718b0103f60d97dd97d0145f2626 (diff)
Implement temporary work around for pseudo channels with SMP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2133 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rwxr-xr-xapps/app_meetme.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a49780701..4e86a268a 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -482,6 +482,19 @@ zapretry:
}
}
+#ifndef NO_ZAPTEL_PANIC_WORKAROUND
+ /* Take out of conference */
+ /* Add us to the conference */
+ ztc.chan = 0;
+ ztc.confno = 0;
+ ztc.confmode = 0;
+ if (ioctl(fd, ZT_SETCONF, &ztc)) {
+ ast_log(LOG_WARNING, "Error setting conference\n");
+ }
+ usleep(1);
+ if (fd != chan->fds[0])
+ close(fd);
+#else
if (fd != chan->fds[0])
close(fd);
else {
@@ -494,7 +507,7 @@ zapretry:
ast_log(LOG_WARNING, "Error setting conference\n");
}
}
-
+#endif
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
conf_play(conf, LEAVE);