diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-11-01 01:55:38 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-11-01 01:55:38 +0000 |
| commit | 78cae359c8bb19a0ca22c7a5d6ebe3c7e26fc4b5 (patch) | |
| tree | 4e91139e160d9b11ec5212ac9f327f03c88b8f44 /apps | |
| parent | 284721fdb13c225ed23d98a10a5b3fb7dd510d4f (diff) | |
Merged revisions 87970 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r87970 | file | 2007-10-31 22:53:55 -0300 (Wed, 31 Oct 2007) | 4 lines
If a Zap channel contains a spy or a spy is added take it out of the conference in kernel space and make it go through Asterisk so the spy gets audio from both sides.
(closes issue #10060)
Reported by: mparker
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 50b5116ee..7b67d6b23 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1654,7 +1654,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c goto outrun; } - retryzap = strcasecmp(chan->tech->type, "Zap"); + retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0); user->zapchannel = !retryzap; zapretry: @@ -2039,14 +2039,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c break; if (c) { - if (c->fds[0] != origfd) { + if (c->fds[0] != origfd || (user->zapchannel && chan->audiohooks)) { if (using_pseudo) { /* Kill old pseudo */ close(fd); using_pseudo = 0; } ast_debug(1, "Ooh, something swapped out under us, starting over\n"); - retryzap = strcasecmp(c->tech->type, "Zap"); + retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0); user->zapchannel = !retryzap; goto zapretry; } |