diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 21:46:09 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 21:46:09 +0000 |
| commit | 8ab77e8332c0d0ee218ccac3980d507e55c6a6a1 (patch) | |
| tree | 4fc7b854d8d32700fdf57d9bd7825089c60a6bad /remoting | |
| parent | ec8e0595ffc37d55eaf2a415e09aa3444d7f0ea5 (diff) | |
| download | chromium_src-8ab77e8332c0d0ee218ccac3980d507e55c6a6a1.zip chromium_src-8ab77e8332c0d0ee218ccac3980d507e55c6a6a1.tar.gz chromium_src-8ab77e8332c0d0ee218ccac3980d507e55c6a6a1.tar.bz2 | |
Enable IPv6 in chromoting
BUG=242739
Review URL: https://chromiumcodereview.appspot.com/23464086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/pepper_port_allocator.cc | 3 | ||||
| -rw-r--r-- | remoting/jingle_glue/chromium_port_allocator.cc | 13 | ||||
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc index c04d7aa..47ebab3 100644 --- a/remoting/client/plugin/pepper_port_allocator.cc +++ b/remoting/client/plugin/pepper_port_allocator.cc @@ -320,7 +320,8 @@ PepperPortAllocator::PepperPortAllocator( // username fragment is shared between all candidates for this // channel. set_flags(cricket::PORTALLOCATOR_DISABLE_TCP | - cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG); + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG| + cricket::PORTALLOCATOR_ENABLE_IPV6); } PepperPortAllocator::~PepperPortAllocator() { diff --git a/remoting/jingle_glue/chromium_port_allocator.cc b/remoting/jingle_glue/chromium_port_allocator.cc index 1ee6fe4..a179650 100644 --- a/remoting/jingle_glue/chromium_port_allocator.cc +++ b/remoting/jingle_glue/chromium_port_allocator.cc @@ -140,14 +140,13 @@ scoped_ptr<ChromiumPortAllocator> ChromiumPortAllocator::Create( new ChromiumPortAllocator(url_context, network_manager.Pass(), socket_factory.Pass())); - // 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. + // 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. int flags = cricket::PORTALLOCATOR_DISABLE_TCP | - cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG; + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | + cricket::PORTALLOCATOR_ENABLE_IPV6; if (network_settings.nat_traversal_mode != NetworkSettings::NAT_TRAVERSAL_ENABLED) { flags |= cricket::PORTALLOCATOR_DISABLE_STUN | diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index 996a701..ac8f0bc 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -405,7 +405,8 @@ LibjingleTransportFactory::LibjingleTransportFactory() cricket::PORTALLOCATOR_DISABLE_TCP | cricket::PORTALLOCATOR_DISABLE_STUN | cricket::PORTALLOCATOR_DISABLE_RELAY | - cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG); + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | + cricket::PORTALLOCATOR_ENABLE_IPV6); } LibjingleTransportFactory::~LibjingleTransportFactory() { |