Update prflx candidates' generation when setting ICE credentials.

webrtc/p2p/base/port.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 90 matching lines @@
   rtc::SocketAddress address;
   ProtocolType proto;
   bool secure;
 
   ProtocolAddress(const rtc::SocketAddress& a, ProtocolType p)
       : address(a), proto(p), secure(false) { }
   ProtocolAddress(const rtc::SocketAddress& a, ProtocolType p, bool sec)
       : address(a), proto(p), secure(sec) { }
 };
 
+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;
+  }
+  bool operator!=(const IceParameters& other) { return !(*this == other); }
+};
+
 typedef std::set<rtc::SocketAddress> ServerAddresses;
 
 // Represents a local communication mechanism that can be used to create
 // connections to similar mechanisms of the other client.  Subclasses of this
 // one add support for specific mechanisms like local UDP ports.
 class Port : public PortInterface, public rtc::MessageHandler,
              public sigslot::has_slots<> {
  public:
   Port(rtc::Thread* thread,
        rtc::PacketSocketFactory* factory,
@@ skipping 446 matching lines @@
 
   // Invoked when Connection receives STUN error response with 487 code.
   void HandleRoleConflictFromPeer();
 
   State state() const { return state_; }
 
   IceMode remote_ice_mode() const { return remote_ice_mode_; }
 
   uint32_t ComputeNetworkCost() const;
 
+  // Update the ICE password and/or generation of the remote candidate if a
+  // ufrag in |remote_ice_parameters| matches the candidate's ufrag, and the
+  // candidate's password and/or ufrag has not been set.
+  // |remote_ice_parameters| should be a list of known ICE parameters ordered
+  // by generation.
+  void MaybeSetRemoteIceCredentialsAndGeneration(
+      const std::vector<IceParameters>& remote_ice_parameters);
+
   // Update the ICE password of the remote candidate if |ice_ufrag| matches
   // the candidate's ufrag, and the candidate's passwrod has not been set.
   void MaybeSetRemoteIceCredentials(const std::string& ice_ufrag,
                                     const std::string& ice_pwd);
 
   // If |remote_candidate_| is peer reflexive and is equivalent to
   // |new_candidate| except the type, update |remote_candidate_| to
   // |new_candidate|.
   void MaybeUpdatePeerReflexiveCandidate(const Candidate& new_candidate);
 
@@ skipping 80 matching lines @@
            const rtc::PacketOptions& options) override;
   int GetError() override { return error_; }
 
  private:
   int error_ = 0;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_PORT_H_