First step of passive aggressive nomination.

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 487 matching lines @@
   // Called when a connection is determined to be no longer useful to us.  We
   // still keep it around in case the other side wants to use it.  But we can
   // safely stop pinging on it and we can allow it to time out if the other
   // side stops using it as well.
   bool pruned() const { return pruned_; }
   void Prune();
 
   bool use_candidate_attr() const { return use_candidate_attr_; }
   void set_use_candidate_attr(bool enable);
 
+  bool received_use_candidate() const { return received_use_candidate_; }
+  void set_received_use_candidate(bool received) {
+    received_use_candidate_ = received;

[pthatcher1, 2015/08/06 01:41:42]

I think nominated_ would be better.

[honghaiz3, 2015/08/06 18:22:57]

Done.

+  }
+
   void set_remote_ice_mode(IceMode mode) {
     remote_ice_mode_ = mode;
   }
 
   // Makes the connection go away.
   void Destroy();
 
   // Checks that the state of this connection is up-to-date.  The argument is
   // the current time, which is compared against various timeouts.
   void UpdateState(uint32 now);
@@ skipping 73 matching lines @@
   void OnMessage(rtc::Message *pmsg);
 
   Port* port_;
   size_t local_candidate_index_;
   Candidate remote_candidate_;
   ReadState read_state_;
   WriteState write_state_;
   bool connected_;
   bool pruned_;
   // By default |use_candidate_attr_| flag will be true,
-  // as we will be using agrressive nomination.
+  // as we are still using aggressive nomination on the controlling side
+  // although we are moving toward passive-aggressive nomination.

[pthatcher1, 2015/08/06 01:41:42]

I don't think this comment change is necessary.

[honghaiz3, 2015/08/06 18:22:57]

Done.

   // But when peer is ice-lite, this flag "must" be initialized to false and
   // turn on when connection becomes "best connection".
   bool use_candidate_attr_;
+  // Whether this connection has received a stun request with use_candidate
+  // attribute.
+  bool received_use_candidate_;
   IceMode remote_ice_mode_;
   StunRequestManager requests_;
   uint32 rtt_;
   uint32 last_ping_sent_;      // last time we sent a ping to the other side
   uint32 last_ping_received_;  // last time we received a ping from the other
                                // side
   uint32 last_data_received_;
   uint32 last_ping_response_received_;
   std::vector<SentPing> pings_since_last_response_;
 
@@ skipping 22 matching lines @@
                    const rtc::PacketOptions& options);
   virtual int GetError() { return error_; }
 
  private:
   int error_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_PORT_H_