diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 17:48:28 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 17:48:28 +0000 |
| commit | fe1b795950dd271013118d153e9b000581a21173 (patch) | |
| tree | 2abea2109ff8cb7257182afe341dd3f4cceee9d5 /main | |
| parent | 1d903667ba0357aceb792c4baf4ad5435bdda4c5 (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.0@224775 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 0ce0ae9a6..9782aae24 100644 --- a/main/features.c +++ b/main/features.c @@ -1988,10 +1988,12 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call 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)) { @@ -2027,6 +2029,8 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call } } } + } else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) { + ast_write(chan, f); } if (f) ast_frfree(f); |