Revert of TransportController refactoring.

webrtc/p2p/base/p2ptransportchannel.h

 /*
  *  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.
  */
 
@@ skipping 33 matching lines @@
 
  private:
   PortInterface* origin_port_;
 };
 
 // P2PTransportChannel manages the candidates and connection process to keep
 // two P2P clients connected to each other.
 class P2PTransportChannel : public TransportChannelImpl,
                             public rtc::MessageHandler {
  public:
-  P2PTransportChannel(const std::string& transport_name,
+  P2PTransportChannel(const std::string& content_name,
                       int component,
                       P2PTransport* transport,
-                      PortAllocator* allocator);
-  virtual ~P2PTransportChannel();
+                      PortAllocator *allocator);
+  ~P2PTransportChannel() override;
 
   // From TransportChannelImpl:
   Transport* GetTransport() override { return transport_; }
   TransportChannelState GetState() const override;
   void SetIceRole(IceRole role) override;
   IceRole GetIceRole() const override { return ice_role_; }
   void SetIceTiebreaker(uint64 tiebreaker) override;
   void SetIceCredentials(const std::string& ice_ufrag,
                          const std::string& ice_pwd) override;
   void SetRemoteIceCredentials(const std::string& ice_ufrag,
                                const std::string& ice_pwd) override;
   void SetRemoteIceMode(IceMode mode) override;
   void Connect() override;
-  void MaybeStartGathering() override;
-  IceGatheringState gathering_state() const override {
-    return gathering_state_;
-  }
-  void AddRemoteCandidate(const Candidate& candidate) override;
+  void OnSignalingReady() override;
+  void OnCandidate(const Candidate& candidate) override;
   // Sets the receiving timeout in milliseconds.
   // This also sets the check_receiving_delay proportionally.
   void SetReceivingTimeout(int receiving_timeout_ms) override;
 
   // From TransportChannel:
-  int SendPacket(const char* data,
-                 size_t len,
-                 const rtc::PacketOptions& options,
-                 int flags) override;
+  int SendPacket(const char *data, size_t len,
+                 const rtc::PacketOptions& options, int flags) override;
   int SetOption(rtc::Socket::Option opt, int value) override;
   bool GetOption(rtc::Socket::Option opt, int* value) override;
   int GetError() override { return error_; }
   bool GetStats(std::vector<ConnectionInfo>* stats) override;
 
   const Connection* best_connection() const { return best_connection_; }
   void set_incoming_only(bool value) { incoming_only_ = value; }
 
   // Note: This is only for testing purpose.
   // |ports_| should not be changed from outside.
   const std::vector<PortInterface*>& ports() { return ports_; }
 
   IceMode remote_ice_mode() const { return remote_ice_mode_; }
 
   // DTLS methods.
   bool IsDtlsActive() const override { return false; }
 
   // Default implementation.
-  bool GetSslRole(rtc::SSLRole* role) const override { return false; }
+  bool GetSslRole(rtc::SSLRole* role) const override {
+    return false;
+  }
 
-  bool SetSslRole(rtc::SSLRole role) override { return false; }
+  bool SetSslRole(rtc::SSLRole role) override {
+    return false;
+  }
 
   // Set up the ciphers to use for DTLS-SRTP.
   bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override {
     return false;
   }
 
   // Find out which DTLS-SRTP cipher was negotiated.
-  bool GetSrtpCipher(std::string* cipher) override { return false; }
+  bool GetSrtpCipher(std::string* cipher) override {
+    return false;
+  }
 
   // Find out which DTLS cipher was negotiated.
-  bool GetSslCipher(std::string* cipher) override { return false; }
+  bool GetSslCipher(std::string* cipher) override {
+    return false;
+  }
 
   // Returns null because the channel is not encrypted by default.
   rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const override {
     return nullptr;
   }
 
   bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override {
     return false;
   }
 
@@ skipping 27 matching lines @@
 
   // Public for unit tests.
   Connection* FindNextPingableConnection();
 
  private:
   rtc::Thread* thread() { return worker_thread_; }
   PortAllocatorSession* allocator_session() {
     return allocator_sessions_.back();
   }
 
+  void Allocate();
   void UpdateConnectionStates();
   void RequestSort();
   void SortConnections();
   void SwitchBestConnectionTo(Connection* conn);
   void UpdateChannelState();
   void HandleWritable();
   void HandleNotWritable();
   void HandleAllTimedOut();
 
   Connection* GetBestConnectionOnNetwork(rtc::Network* network) const;
@@ skipping 27 matching lines @@
   void OnRoleConflict(PortInterface* port);
 
   void OnConnectionStateChange(Connection* connection);
   void OnReadPacket(Connection *connection, const char *data, size_t len,
                     const rtc::PacketTime& packet_time);
   void OnReadyToSend(Connection* connection);
   void OnConnectionDestroyed(Connection *connection);
 
   void OnNominated(Connection* conn);
 
-  void OnMessage(rtc::Message* pmsg) override;
+  void OnMessage(rtc::Message *pmsg) override;
   void OnSort();
   void OnPing();
 
   void OnCheckReceiving();
 
   void PruneConnections();
   Connection* best_nominated_connection() const;
 
   P2PTransport* transport_;
-  PortAllocator* allocator_;
-  rtc::Thread* worker_thread_;
+  PortAllocator *allocator_;
+  rtc::Thread *worker_thread_;
   bool incoming_only_;
+  bool waiting_for_signaling_;
   int error_;
   std::vector<PortAllocatorSession*> allocator_sessions_;
   std::vector<PortInterface *> ports_;
   std::vector<Connection *> connections_;
   Connection* best_connection_;
   // Connection selected by the controlling agent. This should be used only
   // at controlled side when protocol type is RFC5245.
   Connection* pending_best_connection_;
   std::vector<RemoteCandidate> remote_candidates_;
   bool sort_dirty_;  // indicates whether another sort is needed right now
   bool was_writable_;
-  bool had_connection_ = false;  // if connections_ has ever been nonempty
   typedef std::map<rtc::Socket::Option, int> OptionMap;
   OptionMap options_;
   std::string ice_ufrag_;
   std::string ice_pwd_;
   std::string remote_ice_ufrag_;
   std::string remote_ice_pwd_;
   IceMode remote_ice_mode_;
   IceRole ice_role_;
   uint64 tiebreaker_;
   uint32 remote_candidate_generation_;
-  IceGatheringState gathering_state_;
 
   int check_receiving_delay_;
   int receiving_timeout_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_