diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 17:50:05 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 17:50:05 +0000 |
| commit | c75b93c5f9b72e6a77c50c038da3470bf6121f79 (patch) | |
| tree | 7e3d80bf6c2aaae6e312c5daa4e1ea7ab972d1bb /main | |
| parent | 45c350f4779bc0e372b317fd5deea2be43dc48a2 (diff) | |
Merged revisions 224774 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r224774 | file | 2009-10-20 14:47:34 -0300 (Tue, 20 Oct 2009) | 12 lines
Merged revisions 224773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r224773 | file | 2009-10-20 14:46:37 -0300 (Tue, 20 Oct 2009) | 5 lines
Add support for relaying early media in the features attended transfer option.
(closes issue #14828)
Reported by: licedey
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@224777 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index f428c9c22..25a141eb9 100644 --- a/main/features.c +++ b/main/features.c @@ -2248,10 +2248,12 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller, f = NULL; ready=1; break; - } else if (f->subclass != -1) { + } else if (f->subclass != -1 && f->subclass != AST_CONTROL_PROGRESS) { ast_log(LOG_NOTICE, "Don't know what to do about control frame: %d\n", f->subclass); } /* else who cares */ + } else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) { + ast_write(caller, f); } } else if (caller && (active_channel == caller)) { @@ -2285,6 +2287,8 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller, f = NULL; break; } + } else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) { + ast_write(chan, f); } } } |