diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 01:53:55 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 01:53:55 +0000 |
| commit | 0542866293bf0bead0f1c6e18704b2ae88563dd8 (patch) | |
| tree | 021e47fa20ce6a85454d9fb96274b8580a326eb5 /apps | |
| parent | c673de8aa7b1fa3eda3661b2fa379cda6b674eb7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@87970 f38db490-d61c-443f-a65b-d21fe96a405b
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 3da5eaf89..f5aa159fb 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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; } |