commit 644fde40a9c3299efb437680d8f4d1f4889a9375
author Zhi Huang <zhihuang@webrtc.org> Mon Apr 02 19:16:26 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Apr 03 03:04:07 2018 +0000
tree 91e298c08d5495be40db0930a4b7a39d6e3c923b
parent 5b4f075f9c599d49785430e8619f47b7cff1c102

Add nullptr check in SctpTransport.

In previous implementation, the SctpTransport always assumes the
DtlsTransport underneath is non-null, which is not true after switching
to new JsepTransportController model.

This CL adds nullptr when connecting/disconnecting the SctpTransport with
the DtlsTransport.

The "channel" related methods and variables are also renamed.

Bug: chromium:827917, chromium:828220
Change-Id: I95aa2900d23b0885f45500e2c53def771abdccad
Reviewed-on: https://webrtc-review.googlesource.com/66160
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22700}

media/sctp/sctptransport_unittest.cc

diff --git a/media/sctp/sctptransport_unittest.cc b/media/sctp/sctptransport_unittest.cc
index 32e439a..9864d7a 100644
--- a/media/sctp/sctptransport_unittest.cc
+++ b/media/sctp/sctptransport_unittest.cc
@@ -238,16 +238,16 @@
 };
 
 // Test that data can be sent end-to-end when an SCTP transport starts with one
-// transport channel (which is unwritable), and then switches to another
-// channel. A common scenario due to how BUNDLE works.
-TEST_F(SctpTransportTest, SwitchTransportChannel) {
+// transport (which is unwritable), and then switches to another transport. A
+// common scenario due to how BUNDLE works.
+TEST_F(SctpTransportTest, SwitchDtlsTransport) {
   FakeDtlsTransport black_hole("black hole", 0);
   FakeDtlsTransport fake_dtls1("fake dtls 1", 0);
   FakeDtlsTransport fake_dtls2("fake dtls 2", 0);
   SctpFakeDataReceiver recv1;
   SctpFakeDataReceiver recv2;
 
-  // Construct transport1 with the "black hole" channel.
+  // Construct transport1 with the "black hole" transport.
   std::unique_ptr<SctpTransport> transport1(
       CreateTransport(&black_hole, &recv1));
   std::unique_ptr<SctpTransport> transport2(
@@ -261,10 +261,10 @@
   transport1->Start(kTransport1Port, kTransport2Port);
   transport2->Start(kTransport2Port, kTransport1Port);
 
-  // Switch transport1_ to the normal fake_dtls1_ channel.
-  transport1->SetTransportChannel(&fake_dtls1);
+  // Switch transport1_ to the normal fake_dtls1_ transport.
+  transport1->SetDtlsTransport(&fake_dtls1);
 
-  // Connect the two fake DTLS channels.
+  // Connect the two fake DTLS transports.
   bool asymmetric = false;
   fake_dtls1.SetDestination(&fake_dtls2, asymmetric);
 
@@ -274,6 +274,10 @@
   ASSERT_TRUE(SendData(transport2.get(), 1, "bar", &result));
   EXPECT_TRUE_WAIT(ReceivedData(&recv2, 1, "foo"), kDefaultTimeout);
   EXPECT_TRUE_WAIT(ReceivedData(&recv1, 1, "bar"), kDefaultTimeout);
+
+  // Setting a null DtlsTransport should work. This could happen when an SCTP
+  // data section is rejected.
+  transport1->SetDtlsTransport(nullptr);
 }
 
 // Calling Start twice shouldn't do anything bad, if with the same parameters.
@@ -317,7 +321,7 @@
   transport1->Start(kSctpDefaultPort, kSctpDefaultPort);
   transport2->Start(-1, -1);
 
-  // Connect the two fake DTLS channels.
+  // Connect the two fake DTLS transports.
   bool asymmetric = false;
   fake_dtls1.SetDestination(&fake_dtls2, asymmetric);
 
@@ -347,7 +351,7 @@
 }
 
 // Test that SignalReadyToSendData is fired after Start has been called and the
-// DTLS channel is writable.
+// DTLS transport is writable.
 TEST_F(SctpTransportTest, SignalReadyToSendDataAfterDtlsWritable) {
   FakeDtlsTransport fake_dtls("fake dtls", 0);
   SctpFakeDataReceiver recv;