Accept SDP with TRANSPORT attributes missing from bundled m= sections.

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.
  */
 
@@ skipping 38 matching lines @@
       return NULL;
     }
   }
 
   return desc.release();
 }
 
 TransportDescription* TransportDescriptionFactory::CreateAnswer(
     const TransportDescription* offer,
     const TransportOptions& options,
-    const TransportDescription* current_description) const {
+    const TransportDescription* current_description,
+    bool bundled) 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;
   }
 
   std::unique_ptr<TransportDescription> desc(new TransportDescription());
   // Generate the ICE credentials if we don't already have them or ice is
   // being restarted.
@@ skipping 14 matching lines @@
     if (secure_ == SEC_ENABLED || secure_ == SEC_REQUIRED) {
       // Fail if we can't create the fingerprint.
       // Setting DTLS role to active.
       ConnectionRole role = (options.prefer_passive_role) ?
           CONNECTIONROLE_PASSIVE : CONNECTIONROLE_ACTIVE;
 
       if (!SetSecurityInfo(desc.get(), role)) {
         return NULL;
       }
     }
-  } else if (secure_ == SEC_REQUIRED) {
+  } else if (!bundled && secure_ == SEC_REQUIRED) {
     // We require DTLS, but the other side didn't offer it. Fail.
     LOG(LS_WARNING) << "Failed to create TransportDescription answer "
                        "because of incompatible security settings";
     return NULL;
   }
 
   return desc.release();
 }
 
 bool TransportDescriptionFactory::SetSecurityInfo(
@@ skipping 20 matching lines @@
                   << digest_alg;
     return false;
   }
 
   // Assign security role.
   desc->connection_role = role;
   return true;
 }
 
 }  // namespace cricket