diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 02:16:21 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 02:16:21 +0000 |
| commit | 67c74d5e81e1a0a634fea79cfc5d5975c33d0e17 (patch) | |
| tree | c054cb37a379c56ec264cf6242d33610095f1c9b /remoting | |
| parent | 38a7bcbd396bf573cd7eb2c1e09b75559595fbeb (diff) | |
| download | chromium_src-67c74d5e81e1a0a634fea79cfc5d5975c33d0e17.zip chromium_src-67c74d5e81e1a0a634fea79cfc5d5975c33d0e17.tar.gz chromium_src-67c74d5e81e1a0a634fea79cfc5d5975c33d0e17.tar.bz2 | |
Roll libjingle 153:157
Among other things this roll fixes relay server support (bug 134007).
BUG=134007
Review URL: https://chromiumcodereview.appspot.com/10705008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/pepper_port_allocator.cc | 7 | ||||
| -rw-r--r-- | remoting/host/host_port_allocator.cc | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc index ae0a3a5..bf8ac98 100644 --- a/remoting/client/plugin/pepper_port_allocator.cc +++ b/remoting/client/plugin/pepper_port_allocator.cc @@ -88,7 +88,6 @@ PepperPortAllocatorSession::PepperPortAllocatorSession( stun_address_resolver_(instance_), stun_port_(0), relay_response_received_(false) { - set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); if (stun_hosts.size() > 0) { stun_address_ = stun_hosts[0]; } @@ -325,6 +324,12 @@ PepperPortAllocator::PepperPortAllocator( instance_(instance), network_manager_(network_manager.Pass()), socket_factory_(socket_factory.Pass()) { + // TCP transport is disabled becase PseudoTCP works poorly over + // it. ENABLE_SHARED_UFRAG flag is specified so that the same + // username fragment is shared between all candidates for this + // channel. + set_flags(cricket::PORTALLOCATOR_DISABLE_TCP | + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG); } PepperPortAllocator::~PepperPortAllocator() { diff --git a/remoting/host/host_port_allocator.cc b/remoting/host/host_port_allocator.cc index bf7fd18..d9323d1 100644 --- a/remoting/host/host_port_allocator.cc +++ b/remoting/host/host_port_allocator.cc @@ -134,7 +134,11 @@ scoped_ptr<HostPortAllocator> HostPortAllocator::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. - int flags = cricket::PORTALLOCATOR_DISABLE_TCP; + // ENABLE_SHARED_UFRAG flag is + // specified so that the same username fragment is shared between + // all candidates for this channel. + int flags = cricket::PORTALLOCATOR_DISABLE_TCP | + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG; if (network_settings.nat_traversal_mode != NetworkSettings::NAT_TRAVERSAL_ENABLED) { flags |= cricket::PORTALLOCATOR_DISABLE_STUN | |