Index: webrtc/p2p/base/transportdescriptionfactory.cc |
diff --git a/webrtc/p2p/base/transportdescriptionfactory.cc b/webrtc/p2p/base/transportdescriptionfactory.cc |
index 61e2a9f3463bc16472bcfcbd01ef0f3d412712b2..8133bf0912b1f8d5e175b27ef99dd7f25fdef431 100644 |
--- a/webrtc/p2p/base/transportdescriptionfactory.cc |
+++ b/webrtc/p2p/base/transportdescriptionfactory.cc |
@@ -56,7 +56,8 @@ TransportDescription* TransportDescriptionFactory::CreateOffer( |
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 " << |
@@ -91,7 +92,7 @@ TransportDescription* TransportDescriptionFactory::CreateAnswer( |
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"; |