Fixed invalid filtering of SCTP datachannel packets on high ports.

webrtc/media/sctp/sctptransport_unittest.cc

 /*
  *  Copyright (c) 2013 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 112 matching lines @@
 };
 
 // SCTP Data Engine testing framework.
 class SctpTransportTest : public testing::Test, public sigslot::has_slots<> {
  protected:
   // usrsctp uses the NSS random number generator on non-Android platforms,
   // so we need to initialize SSL.
   static void SetUpTestCase() {}
 
   void SetupConnectedTransportsWithTwoStreams() {
+    SetupConnectedTransportsWithTwoStreams(kTransport1Port, kTransport2Port);
+  }
+
+  void SetupConnectedTransportsWithTwoStreams(int port1, int port2) {
     fake_dtls1_.reset(new FakeDtlsTransport("fake dtls 1", 0));
     fake_dtls2_.reset(new FakeDtlsTransport("fake dtls 2", 0));
     recv1_.reset(new SctpFakeDataReceiver());
     recv2_.reset(new SctpFakeDataReceiver());
     transport1_.reset(CreateTransport(fake_dtls1_.get(), recv1_.get()));
     transport1_->set_debug_name_for_testing("transport1");
     transport1_->SignalReadyToSendData.connect(
         this, &SctpTransportTest::OnChan1ReadyToSend);
     transport2_.reset(CreateTransport(fake_dtls2_.get(), recv2_.get()));
     transport2_->set_debug_name_for_testing("transport2");
     transport2_->SignalReadyToSendData.connect(
         this, &SctpTransportTest::OnChan2ReadyToSend);
     // Setup two connected transports ready to send and receive.
     bool asymmetric = false;
     fake_dtls1_->SetDestination(fake_dtls2_.get(), asymmetric);
 
     LOG(LS_VERBOSE) << "Transport setup ----------------------------- ";
     AddStream(1);
     AddStream(2);
 
     LOG(LS_VERBOSE) << "Connect the transports -----------------------------";
     // Both transports need to have started (with matching ports) for an
     // association to be formed.
-    transport1_->Start(kTransport1Port, kTransport2Port);
-    transport2_->Start(kTransport2Port, kTransport1Port);
+    transport1_->Start(port1, port2);
+    transport2_->Start(port2, port1);
   }
 
   bool AddStream(int sid) {
     bool ret = true;
     ret = ret && transport1_->OpenStream(sid);
     ret = ret && transport2_->OpenStream(sid);
     return ret;
   }
 
   SctpTransport* CreateTransport(FakeDtlsTransport* fake_dtls,
@@ skipping 276 matching lines @@
 }
 
 // Trying to send data for a nonexistent stream should fail.
 TEST_F(SctpTransportTest, SendDataWithNonexistentStreamFails) {
   SetupConnectedTransportsWithTwoStreams();
   SendDataResult result;
   EXPECT_FALSE(SendData(transport2(), 123, "some data", &result));
   EXPECT_EQ(SDR_ERROR, result);
 }
 
+TEST_F(SctpTransportTest, SendDataHighPorts) {
+  SetupConnectedTransportsWithTwoStreams(32768, 32769);
+
+  SendDataResult result;
+  ASSERT_TRUE(SendData(transport1(), 1, "hello?", &result));
+  EXPECT_EQ(SDR_SUCCESS, result);
+  EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hello?"), kDefaultTimeout);
+
+  ASSERT_TRUE(SendData(transport2(), 2, "hi transport1", &result));
+  EXPECT_EQ(SDR_SUCCESS, result);
+  EXPECT_TRUE_WAIT(ReceivedData(receiver1(), 2, "hi transport1"),
+                   kDefaultTimeout);
+}
+
 TEST_F(SctpTransportTest, ClosesRemoteStream) {
   SetupConnectedTransportsWithTwoStreams();
   SignalTransportClosedObserver transport1_sig_receiver,
       transport2_sig_receiver;
   transport1_sig_receiver.BindSelf(transport1());
   transport2_sig_receiver.BindSelf(transport2());
 
   SendDataResult result;
   ASSERT_TRUE(SendData(transport1(), 1, "hello?", &result));
   EXPECT_EQ(SDR_SUCCESS, result);
@@ skipping 90 matching lines @@
   AddStream(1);
   ASSERT_TRUE(SendData(transport1(), 1, "hi?", &result));
   EXPECT_EQ(SDR_SUCCESS, result);
   EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hi?"), kDefaultTimeout);
   transport1()->ResetStream(1);
   EXPECT_TRUE_WAIT(transport2_sig_receiver.StreamCloseCount(1) == 2,
                    kDefaultTimeout);
 }
 
 }  // namespace cricket