Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/p2p/base/transportcontroller.cc

 /*
  *  Copyright 2015 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/p2p/base/transportcontroller.h"
 
 #include <algorithm>
 
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/dtlstransport.h"
 #include "webrtc/p2p/base/p2ptransport.h"
 #include "webrtc/p2p/base/port.h"
 
+#ifdef USE_QUIC
+#include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/p2p/quic/quictransportchannel.h"
+#endif  // USE_QUIC
+
 namespace cricket {
 
 enum {
   MSG_ICECONNECTIONSTATE,
   MSG_RECEIVING,
   MSG_ICEGATHERINGSTATE,
   MSG_CANDIDATESGATHERED,
 };
 
 struct CandidatesData : public rtc::MessageData {
@@ skipping 180 matching lines @@
 
 const rtc::scoped_refptr<rtc::RTCCertificate>&
 TransportController::certificate_for_testing() {
   return certificate_;
 }
 
 Transport* TransportController::CreateTransport_w(
     const std::string& transport_name) {
   RTC_DCHECK(worker_thread_->IsCurrent());
 
+#ifdef USE_QUIC
+  if (quic_) {
+    ice_transport_channel_.reset(

[Taylor Brandstetter, 2016/04/01 23:23:42]

If you decide to force "one QUIC channel per PeerConnection", this should fail
if you try to create a second one.

If you decide to allow multiple QUIC channels, then you shouldn't store
ice_transport_channel_ and quic_transport_channel_.

[mikescarlett, 2016/04/05 19:58:52]

This uses QuicTransport now. QuicTransport owns the channels.

+        new P2PTransportChannel(transport_name, 0, port_allocator()));
+    quic_transport_channel_ =
+        new QuicTransportChannel(ice_transport_channel_.get());
+    return quic_transport_channel_;
+  }
+#endif  // USE_QUIC
   Transport* transport = new DtlsTransport<P2PTransport>(
       transport_name, port_allocator(), certificate_);
   return transport;
 }
 
 Transport* TransportController::GetTransport_w(
     const std::string& transport_name) {
   RTC_DCHECK(worker_thread_->IsCurrent());
 
   auto iter = transports_.find(transport_name);
@@ skipping 412 matching lines @@
     new_gathering_state = kIceGatheringGathering;
   }
   if (gathering_state_ != new_gathering_state) {
     gathering_state_ = new_gathering_state;
     signaling_thread_->Post(
         this, MSG_ICEGATHERINGSTATE,
         new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
   }
 }
 
+void TransportController::set_quic(bool use_quic) {
+#ifdef USE_QUIC
+  quic_ = use_quic;
+#endif  // USE_QUIC

[pthatcher1, 2016/03/30 20:34:50]

This doesn't need USE_QUIC, does it?

[mikescarlett, 2016/04/05 19:58:53]

Fixed.

+}
+
+QuicTransportChannel* TransportController::quic_transport_channel() const {
+#ifdef USE_QUIC
+  if (quic_transport_channel_ != nullptr) {
+    return quic_transport_channel_;
+  }
+#endif  // USE_QUIC
+  return nullptr;

[pthatcher1, 2016/03/30 20:34:50]

We should probably do an RTC_DCHECK if we don't put the whole method behind
USE_QUIC.

[mikescarlett, 2016/04/05 19:58:53]

This is behind HAVE_QUIC.

+}
+
 }  // namespace cricket