Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/p2p/base/transportcontroller.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
 #define WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/transport.h"
 
 namespace rtc {
 class Thread;
 }
 
 namespace cricket {
 
+class P2PTransportChannel;
+class QuicTransportChannel;
+
 class TransportController : public sigslot::has_slots<>,
                             public rtc::MessageHandler {
  public:
   TransportController(rtc::Thread* signaling_thread,
                       rtc::Thread* worker_thread,
                       PortAllocator* port_allocator);
 
   virtual ~TransportController();
 
   rtc::Thread* signaling_thread() const { return signaling_thread_; }
@@ skipping 42 matching lines @@
   // Creates a channel if it doesn't exist. Otherwise, increments a reference
   // count and returns an existing channel.
   virtual TransportChannel* CreateTransportChannel_w(
       const std::string& transport_name,
       int component);
 
   // Decrements a channel's reference count, and destroys the channel if
   // nothing is referencing it.
   virtual void DestroyTransportChannel_w(const std::string& transport_name,
                                          int component);
+  // Activates QUIC usage instead of DTLS if |use_quic| is true and the USE_QUIC
+  // macro is defined.

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

Just say "if USE_QUIC is defined"

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

I made this simpler by putting it behind HAVE_QUIC and setting "quic_ = true"
instead of having a use_quic parameter

+  void set_quic(bool use_quic);
+  bool quic() const { return quic_; }
+  QuicTransportChannel* quic_transport_channel() const;

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

Doesn't this need to be behind USE_QUIC?

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

Yes. Done. (Also removed quic_transport_channel() method)

 
   // All of these signals are fired on the signalling thread.
 
   // If any transport failed => failed,
   // Else if all completed => completed,
   // Else if all connected => connected,
   // Else => connecting
   sigslot::signal1<IceConnectionState> SignalConnectionState;
 
   // Receiving if any transport is receiving
@@ skipping 112 matching lines @@
   IceGatheringState gathering_state_ = kIceGatheringNew;
 
   // TODO(deadbeef): Move the fields below down to the transports themselves
   IceConfig ice_config_;
   IceRole ice_role_ = ICEROLE_CONTROLLING;
   // Flag which will be set to true after the first role switch
   bool ice_role_switch_ = false;
   uint64_t ice_tiebreaker_ = rtc::CreateRandomId64();
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::AsyncInvoker invoker_;
+
+  // True if QUIC is used instead of DTLS.
+  bool quic_ = false;
+#ifdef USE_QUIC
+  rtc::scoped_ptr<P2PTransportChannel> ice_transport_channel_;
+  // Owned by TransportController. This is not a scoped_ptr because its pointer
+  // is added to |transports_|.
+  QuicTransportChannel* quic_transport_channel_ = nullptr;
+#endif  // USE_QUIC
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_