Fixing some issues with ICE restart signaling.

webrtc/p2p/base/transportdescriptionfactory.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.
  */
 
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
 
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/messagedigest.h"
 #include "webrtc/base/sslfingerprint.h"
 
 namespace cricket {
 
 TransportDescriptionFactory::TransportDescriptionFactory()
     : secure_(SEC_DISABLED) {
 }
 
 TransportDescription* TransportDescriptionFactory::CreateOffer(
     const TransportOptions& options,
+    bool ice_restart,
     const TransportDescription* current_description) const {
   rtc::scoped_ptr<TransportDescription> desc(new TransportDescription());
 
   // Generate the ICE credentials if we don't already have them.
-  if (!current_description || options.ice_restart) {
+  if (!current_description || ice_restart) {
     desc->ice_ufrag = rtc::CreateRandomString(ICE_UFRAG_LENGTH);
     desc->ice_pwd = rtc::CreateRandomString(ICE_PWD_LENGTH);
   } else {
     desc->ice_ufrag = current_description->ice_ufrag;
     desc->ice_pwd = current_description->ice_pwd;
   }
 
   // If we are trying to establish a secure transport, add a fingerprint.
   if (secure_ == SEC_ENABLED || secure_ == SEC_REQUIRED) {
     // Fail if we can't create the fingerprint.
     // If we are the initiator set role to "actpass".
     if (!SetSecurityInfo(desc.get(), CONNECTIONROLE_ACTPASS)) {
       return NULL;
     }
   }
 
   return desc.release();
 }
 
 TransportDescription* TransportDescriptionFactory::CreateAnswer(
     const TransportDescription* offer,
     const TransportOptions& options,
+    bool ice_restart,
     const TransportDescription* current_description) const {
   // TODO(juberti): Figure out why we get NULL offers, and fix this upstream.
   if (!offer) {
     LOG(LS_WARNING) << "Failed to create TransportDescription answer " <<
         "because offer is NULL";
     return NULL;
   }
 
   rtc::scoped_ptr<TransportDescription> desc(new TransportDescription());
   // Generate the ICE credentials if we don't already have them or ice is
   // being restarted.
-  if (!current_description || options.ice_restart) {
+  if (!current_description || ice_restart) {
     desc->ice_ufrag = rtc::CreateRandomString(ICE_UFRAG_LENGTH);
     desc->ice_pwd = rtc::CreateRandomString(ICE_PWD_LENGTH);
   } else {
     desc->ice_ufrag = current_description->ice_ufrag;
     desc->ice_pwd = current_description->ice_pwd;
   }
 
   // Negotiate security params.
   if (offer && offer->identity_fingerprint.get()) {
     // The offer supports DTLS, so answer with DTLS, as long as we support it.
@@ skipping 41 matching lines @@
                   << digest_alg;
     return false;
   }
 
   // Assign security role.
   desc->connection_role = role;
   return true;
 }
 
 }  // namespace cricket