Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: remoting/protocol/chromium_port_allocator.cc

Issue 1278073004: Roll WebRTC 9687:9692, Libjingle 9690:9692 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove roll part; keep only remoting part Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/pepper_port_allocator.cc ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/chromium_port_allocator.cc
diff --git a/remoting/protocol/chromium_port_allocator.cc b/remoting/protocol/chromium_port_allocator.cc
index ffe675667a558d1d96a5c6d987e754d83bd49a0b..45ef1a1f93c2b0ac7e2c9795c97b5d553f54a352 100644
--- a/remoting/protocol/chromium_port_allocator.cc
+++ b/remoting/protocol/chromium_port_allocator.cc
@@ -143,10 +143,8 @@ scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create(
// We always use PseudoTcp to provide a reliable channel. It provides poor
// performance when combined with TCP-based transport, so we have to disable
- // TCP ports. ENABLE_SHARED_UFRAG flag is specified so that the same username
- // fragment is shared between all candidates for this channel.
+ // TCP ports.
int flags = cricket::PORTALLOCATOR_DISABLE_TCP |
- cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
cricket::PORTALLOCATOR_ENABLE_IPV6;
if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_STUN))
« no previous file with comments | « remoting/client/plugin/pepper_port_allocator.cc ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698