Add a continual_gathering_policy in PeerConnection RTCConfiguration

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 121 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;
 };
 
+struct IceConfig {
+  int receiving_timeout_ms = -1;
+  bool continue_getting_ports = false;

[pthatcher1, 2015/09/25 17:37:47]

We need to comment what effect these have here.

[honghaiz3, 2015/09/25 20:10:20]

Done.

+};
+
 bool BadTransportDescription(const std::string& desc, std::string* err_desc);
 
 bool IceCredentialsChanged(const std::string& old_ufrag,
                            const std::string& old_pwd,
                            const std::string& new_ufrag,
                            const std::string& new_pwd);
 
 class Transport : public sigslot::has_slots<> {
  public:
   Transport(const std::string& name, PortAllocator* allocator);
@@ skipping 38 matching lines @@
 
   // Returns whether the client has requested the channels to connect.
   bool connect_requested() const { return connect_requested_; }
 
   void SetIceRole(IceRole role);
   IceRole ice_role() const { return ice_role_; }
 
   void SetIceTiebreaker(uint64 IceTiebreaker) { tiebreaker_ = IceTiebreaker; }
   uint64 IceTiebreaker() { return tiebreaker_; }
 
-  void SetChannelReceivingTimeout(int timeout_ms);
+  void SetIceConfig(const IceConfig& config);
 
   // Must be called before applying local session description.
   virtual void SetLocalCertificate(
       const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {}
 
   // Get a copy of the local certificate provided by SetLocalCertificate.
   virtual bool GetLocalCertificate(
       rtc::scoped_refptr<rtc::RTCCertificate>* certificate) {
     return false;
   }
@@ skipping 181 matching lines @@
   PortAllocator* const allocator_;
   bool channels_destroyed_ = false;
   TransportState readable_ = TRANSPORT_STATE_NONE;
   TransportState writable_ = TRANSPORT_STATE_NONE;
   TransportState receiving_ = TRANSPORT_STATE_NONE;
   bool was_writable_ = false;
   bool connect_requested_ = false;
   IceRole ice_role_ = ICEROLE_UNKNOWN;
   uint64 tiebreaker_ = 0;
   IceMode remote_ice_mode_ = ICEMODE_FULL;
-  int channel_receiving_timeout_ = -1;
+  IceConfig ice_config_;
   rtc::scoped_ptr<TransportDescription> local_description_;
   rtc::scoped_ptr<TransportDescription> remote_description_;
   bool local_description_set_ = false;
   bool remote_description_set_ = false;
   IceGatheringState gathering_state_ = kIceGatheringNew;
 
   ChannelMap channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Transport);
 };
 
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORT_H_