Revert of TransportController refactoring.

webrtc/p2p/base/dtlstransportchannel.h

 /*
  *  Copyright 2011 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_DTLSTRANSPORTCHANNEL_H_
 #define WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
 
 #include <string>
 #include <vector>
 
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/bufferqueue.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/stream.h"
 
 namespace cricket {
 
 // A bridge between a packet-oriented/channel-type interface on
 // the bottom and a StreamInterface on the top.
 class StreamInterfaceChannel : public rtc::StreamInterface {
  public:
-  explicit StreamInterfaceChannel(TransportChannel* channel);
+  StreamInterfaceChannel(TransportChannel* channel);
 
   // Push in a packet; this gets pulled out from Read().
   bool OnPacketReceived(const char* data, size_t size);
 
   // Implementations of StreamInterface
   rtc::StreamState GetState() const override { return state_; }
   void Close() override { state_ = rtc::SS_CLOSED; }
-  rtc::StreamResult Read(void* buffer,
-                         size_t buffer_len,
-                         size_t* read,
-                         int* error) override;
-  rtc::StreamResult Write(const void* data,
-                          size_t data_len,
-                          size_t* written,
-                          int* error) override;
+  rtc::StreamResult Read(void* buffer, size_t buffer_len,
+                         size_t* read, int* error) override;
+  rtc::StreamResult Write(const void* data, size_t data_len,
+                          size_t* written, int* error) override;
 
  private:
   TransportChannel* channel_;  // owned by DtlsTransportChannelWrapper
   rtc::StreamState state_;
   rtc::BufferQueue packets_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel);
 };
 
 
@@ skipping 34 matching lines @@
       STATE_CLOSED     // Connection closed.
     };
 
   // The parameters here are:
   // transport -- the DtlsTransport that created us
   // channel -- the TransportChannel we are wrapping
   DtlsTransportChannelWrapper(Transport* transport,
                               TransportChannelImpl* channel);
   ~DtlsTransportChannelWrapper() override;
 
-  void SetIceRole(IceRole role) override { channel_->SetIceRole(role); }
-  IceRole GetIceRole() const override { return channel_->GetIceRole(); }
+  void SetIceRole(IceRole role) override {
+    channel_->SetIceRole(role);
+  }
+  IceRole GetIceRole() const override {
+    return channel_->GetIceRole();
+  }
   bool SetLocalCertificate(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) override;
   rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const override;
 
   bool SetRemoteFingerprint(const std::string& digest_alg,
                             const uint8* digest,
                             size_t digest_len) override;
   bool IsDtlsActive() const override { return dtls_state_ != STATE_NONE; }
 
   // Called to send a packet (via DTLS, if turned on).
-  int SendPacket(const char* data,
-                 size_t size,
+  int SendPacket(const char* data, size_t size,
                  const rtc::PacketOptions& options,
                  int flags) override;
 
   // TransportChannel calls that we forward to the wrapped transport.
   int SetOption(rtc::Socket::Option opt, int value) override {
     return channel_->SetOption(opt, value);
   }
   bool GetOption(rtc::Socket::Option opt, int* value) override {
     return channel_->GetOption(opt, value);
   }
-  int GetError() override { return channel_->GetError(); }
+  int GetError() override {
+    return channel_->GetError();
+  }
   bool GetStats(ConnectionInfos* infos) override {
     return channel_->GetStats(infos);
   }
-  const std::string SessionId() const override { return channel_->SessionId(); }
+  const std::string SessionId() const override {
+    return channel_->SessionId();
+  }
 
   virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version);
 
   // Set up the ciphers to use for DTLS-SRTP. If this method is not called
   // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated.
   // This method should be called before SetupDtls.
   bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override;
 
   // Find out which DTLS-SRTP cipher was negotiated
   bool GetSrtpCipher(std::string* cipher) override;
@@ skipping 19 matching lines @@
                             uint8* result,
                             size_t result_len) override {
     return (dtls_.get()) ? dtls_->ExportKeyingMaterial(label, context,
                                                        context_len,
                                                        use_context,
                                                        result, result_len)
         : false;
   }
 
   // TransportChannelImpl calls.
-  Transport* GetTransport() override { return transport_; }
+  Transport* GetTransport() override {
+    return transport_;
+  }
 
   TransportChannelState GetState() const override {
     return channel_->GetState();
   }
   void SetIceTiebreaker(uint64 tiebreaker) override {
     channel_->SetIceTiebreaker(tiebreaker);
   }
   void SetIceCredentials(const std::string& ice_ufrag,
                          const std::string& ice_pwd) override {
     channel_->SetIceCredentials(ice_ufrag, ice_pwd);
   }
   void SetRemoteIceCredentials(const std::string& ice_ufrag,
                                const std::string& ice_pwd) override {
     channel_->SetRemoteIceCredentials(ice_ufrag, ice_pwd);
   }
   void SetRemoteIceMode(IceMode mode) override {
     channel_->SetRemoteIceMode(mode);
   }
 
   void Connect() override;
 
-  void MaybeStartGathering() override { channel_->MaybeStartGathering(); }
-
-  IceGatheringState gathering_state() const override {
-    return channel_->gathering_state();
+  void OnSignalingReady() override {
+    channel_->OnSignalingReady();
   }
-
-  void AddRemoteCandidate(const Candidate& candidate) override {
-    channel_->AddRemoteCandidate(candidate);
+  void OnCandidate(const Candidate& candidate) override {
+    channel_->OnCandidate(candidate);
   }
 
   void SetReceivingTimeout(int receiving_timeout_ms) override {
     channel_->SetReceivingTimeout(receiving_timeout_ms);
   }
 
   // Needed by DtlsTransport.
   TransportChannelImpl* channel() { return channel_; }
 
  private:
   void OnReadableState(TransportChannel* channel);
   void OnWritableState(TransportChannel* channel);
   void OnReadPacket(TransportChannel* channel, const char* data, size_t size,
                     const rtc::PacketTime& packet_time, int flags);
   void OnReadyToSend(TransportChannel* channel);
   void OnReceivingState(TransportChannel* channel);
   void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err);
   bool SetupDtls();
   bool MaybeStartDtls();
   bool HandleDtlsPacket(const char* data, size_t size);
-  void OnGatheringState(TransportChannelImpl* channel);
-  void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c);
+  void OnRequestSignaling(TransportChannelImpl* channel);
+  void OnCandidateReady(TransportChannelImpl* channel, const Candidate& c);
+  void OnCandidatesAllocationDone(TransportChannelImpl* channel);
   void OnRoleConflict(TransportChannelImpl* channel);
   void OnRouteChange(TransportChannel* channel, const Candidate& candidate);
   void OnConnectionRemoved(TransportChannelImpl* channel);
 
   Transport* transport_;  // The transport_ that created us.
   rtc::Thread* worker_thread_;  // Everything should occur on this thread.
   TransportChannelImpl* channel_;  // Underlying channel, owned by transport_.
   rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_;  // The DTLS stream
   StreamInterfaceChannel* downward_;  // Wrapper for channel_, owned by dtls_.
   std::vector<std::string> srtp_ciphers_;  // SRTP ciphers to use with DTLS.
   State dtls_state_;
   rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_;
   rtc::SSLRole ssl_role_;
   rtc::SSLProtocolVersion ssl_max_version_;
   rtc::Buffer remote_fingerprint_value_;
   std::string remote_fingerprint_algorithm_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_