]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 277530 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Fri, 16 Jul 2010 21:31:49 +0000 (21:31 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Fri, 16 Jul 2010 21:31:49 +0000 (21:31 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r277530 | mnicholson | 2010-07-16 16:24:45 -0500 (Fri, 16 Jul 2010) | 11 lines

  Merged revisions 277497 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r277497 | mnicholson | 2010-07-16 16:18:38 -0500 (Fri, 16 Jul 2010) | 4 lines

    Default to no udptl error correction so that error correction will be disabled in the event that the remote end indicates that they do not support the error correction mode we requested.

    FAX-128
  ........
................

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

channels/chan_sip.c

index bf95bfc2579d73c7e9c4546391b98769b0937d41..9bea51e30bcb5c32ecbdc71488bc2d89c0e6e0ee 100644 (file)
@@ -8324,6 +8324,10 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
                        if (p->t38.state != T38_ENABLED) {
                                memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms));
+
+                               /* default EC to none, the remote end should
+                                * respond with the EC they want to use */
+                               ast_udptl_set_error_correction_scheme(p->udptl, UDPTL_ERROR_CORRECTION_NONE);
                        }
                } else {
                        ast_log(LOG_WARNING, "Unsupported SDP media type in offer: %s\n", m);