Implement Turn/Turn first logic for connection selection.

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.
  */
 
 // P2PTransportChannel wraps up the state management of the connection between
 // two P2P clients.  Clients have candidate ports for connecting, and
 // connections which are combinations of candidates from each end (Alice and
 // Bob each have candidates, one candidate from Alice and one candidate from
 // Bob are used to make a connection, repeat to make many connections).
 //
 // When all of the available connections become invalid (non-writable), we
 // kick off a process of determining more candidates and more connections.
 //
 #ifndef WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
 #define WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2ptransport.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/p2p/base/transport.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/sigslot.h"
 
 namespace cricket {
 
 extern const uint32_t WEAK_PING_DELAY;
+extern const uint32_t MAX_CURRENT_STRONG_DELAY;
 
 struct IceParameters {
   std::string ufrag;
   std::string pwd;
   IceParameters(const std::string& ice_ufrag, const std::string& ice_pwd)
       : ufrag(ice_ufrag), pwd(ice_pwd) {}
 
   bool operator==(const IceParameters& other) {
     return ufrag == other.ufrag && pwd == other.pwd;
   }
@@ skipping 36 matching lines @@
   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;
   // Sets the receiving timeout and gather_continually.
   // This also sets the check_receiving_delay proportionally.
   void SetIceConfig(const IceConfig& config) override;
+  IceConfig GetIceConfig() const;
 
   // From TransportChannel:
   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;
@@ skipping 73 matching lines @@
   PortAllocatorSession* allocator_session() {
     return allocator_sessions_.back();
   }
 
   // Public for unit tests.
   const std::vector<RemoteCandidate>& remote_candidates() const {
     return remote_candidates_;
   }
 
  private:
+  // This class maintains the std::vector interface to allow enumeration and
+  // wraps the logic of determining the next pingable connection. Connections[0]
+  // is always the candidate of the best connection after sorted.
+  class Connections : public std::vector<Connection*> {

[pthatcher1, 2016/01/27 19:59:58]

This seems a little crazy.

[guoweis_webrtc, 2016/02/29 18:03:00]

Removed the class.

+   public:
+    typedef std::vector<Connection*> Base;
+    Connections(P2PTransportChannel* channel);
+    void enable_most_likely_first(bool enable);
+    bool most_likely_first() const { return ping_most_likely_first_; }
+    iterator erase(iterator pos);
+    void push_back(Connection*& connection);
+    Connection* FindNextPingableConnection(uint32_t now);
+    void MarkConnectionPinged(Connection* connection);
+
+   private:
+    // Disallow any modifier functions.
+    using Base::erase;
+    using Base::insert;
+    using Base::emplace;
+    using Base::emplace_back;
+    using Base::pop_back;
+    using Base::push_back;
+    using Base::clear;
+    using Base::resize;
+    using Base::swap;
+
+    // Between |conn1| and |conn2|, this function returns the one which should
+    // be pinged first.
+    Connection* Compare(Connection* conn1, Connection* conn2);
+
+    bool IsTurnTurn(Connection* conn);
+
+    P2PTransportChannel* channel_ = nullptr;
+    bool ping_most_likely_first_ = false;
+
+    std::set<Connection*> pinged_connections_;
+    std::set<Connection*> unpinged_connections_;
+  };
+
   rtc::Thread* thread() { return worker_thread_; }
   bool IsGettingPorts() { return allocator_session()->IsGettingPorts(); }
 
   // A transport channel is weak if the current best connection is either
   // not receiving or not writable, or if there is no best connection at all.
   bool weak() const;
   void UpdateConnectionStates();
   void RequestSort();
   void SortConnections();
   void SwitchBestConnectionTo(Connection* conn);
@@ skipping 67 matching lines @@
                : static_cast<uint32_t>(remote_ice_parameters_.size() - 1);
   }
 
   P2PTransport* transport_;
   PortAllocator* allocator_;
   rtc::Thread* worker_thread_;
   bool incoming_only_;
   int error_;
   std::vector<PortAllocatorSession*> allocator_sessions_;
   std::vector<PortInterface *> ports_;
-  std::vector<Connection *> connections_;
+  Connections 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 had_connection_ = false;  // if connections_ has ever been nonempty
   typedef std::map<rtc::Socket::Option, int> OptionMap;
   OptionMap options_;
   std::string ice_ufrag_;
@@ skipping 11 matching lines @@
   bool gather_continually_ = false;
   int weak_ping_delay_ = WEAK_PING_DELAY;
   TransportChannelState state_ = TransportChannelState::STATE_INIT;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_