From fc2f146af22dc5ba8d53d6e9ff1b7a93fa412d24 Mon Sep 17 00:00:00 2001 From: "guoweis@webrtc.org" Date: Wed, 4 Mar 2015 04:50:15 +0000 Subject: [PATCH] Revert "Turn on IPv6 for WebRTC as default as required before ramping the experiment to 30%." This reverts commit bbbdeed2bff31777ca7d298d17336fe94626f5b3. TBR=juberti@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/41109004 Cr-Commit-Position: refs/heads/master@{#8585} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8585 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnection.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index d0c4cc276b..2dce562ae8 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -341,18 +341,17 @@ bool PeerConnection::Initialize( int portallocator_flags = port_allocator_->flags(); portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_BUNDLE | cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | - cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET | - cricket::PORTALLOCATOR_ENABLE_IPV6; + cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET; bool value; // If IPv6 flag was specified, we'll not override it by experiment. if (FindConstraint( constraints, MediaConstraintsInterface::kEnableIPv6, &value, NULL)) { - if (!value) { - portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); + if (value) { + portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == - "Disabled") { - portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); + "Enabled") { + portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } port_allocator_->set_flags(portallocator_flags);