TransportController refactoring

webrtc/p2p/base/dtlstransport.h

 /*
  *  Copyright 2012 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_DTLSTRANSPORT_H_
 #define WEBRTC_P2P_BASE_DTLSTRANSPORT_H_
 
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/transport.h"
 
 namespace rtc {
 class SSLIdentity;
 }
 
 namespace cricket {
 
 class PortAllocator;
 
 // Base should be a descendant of cricket::Transport
 template<class Base>
 class DtlsTransport : public Base {

[pthatcher1, 2015/08/10 20:40:17]

Can you comment that everything in this class should be called on the worker
thread?

[Taylor Brandstetter, 2015/08/11 01:20:07]

Done. Added comment to its base class (Transport) as well.

  public:
-  DtlsTransport(rtc::Thread* signaling_thread,
-                rtc::Thread* worker_thread,
-                const std::string& content_name,
+  DtlsTransport(const std::string& content_name,
                 PortAllocator* allocator,
                 rtc::SSLIdentity* identity)
-      : Base(signaling_thread, worker_thread, content_name, allocator),
+      : Base(content_name, allocator),
         identity_(identity),
         secure_role_(rtc::SSL_CLIENT),
         ssl_max_version_(rtc::SSL_PROTOCOL_DTLS_10) {
   }
 
   ~DtlsTransport() {
     Base::DestroyAllChannels();
   }
-  virtual void SetIdentity_w(rtc::SSLIdentity* identity) {
+
+  virtual void SetIdentity(rtc::SSLIdentity* identity) {
     identity_ = identity;
   }
-  virtual bool GetIdentity_w(rtc::SSLIdentity** identity) {
+  virtual bool GetIdentity(rtc::SSLIdentity** identity) {
     if (!identity_)
       return false;
 
     *identity = identity_->GetReference();
     return true;
   }
 
-  virtual bool SetSslMaxProtocolVersion_w(rtc::SSLProtocolVersion version) {
+  virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version) {
     ssl_max_version_ = version;
     return true;
   }
 
-  virtual bool ApplyLocalTransportDescription_w(TransportChannelImpl* channel,
+  virtual bool ApplyLocalTransportDescription(TransportChannelImpl* channel,
                                                 std::string* error_desc) {
     rtc::SSLFingerprint* local_fp =
         Base::local_description()->identity_fingerprint.get();
 
     if (local_fp) {
       // Sanity check local fingerprint.
       if (identity_) {
         rtc::scoped_ptr<rtc::SSLFingerprint> local_fp_tmp(
             rtc::SSLFingerprint::Create(local_fp->algorithm,
                                               identity_));
@@ skipping 13 matching lines @@
     } else {
       identity_ = NULL;
     }
 
     if (!channel->SetLocalIdentity(identity_)) {
       return BadTransportDescription("Failed to set local identity.",
                                      error_desc);
     }
 
     // Apply the description in the base class.
-    return Base::ApplyLocalTransportDescription_w(channel, error_desc);
+    return Base::ApplyLocalTransportDescription(channel, error_desc);
   }
 
-  virtual bool NegotiateTransportDescription_w(ContentAction local_role,
+  virtual bool NegotiateTransportDescription(ContentAction local_role,
                                                std::string* error_desc) {
     if (!Base::local_description() || !Base::remote_description()) {
       const std::string msg = "Local and Remote description must be set before "
                               "transport descriptions are negotiated";
       return BadTransportDescription(msg, error_desc);
     }
 
     rtc::SSLFingerprint* local_fp =
         Base::local_description()->identity_fingerprint.get();
     rtc::SSLFingerprint* remote_fp =
@@ skipping 77 matching lines @@
       return BadTransportDescription(
           "Local fingerprint supplied when caller didn't offer DTLS.",
           error_desc);
     } else {
       // We are not doing DTLS
       remote_fingerprint_.reset(new rtc::SSLFingerprint(
           "", NULL, 0));
     }
 
     // Now run the negotiation for the base class.
-    return Base::NegotiateTransportDescription_w(local_role, error_desc);
+    return Base::NegotiateTransportDescription(local_role, error_desc);
   }
 
   virtual DtlsTransportChannelWrapper* CreateTransportChannel(int component) {
     DtlsTransportChannelWrapper* channel = new DtlsTransportChannelWrapper(
         this, Base::CreateTransportChannel(component));
     channel->SetSslMaxProtocolVersion(ssl_max_version_);
     return channel;
   }
 
   virtual void DestroyTransportChannel(TransportChannelImpl* channel) {
     // Kind of ugly, but this lets us do the exact inverse of the create.
     DtlsTransportChannelWrapper* dtls_channel =
         static_cast<DtlsTransportChannelWrapper*>(channel);
     TransportChannelImpl* base_channel = dtls_channel->channel();
     delete dtls_channel;
     Base::DestroyTransportChannel(base_channel);
   }
 
-  virtual bool GetSslRole_w(rtc::SSLRole* ssl_role) const {
+  virtual bool GetSslRole(rtc::SSLRole* ssl_role) const {
     ASSERT(ssl_role != NULL);
     *ssl_role = secure_role_;
     return true;
   }
 
- private:
-  virtual bool ApplyNegotiatedTransportDescription_w(
+  bool ApplyNegotiatedTransportDescription(
       TransportChannelImpl* channel,
-      std::string* error_desc) {
+      std::string* error_desc) override {
     // Set ssl role. Role must be set before fingerprint is applied, which
     // initiates DTLS setup.
     if (!channel->SetSslRole(secure_role_)) {
       return BadTransportDescription("Failed to set ssl role for the channel.",
                                      error_desc);
     }
     // Apply remote fingerprint.
     if (!channel->SetRemoteFingerprint(
             remote_fingerprint_->algorithm,
             reinterpret_cast<const uint8*>(remote_fingerprint_->digest.data()),
             remote_fingerprint_->digest.size())) {
       return BadTransportDescription("Failed to apply remote fingerprint.",
                                      error_desc);
     }
-    return Base::ApplyNegotiatedTransportDescription_w(channel, error_desc);
+    return Base::ApplyNegotiatedTransportDescription(channel, error_desc);
   }
 
+ private:
   rtc::SSLIdentity* identity_;
   rtc::SSLRole secure_role_;
   rtc::SSLProtocolVersion ssl_max_version_;
   rtc::scoped_ptr<rtc::SSLFingerprint> remote_fingerprint_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_DTLSTRANSPORT_H_