Implement the "needs-ice-restart" logic for SetConfiguration.

webrtc/p2p/base/jseptransport.cc

 /*
  *  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 158 matching lines @@
     const TransportDescription& description,
     ContentAction action,
     std::string* error_desc) {
   bool ret = true;
 
   if (!VerifyIceParams(description)) {
     return BadTransportDescription("Invalid ice-ufrag or ice-pwd length",
                                    error_desc);
   }
 
+  bool ice_restarting =
+      local_description_set_ &&
+      IceCredentialsChanged(local_description_->ice_ufrag,
+                            local_description_->ice_pwd, description.ice_ufrag,
+                            description.ice_pwd);
   local_description_.reset(new TransportDescription(description));
 
   rtc::SSLFingerprint* local_fp =
       local_description_->identity_fingerprint.get();
 
   if (!local_fp) {
     certificate_ = nullptr;
   } else if (!VerifyCertificateFingerprint(certificate_.get(), local_fp,
                                            error_desc)) {
     return false;
   }
 
   for (const auto& kv : channels_) {
     ret &= ApplyLocalTransportDescription(kv.second, error_desc);
   }
   if (!ret) {
     return false;
   }
 
   // If PRANSWER/ANSWER is set, we should decide transport protocol type.
   if (action == CA_PRANSWER || action == CA_ANSWER) {
     ret &= NegotiateTransportDescription(action, error_desc);
   }
-  if (ret) {
-    local_description_set_ = true;
+  if (!ret) {
+    return false;
   }
 
-  return ret;
+  if (needs_ice_restart_ && ice_restarting) {
+    needs_ice_restart_ = false;
+    LOG(LS_VERBOSE) << "needs-ice-restart flag cleared for transport " << mid();
+  }
+
+  local_description_set_ = true;
+  return true;
 }
 
 bool JsepTransport::SetRemoteTransportDescription(
     const TransportDescription& description,
     ContentAction action,
     std::string* error_desc) {
   bool ret = true;
 
   if (!VerifyIceParams(description)) {
     return BadTransportDescription("Invalid ice-ufrag or ice-pwd length",
                                    error_desc);
   }
 
   remote_description_.reset(new TransportDescription(description));
   for (const auto& kv : channels_) {
     ret &= ApplyRemoteTransportDescription(kv.second, error_desc);
   }
 
   // If PRANSWER/ANSWER is set, we should decide transport protocol type.
   if (action == CA_PRANSWER || action == CA_ANSWER) {
     ret = NegotiateTransportDescription(CA_OFFER, error_desc);
   }
   if (ret) {
     remote_description_set_ = true;
   }
 
   return ret;
 }
 
+void JsepTransport::SetNeedsIceRestartFlag() {
+  if (!needs_ice_restart_) {
+    needs_ice_restart_ = true;
+    LOG(LS_VERBOSE) << "needs-ice-restart flag set for transport " << mid();
+  }
+}
+
+bool JsepTransport::NeedsIceRestart() const {
+  return needs_ice_restart_;
+}
+
 void JsepTransport::GetSslRole(rtc::SSLRole* ssl_role) const {
   RTC_DCHECK(ssl_role);
   *ssl_role = secure_role_;
 }
 
 bool JsepTransport::GetStats(TransportStats* stats) {
   stats->transport_name = mid();
   stats->channel_stats.clear();
   for (auto& kv : channels_) {
     TransportChannelImpl* channel = kv.second;
@@ skipping 184 matching lines @@
     }
 
     // If local is passive, local will act as server.
   }
 
   *ssl_role = is_remote_server ? rtc::SSL_CLIENT : rtc::SSL_SERVER;
   return true;
 }
 
 }  // namespace cricket