aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-20 17:46:37 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-20 17:46:37 +0000
commit4b9838db9f32a31259c54ad120b74c546102ce95 (patch)
tree195df27d82dbe7fff989c9c6454b018c78b4f009 /res
parent39fa6e067b555647dab9508d66d14b310b9f49a6 (diff)
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.4@224773 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 7d619c86b..1893b9df0 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1480,10 +1480,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)) {
@@ -1515,6 +1517,8 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call
f = NULL;
break;
}
+ } else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
+ ast_write(chan, f);
}
}
if (f)