Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/p2p/base/jseptransport.cc

 /*
  *  Copyright 2004 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/jseptransport.h"
-
 #include <memory>
 #include <utility>  // for std::pair
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/p2p/base/jseptransport.h"
+
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace cricket {
 
 static bool VerifyIceParams(const TransportDescription& desc) {
   // For legacy protocols.
   if (desc.ice_ufrag.empty() && desc.ice_pwd.empty())
     return true;
 
   if (desc.ice_ufrag.length() < ICE_UFRAG_MIN_LENGTH ||
       desc.ice_ufrag.length() > ICE_UFRAG_MAX_LENGTH) {
@@ skipping 85 matching lines @@
     }
   }
   return true;
 }
 
 JsepTransport::JsepTransport(
     const std::string& mid,
     const rtc::scoped_refptr<rtc::RTCCertificate>& certificate)
     : mid_(mid), certificate_(certificate) {}
 
-bool JsepTransport::AddChannel(DtlsTransportInternal* dtls, int component) {
+bool JsepTransport::AddChannel(TransportChannelImpl* dtls, int component) {
   if (channels_.find(component) != channels_.end()) {
     LOG(LS_ERROR) << "Adding channel for component " << component << " twice.";
     return false;
   }
   channels_[component] = dtls;
   // Something's wrong if a channel is being added after a description is set.
   // This may currently occur if rtcp-mux is negotiated, then a new m= section
   // is added in a later offer/answer. But this is suboptimal and should be
   // changed; we shouldn't support going from muxed to non-muxed.
   // TODO(deadbeef): Once this is fixed, make the warning an error, and remove
@@ skipping 138 matching lines @@
 
 void JsepTransport::GetSslRole(rtc::SSLRole* ssl_role) const {
   RTC_DCHECK(ssl_role);
   *ssl_role = secure_role_;
 }
 
 bool JsepTransport::GetStats(TransportStats* stats) {
   stats->transport_name = mid();
   stats->channel_stats.clear();
   for (auto& kv : channels_) {
-    DtlsTransportInternal* dtls_transport = kv.second;
+    TransportChannelImpl* channel = kv.second;
     TransportChannelStats substats;
     substats.component = kv.first;
-    dtls_transport->GetSrtpCryptoSuite(&substats.srtp_crypto_suite);
-    dtls_transport->GetSslCipherSuite(&substats.ssl_cipher_suite);
-    substats.dtls_state = dtls_transport->dtls_state();
-    if (!dtls_transport->ice_transport()->GetStats(
-            &substats.connection_infos)) {
+    channel->GetSrtpCryptoSuite(&substats.srtp_crypto_suite);
+    channel->GetSslCipherSuite(&substats.ssl_cipher_suite);
+    substats.dtls_state = channel->dtls_state();
+    if (!channel->GetStats(&substats.connection_infos)) {
       return false;
     }
     stats->channel_stats.push_back(substats);
   }
   return true;
 }
 
 bool JsepTransport::VerifyCertificateFingerprint(
     const rtc::RTCCertificate* certificate,
     const rtc::SSLFingerprint* fingerprint,
@@ skipping 12 matching lines @@
     return true;
   }
   std::ostringstream desc;
   desc << "Local fingerprint does not match identity. Expected: ";
   desc << fp_tmp->ToString();
   desc << " Got: " << fingerprint->ToString();
   return BadTransportDescription(desc.str(), error_desc);
 }
 
 bool JsepTransport::ApplyLocalTransportDescription(
-    DtlsTransportInternal* dtls_transport,
+    TransportChannelImpl* channel,
     std::string* error_desc) {
-  dtls_transport->ice_transport()->SetIceParameters(
-      local_description_->GetIceParameters());
+  channel->SetIceParameters(local_description_->GetIceParameters());
   return true;
 }
 
 bool JsepTransport::ApplyRemoteTransportDescription(
-    DtlsTransportInternal* dtls_transport,
+    TransportChannelImpl* channel,
     std::string* error_desc) {
   // Currently, all ICE-related calls still go through this DTLS channel. But
   // that will change once we get rid of TransportChannelImpl, and the DTLS
   // channel interface no longer includes ICE-specific methods. Then this class
   // will need to call dtls->ice()->SetIceRole(), for example, assuming the Dtls
   // interface will expose its inner ICE channel.
-  dtls_transport->ice_transport()->SetRemoteIceParameters(
-      remote_description_->GetIceParameters());
-  dtls_transport->ice_transport()->SetRemoteIceMode(
-      remote_description_->ice_mode);
+  channel->SetRemoteIceParameters(remote_description_->GetIceParameters());
+  channel->SetRemoteIceMode(remote_description_->ice_mode);
   return true;
 }
 
 bool JsepTransport::ApplyNegotiatedTransportDescription(
-    DtlsTransportInternal* dtls_transport,
+    TransportChannelImpl* channel,
     std::string* error_desc) {
   // Set SSL role. Role must be set before fingerprint is applied, which
   // initiates DTLS setup.
-  if (!dtls_transport->SetSslRole(secure_role_)) {
+  if (!channel->SetSslRole(secure_role_)) {
     return BadTransportDescription("Failed to set SSL role for the channel.",
                                    error_desc);
   }
   // Apply remote fingerprint.
-  if (!dtls_transport->SetRemoteFingerprint(
+  if (!channel->SetRemoteFingerprint(
           remote_fingerprint_->algorithm,
           reinterpret_cast<const uint8_t*>(remote_fingerprint_->digest.data()),
           remote_fingerprint_->digest.size())) {
     return BadTransportDescription("Failed to apply remote fingerprint.",
                                    error_desc);
   }
   return true;
 }
 
 bool JsepTransport::NegotiateTransportDescription(ContentAction local_role,
@@ skipping 107 matching lines @@
     }
 
     // If local is passive, local will act as server.
   }
 
   *ssl_role = is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER;
   return true;
 }
 
 }  // namespace cricket