channels/chan_sip: Forbid remote bridging if T.38 is negotiated
authorMatthew Jordan <mjordan@digium.com>
Mon, 16 Jun 2014 02:40:44 +0000 (02:40 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 16 Jun 2014 02:40:44 +0000 (02:40 +0000)
When a framehook is removed - such as the fax gateway framehook - the bridge
framework will re-evaluate the bridge mixing technologies to see if it can
improve the bridging. When this occurs, get_rtp_info will be called to
determine if local or remote bridging can be used. Using remote bridging
will cause a fax to fail, as direct media negotiation will cause some small
number of packets to not arrive at the remote endpoint.

This patch forces local native bridging if T.38 negotiation is in progress or
has been established.
........

Merged revisions 416318 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416319 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 482e6a3..0d89855 100644 (file)
@@ -32441,6 +32441,19 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
                res = AST_RTP_GLUE_RESULT_FORBID;
        }
 
+       if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) {
+               switch (p->t38.state) {
+               case T38_LOCAL_REINVITE:
+               case T38_PEER_REINVITE:
+               case T38_ENABLED:
+                       res = AST_RTP_GLUE_RESULT_LOCAL;
+                       break;
+               case T38_REJECTED:
+               default:
+                       break;
+               }
+       }
+
        if (p->srtp) {
                res = AST_RTP_GLUE_RESULT_FORBID;
        }