From bbbdeed2bff31777ca7d298d17336fe94626f5b3 Mon Sep 17 00:00:00 2001 From: "guoweis@webrtc.org" Date: Tue, 3 Mar 2015 23:27:17 +0000 Subject: [PATCH] Turn on IPv6 for WebRTC as default as required before ramping the experiment to 30%. BUG= R=juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/43529004 Cr-Commit-Position: refs/heads/master@{#8582} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8582 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnection.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index 2dce562ae..d0c4cc276 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -341,17 +341,18 @@ 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_SHARED_SOCKET | + cricket::PORTALLOCATOR_ENABLE_IPV6; 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") == - "Enabled") { - portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; + "Disabled") { + portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); } port_allocator_->set_flags(portallocator_flags);