mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 19:43:03 +00:00
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
This commit is contained in:
@@ -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])
|
if (fd != chan->fds[0])
|
||||||
close(fd);
|
close(fd);
|
||||||
else {
|
else {
|
||||||
@@ -494,7 +507,7 @@ zapretry:
|
|||||||
ast_log(LOG_WARNING, "Error setting conference\n");
|
ast_log(LOG_WARNING, "Error setting conference\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
|
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
|
||||||
conf_play(conf, LEAVE);
|
conf_play(conf, LEAVE);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user