summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2008-02-27 15:31:09 +0000
committerJoshua Colp <jcolp@digium.com>2008-02-27 15:31:09 +0000
commitdca12f4aa70a3aacaf2e4cba97ea0e94a6452486 (patch)
tree1867edca5ecf2e01a23cc8f11b7ba67c3d47773c /main
parent4aff24881b2ce9c99ba867811c31f239ad968e2f (diff)
Fix T38 passthrough regression introduced by state changes.
(closes issue #12078) Reported by: dimas Patches: v1-12078.patch uploaded by dimas (license 88) (closes issue #12074) Reported by: Ivan git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/rtp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c
index f7078de5e..f5e22a953 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3359,7 +3359,8 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
} else if ((fr->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS)) {
if ((fr->subclass == AST_CONTROL_HOLD) ||
(fr->subclass == AST_CONTROL_UNHOLD) ||
- (fr->subclass == AST_CONTROL_VIDUPDATE)) {
+ (fr->subclass == AST_CONTROL_VIDUPDATE) ||
+ (fr->subclass == AST_CONTROL_T38)) {
if (fr->subclass == AST_CONTROL_HOLD) {
/* If we someone went on hold we want the other side to reinvite back to us */
if (who == c0)
@@ -3597,7 +3598,8 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
} else if ((fr->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS)) {
if ((fr->subclass == AST_CONTROL_HOLD) ||
(fr->subclass == AST_CONTROL_UNHOLD) ||
- (fr->subclass == AST_CONTROL_VIDUPDATE)) {
+ (fr->subclass == AST_CONTROL_VIDUPDATE) ||
+ (fr->subclass == AST_CONTROL_T38)) {
/* If we are going on hold, then break callback mode and P2P bridging */
if (fr->subclass == AST_CONTROL_HOLD) {
if (p0_callback)