Modified PeerConnection and WebRtcSession for end-to-end QuicDataChannel usage.

webrtc/api/quicdatatransport.cc

 /*
  *  Copyright 2016 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.
  */
 
 #include "webrtc/api/quicdatatransport.h"
 
+#include "webrtc/base/bind.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/p2p/quic/quictransportchannel.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
 
 namespace webrtc {
 
-QuicDataTransport::QuicDataTransport(rtc::Thread* signaling_thread,
-                                     rtc::Thread* worker_thread,
-                                     rtc::Thread* network_thread)
+QuicDataTransport::QuicDataTransport(
+    rtc::Thread* signaling_thread,
+    rtc::Thread* worker_thread,
+    rtc::Thread* network_thread,
+    cricket::TransportController* transport_controller)
     : signaling_thread_(signaling_thread),
       worker_thread_(worker_thread),
-      network_thread_(network_thread) {
+      network_thread_(network_thread),
+      transport_controller_(transport_controller) {
   RTC_DCHECK(signaling_thread_);
   RTC_DCHECK(worker_thread_);
   RTC_DCHECK(network_thread_);
 }
 
-QuicDataTransport::~QuicDataTransport() {}
+QuicDataTransport::~QuicDataTransport() {
+  DestroyTransportChannels();

[pthatcher1, 2016/07/27 23:21:49]

DestroyTransportChannel(quic_transport_channel_);

[Zhi Huang, 2016/08/01 05:12:28]

Done.

+  LOG(LS_INFO) << "Destroyed the QUIC data transport.";
+}
+
+bool QuicDataTransport::SetTransport(const std::string& transport_name) {
+  if (transport_name_ == transport_name) {
+    // Nothing to do if transport name isn't changing
+    return true;
+  }
+

[pthatcher1, 2016/07/27 23:21:49]

tc = CreateTransportChannel(transport_name);
if (!SetTransportChannel(tc)) {
  DestroyTransportChannel(tc);
  return false;
}

+  SetTransportChannel(CreateTransportChannel(transport_name));
+
+  if (!quic_transport_channel_) {
+    return false;
+  }

[pthatcher1, 2016/07/27 23:21:49]

You don't need this if you have the "return false" above.

[Zhi Huang, 2016/08/01 05:12:28]

Done.

+
+  transport_name_ = transport_name;
+  return true;
+}
 
 bool QuicDataTransport::SetTransportChannel(
     cricket::QuicTransportChannel* channel) {
   if (!channel) {
     LOG(LS_ERROR) << "|channel| is NULL. Cannot set transport channel.";
     return false;
   }
   if (quic_transport_channel_) {
     if (channel == quic_transport_channel_) {
       LOG(LS_WARNING) << "Ignoring duplicate transport channel.";
@@ skipping 99 matching lines @@
     return;
   }
   QuicDataChannel* data_channel = data_channel_kv->second;
   QuicDataChannel::Message message;
   message.id = message_id;
   message.buffer = rtc::CopyOnWriteBuffer(data, len);
   message.stream = stream;
   data_channel->OnIncomingMessage(std::move(message));
 }
 
+cricket::QuicTransportChannel* QuicDataTransport::CreateTransportChannel(
+    const std::string& transport_name) {
+  cricket::TransportChannel* transport_channel =
+      network_thread_->Invoke<cricket::TransportChannel*>(
+          RTC_FROM_HERE,
+          rtc::Bind(&cricket::TransportController::CreateTransportChannel_n,
+                    transport_controller_, transport_name,
+                    cricket::ICE_CANDIDATE_COMPONENT_DEFAULT));
+  if (!transport_channel) {
+    return nullptr;
+  }

[pthatcher1, 2016/07/27 23:21:49]

You don't need this

[Zhi Huang, 2016/08/01 05:12:28]

Done.

+  return static_cast<cricket::QuicTransportChannel*>(transport_channel);
+}
+
+void QuicDataTransport::DestroyTransportChannels() {

[pthatcher1, 2016/07/27 23:21:49]

DestroyTransportChannel(TransportChannel* tc)

+  if (quic_transport_channel_) {

[pthatcher1, 2016/07/27 23:21:49]

if (!tc) {
  return;
}
network_thread_->Invoke<void>(...);

+    network_thread_->Invoke<void>(
+        RTC_FROM_HERE,
+        rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n,
+                  transport_controller_, transport_name_,
+                  cricket::ICE_CANDIDATE_COMPONENT_DEFAULT));
+  }
+}
+
 }  // namespace webrtc