kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 87970 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2007-11-01 01:55:38 +00:00
parent 284721fdb1
commit 78cae359c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@@ -1654,7 +1654,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
goto outrun; goto outrun;
} }
retryzap = strcasecmp(chan->tech->type, "Zap"); retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->audiohooks ? 1 : 0);
user->zapchannel = !retryzap; user->zapchannel = !retryzap;
zapretry: zapretry:
@@ -2039,14 +2039,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
break; break;
if (c) { if (c) {
if (c->fds[0] != origfd) { if (c->fds[0] != origfd || (user->zapchannel && chan->audiohooks)) {
if (using_pseudo) { if (using_pseudo) {
/* Kill old pseudo */ /* Kill old pseudo */
close(fd); close(fd);
using_pseudo = 0; using_pseudo = 0;
} }
ast_debug(1, "Ooh, something swapped out under us, starting over\n"); 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; user->zapchannel = !retryzap;
goto zapretry; goto zapretry;
} }