generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Turn on IPv6 for WebRTC as default as required before ramping the experiment to 30%."

Browse Source 
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
This commit is contained in:
guoweis@webrtc.org 2015-03-04 04:50:15 +00:00
parent 7bea1ffe77
commit fc2f146af2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
talk/app/webrtc/peerconnection.cc
View File

@ -341,18 +341,17 @@ bool PeerConnection::Initialize(
int portallocator_flags = port_allocator_->flags(); int portallocator_flags = port_allocator_->flags();
portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_BUNDLE | portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_BUNDLE |
cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET | cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET;
cricket::PORTALLOCATOR_ENABLE_IPV6;
bool value; bool value;
// If IPv6 flag was specified, we'll not override it by experiment. // If IPv6 flag was specified, we'll not override it by experiment.
if (FindConstraint( if (FindConstraint(
constraints, MediaConstraintsInterface::kEnableIPv6, &value, NULL)) { constraints, MediaConstraintsInterface::kEnableIPv6, &value, NULL)) {
if (!value) { if (value) {
portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6;
} }
} else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") ==
"Disabled") { "Enabled") {
portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6;
} }
port_allocator_->set_flags(portallocator_flags); port_allocator_->set_flags(portallocator_flags);