diff options
| author | Mark Spencer <markster@digium.com> | 2004-02-05 22:28:44 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-02-05 22:28:44 +0000 |
| commit | 0dd66bd2e96052c243f5c2605033ecfb636d6d68 (patch) | |
| tree | 9b7ff5e287339655cfc12fc3b20faa0867c6c47c /apps | |
| parent | 8baa1ed52eba57a0098c057bdb1846f42ca3ef50 (diff) | |
Implement temporary work around for pseudo channels with SMP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_meetme.c | 15 |
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); |