Fixed invalid filtering of SCTP datachannel packets on high ports.

webrtc/media/sctp/sctptransport.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 19 matching lines @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/rtputils.h"  // For IsRtpPacket
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"  // For PF_NORMAL
 
 namespace {
 
 // The biggest SCTP packet. Starting from a 'safe' wire MTU value of 1280,
 // take off 80 bytes for DTLS/TURN/TCP/IP overhead.
 static constexpr size_t kSctpMtu = 1200;
 
 // The size of the SCTP association send buffer.  256kB, the usrsctp default.
@@ skipping 770 matching lines @@
 // Called by network interface when a packet has been received.
 void SctpTransport::OnPacketRead(rtc::PacketTransportInternal* transport,
                                  const char* data,
                                  size_t len,
                                  const rtc::PacketTime& packet_time,
                                  int flags) {
   RTC_DCHECK_RUN_ON(network_thread_);
   RTC_DCHECK_EQ(transport_channel_, transport);
   TRACE_EVENT0("webrtc", "SctpTransport::OnPacketRead");
 
-  // TODO(pthatcher): Do this in a more robust way by checking for
-  // SCTP or DTLS.
-  if (IsRtpPacket(data, len)) {
+  if (flags & PF_SRTP_BYPASS) {
+    // We are only interested in SCTP packets.
     return;
   }
 
   LOG(LS_VERBOSE) << debug_name_ << "->OnPacketRead(...): "
                   << " length=" << len << ", started: " << started_;
   // Only give receiving packets to usrsctp after if connected. This enables two
   // peers to each make a connect call, but for them not to receive an INIT
   // packet before they have called connect; least the last receiver of the INIT
   // packet will have called connect, and a connection will be established.
   if (sock_) {
@@ skipping 238 matching lines @@
       }
     }
   }
 
   // Always try to send the queued RESET because this call indicates that the
   // last local RESET or remote RESET has made some progress.
   SendQueuedStreamResets();
 }
 
 }  // namespace cricket