diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-27 15:31:09 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-27 15:31:09 +0000 |
commit | 8ce7f28b4c2cb1fbe79b82f470a696ea9d477761 (patch) | |
tree | 1867edca5ecf2e01a23cc8f11b7ba67c3d47773c /main/rtp.c | |
parent | 31b8fe50815817a3b89c8cb17e5aec3d6286c2f1 (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: http://svn.digium.com/svn/asterisk/trunk@104533 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
-rw-r--r-- | main/rtp.c | 6 |
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) |