aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-18 22:28:43 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-18 22:28:43 +0000
commit044fb6f600a50ca674f7c46655bbef8c0dcb8226 (patch)
treeacae07739738e377f2cbf47397de54e66759ef9f
parent4aeb43d567ea7a04c75ade44f2bc0cb7b57bb19d (diff)
Merged revisions 183057 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r183057 | file | 2009-03-18 19:22:56 -0300 (Wed, 18 Mar 2009) | 6 lines Fix an issue where a T38 control frame would get dropped. If two channels were bridged together using a generic bridge the T38 control frame would get passed up instead of being indicated on the other channel. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@183067 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/channel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 9c3eeaf8f..7afa49dd6 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4496,6 +4496,7 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
case AST_CONTROL_UNHOLD:
case AST_CONTROL_VIDUPDATE:
case AST_CONTROL_SRCUPDATE:
+ case AST_CONTROL_T38:
ast_indicate_data(other, f->subclass, f->data.ptr, f->datalen);
if (jb_in_use) {
ast_jb_empty_and_reset(c0, c1);