Use continual gathering to restore backup connections

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 250 matching lines @@
                                PortInterface* origin_port);
   bool IsPingable(const Connection* conn, int64_t now) const;
   bool IsSelectedConnectionPingable(int64_t now);
   int CalculateActiveWritablePingInterval(const Connection* conn,
                                           int64_t now) const;
   void PingConnection(Connection* conn);
   void AddAllocatorSession(std::unique_ptr<PortAllocatorSession> session);
   void AddConnection(Connection* connection);
 
   void OnPortReady(PortAllocatorSession *session, PortInterface* port);
+  // TODO(honghaiz): Merge the two methods OnPortsRemoved and OnPortPruned but
+  // still log the reason of removing.
+  void OnPortsRemoved(PortAllocatorSession* session,
+                      const std::vector<PortInterface*>& ports);
   void OnPortPruned(PortAllocatorSession* session, PortInterface* port);
-  // Returns true if the port is found and removed from |ports_|.
-  bool RemovePort(PortInterface* port);
   void OnCandidatesReady(PortAllocatorSession *session,
                          const std::vector<Candidate>& candidates);
+  void OnCandidatesRemoved(PortAllocatorSession* session,
+                           const std::vector<Candidate>& candidates);
   void OnCandidatesAllocationDone(PortAllocatorSession* session);
   void OnUnknownAddress(PortInterface* port,
                         const rtc::SocketAddress& addr,
                         ProtocolType proto,
                         IceMessage* stun_msg,
                         const std::string& remote_username,
                         bool port_muxed);
+
+  // When a port is destroyed, remove it from both lists |ports_|
+  // and |removed_ports_|.
   void OnPortDestroyed(PortInterface* port);
-  void OnPortNetworkInactive(PortInterface* port);
+  // When removing a port, move it from |ports_| to |removed_ports_|.
+  // Returns true if the port is found and removed from |ports_|.
+  bool RemovePort(PortInterface* port);
   void OnRoleConflict(PortInterface* port);
 
   void OnConnectionStateChange(Connection* connection);
   void OnReadPacket(Connection *connection, const char *data, size_t len,
                     const rtc::PacketTime& packet_time);
   void OnSentPacket(const rtc::SentPacket& sent_packet);
   void OnReadyToSend(Connection* connection);
   void OnConnectionDestroyed(Connection *connection);
 
   void OnNominated(Connection* conn);
 
   void OnMessage(rtc::Message* pmsg) override;
   void OnCheckAndPing();
+  void OnRegatherOnFailedNetworks();
 
   // Returns true if the new_connection should be selected for transmission.
   bool ShouldSwitchSelectedConnection(Connection* new_connection) const;
 
   void PruneConnections();
   bool IsBackupConnection(const Connection* conn) const;
 
   Connection* FindConnectionToPing(int64_t now);
   Connection* FindOldestConnectionNeedingTriggeredCheck(int64_t now);
   // Between |conn1| and |conn2|, this function returns the one which should
@@ skipping 69 matching lines @@
   IceConfig config_;
   int last_sent_packet_id_ = -1;  // -1 indicates no packet was sent before.
   bool started_pinging_ = false;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_