Use continual gathering to restore backup connections

webrtc/api/webrtcsession.cc

 /*
  *  Copyright 2012 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 1110 matching lines @@
   std::string error;
   bool res = transport_controller_->RemoveRemoteCandidates(candidates, &error);
   if (!res && !error.empty()) {
     LOG(LS_ERROR) << "Error when removing remote candidates: " << error;
   }
   return true;
 }
 
 cricket::IceConfig WebRtcSession::ParseIceConfig(
     const PeerConnectionInterface::RTCConfiguration& config) const {
-  cricket::IceConfig ice_config;
-  ice_config.receiving_timeout = config.ice_connection_receiving_timeout;
-  ice_config.prioritize_most_likely_candidate_pairs =
-      config.prioritize_most_likely_ice_candidate_pairs;
-  ice_config.backup_connection_ping_interval =
-      config.ice_backup_candidate_pair_ping_interval;
-  ice_config.gather_continually = (config.continual_gathering_policy ==
-                                   PeerConnectionInterface::GATHER_CONTINUALLY);
-  return ice_config;
+  cricket::ContinualGatheringPolicy gathering_policy;
+  // TODO(honghaiz): Add the third continual gathering policy in
+  // PeerConnectionInterface and map it to GATHER_CONTINUALLY_AND_RECOVER.
+  switch (config.continual_gathering_policy) {
+    case PeerConnectionInterface::GATHER_ONCE:
+      gathering_policy = cricket::GATHER_ONCE;
+      break;
+    case PeerConnectionInterface::GATHER_CONTINUALLY:
+      gathering_policy = cricket::GATHER_CONTINUALLY;
+      break;
+    default:
+      RTC_DCHECK(false);
+      gathering_policy = cricket::GATHER_ONCE;
+  }
+  return cricket::IceConfig(
+      config.ice_connection_receiving_timeout,
+      config.ice_backup_candidate_pair_ping_interval, gathering_policy,
+      config.prioritize_most_likely_ice_candidate_pairs,
+      -1 /* stable_writable_connection_ping_interval_ms */,
+      false /* presumed_writable_when_fully_relayed */,
+      -1 /* regather_on_failed_networks_interval */);

[pthatcher1, 2016/06/29 18:53:27]

This seems less readable to me.  Setting them each, one per line, seemed more
readable, especially for values that you just keep the default (like the stable
writable connection ping interval).

[honghaiz3, 2016/06/29 20:19:22]

Done.

 }
 
 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) {
   transport_controller_->SetIceConfig(config);
 }
 
 void WebRtcSession::MaybeStartGathering() {
   transport_controller_->MaybeStartGathering();
 }
 
@@ skipping 837 matching lines @@
                                                   ssl_cipher_suite);
   }
 }
 
 void WebRtcSession::OnSentPacket_w(const rtc::SentPacket& sent_packet) {
   RTC_DCHECK(worker_thread()->IsCurrent());
   media_controller_->call_w()->OnSentPacket(sent_packet);
 }
 
 }  // namespace webrtc