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

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.

Browse Source 
(closes issue #10060)
Reported by: mparker


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@87970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-11-01 01:53:55 +00:00
parent f43de2908a
commit 7ee6cdf0c7
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

@@ -1572,7 +1572,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->spies ? 1 : 0);
user->zapchannel = !retryzap;
zapretry:
@@ -1890,14 +1890,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->spies)) {
if (using_pseudo) {
/* Kill old pseudo */
close(fd);
using_pseudo = 0;
}
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
retryzap = strcasecmp(c->tech->type, "Zap");
retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0);
user->zapchannel = !retryzap;
goto zapretry;
}