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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183067 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 9c3eeaf8f3342dfdace55c3b6e212e3beeb4029f..7afa49dd6c168b286a95d87ba44872bcd8651104 100644 (file)
--- 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);