Prepare for ICE-renomination

webrtc/p2p/base/transport.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 144 matching lines @@
 // Information about all the channels of a transport.
 // TODO(hta): Consider if a simple vector is as good as a map.
 typedef std::vector<TransportChannelStats> TransportChannelStatsList;
 
 // Information about the stats of a transport.
 struct TransportStats {
   std::string transport_name;
   TransportChannelStatsList channel_stats;
 };
 
+// ICE Nomination mode.

[pthatcher1, 2016/08/03 22:13:25]

Can you move the definitions of these from the other comment to this comment?

[honghaiz3, 2016/08/03 23:39:52]

Done. I kept the details of SEMI_AGGRESSIVE in p2ptransportchannel. It is
probably more readable. 

+enum class NominationMode { REGULAR, AGGRESSIVE, SEMI_AGGRESSIVE };
+
 // Information about ICE configuration.
 // TODO(deadbeef): Use rtc::Optional to represent unset values, instead of
 // -1.
 struct IceConfig {
   // The ICE connection receiving timeout value in milliseconds.
   int receiving_timeout = -1;
   // Time interval in milliseconds to ping a backup connection when the ICE
   // channel is strongly connected.
   int backup_connection_ping_interval = -1;
 
@@ skipping 17 matching lines @@
 
   // Interval to check on all networks and to perform ICE regathering on any
   // active network having no connection on it.
   rtc::Optional<int> regather_on_failed_networks_interval;
 
   // The time period in which we will not switch the selected connection
   // when a new connection becomes receiving but the selected connection is not
   // in case that the selected connection may become receiving soon.
   rtc::Optional<int> receiving_switching_delay;
 
+  // Default nomination mode if the remote does not support renomination.
+  NominationMode default_nomination_mode = NominationMode::SEMI_AGGRESSIVE;

[pthatcher1, 2016/08/03 22:13:25]

Can you put a TODO to change it to REGULAR? 

[honghaiz3, 2016/08/03 23:39:52]

Done.

+
   IceConfig() {}
   IceConfig(int receiving_timeout_ms,
             int backup_connection_ping_interval,
             ContinualGatheringPolicy gathering_policy,
             bool prioritize_most_likely_candidate_pairs,
             int stable_writable_connection_ping_interval_ms,
             bool presume_writable_when_fully_relayed,
             int regather_on_failed_networks_interval_ms,
             int receiving_switching_delay_ms)
       : receiving_timeout(receiving_timeout_ms),
@@ skipping 189 matching lines @@
 
   ChannelMap channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Transport);
 };
 
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORT_H_