diff options
| author | guoweis@webrtc.org <guoweis@webrtc.org> | 2014-09-23 16:23:02 +0000 |
|---|---|---|
| committer | guoweis@webrtc.org <guoweis@webrtc.org> | 2014-09-23 16:23:02 +0000 |
| commit | b01544077d7445e2ce103b1d8232ae2deac832be (patch) | |
| tree | 607ee88e52c9e3cd9d00b8d5fdf9674cc128d3cf | |
| parent | 45017aec092dbdfd293de1268c258e61aa6d4be5 (diff) | |
| download | talk-b01544077d7445e2ce103b1d8232ae2deac832be.tar.gz | |
Enable ipv6 by default for webrtc under a Finch experiment.
Reapply 23529005 after fixing the build break issue (Chromium:582133002)
Committed: https://code.google.com/p/webrtc/source/detail?r=7253
Review URL: https://webrtc-codereview.appspot.com/23529005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7278 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | app/webrtc/peerconnection.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/webrtc/peerconnection.cc b/app/webrtc/peerconnection.cc index d133889..d939f98 100644 --- a/app/webrtc/peerconnection.cc +++ b/app/webrtc/peerconnection.cc @@ -39,9 +39,7 @@ #include "talk/session/media/channelmanager.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" -#ifdef WEBRTC_CHROMIUM_BUILD #include "webrtc/system_wrappers/interface/field_trial.h" -#endif namespace { @@ -362,13 +360,10 @@ bool PeerConnection::DoInitialize( if (value) { portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } - } -#ifdef WEBRTC_CHROMIUM_BUILD - else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == - "Enabled") { + } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == + "Enabled") { portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } -#endif // WEBRTC_CHROMIUM_BUILD port_allocator_->set_flags(portallocator_flags); // No step delay is used while allocating ports. |