diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 23:41:59 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 23:41:59 +0000 |
| commit | 5f4ed93da5d14f807a7db2f43d1afe62438a67cd (patch) | |
| tree | 547d7c94352057c03bf45ae59f460c2915808a94 /remoting/host | |
| parent | dbdeab9c0ad392fca362d4a900cfa161d9b889ce (diff) | |
| download | chromium_src-5f4ed93da5d14f807a7db2f43d1afe62438a67cd.zip chromium_src-5f4ed93da5d14f807a7db2f43d1afe62438a67cd.tar.gz chromium_src-5f4ed93da5d14f807a7db2f43d1afe62438a67cd.tar.bz2 | |
Pass TransportConfig to TransportFactory instead of Transport.
LibjingleTransport transport instances will be sharing a single
PortAllocator, so config needs to be passed to TransportFactory.
BUG=103991
Review URL: https://chromiumcodereview.appspot.com/10160012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/chromoting_host.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 6475331..aea2466 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -107,22 +107,19 @@ void ChromotingHost::Start() { new talk_base::BasicNetworkManager()); scoped_ptr<talk_base::PacketSocketFactory> socket_factory( new talk_base::BasicPacketSocketFactory()); - scoped_ptr<cricket::PortAllocator> port_allocator; + scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator( + new cricket::HttpPortAllocator( + network_manager.get(), socket_factory.get(), "")); + // 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 port_allocator_flags = cricket::PORTALLOCATOR_DISABLE_TCP; - if (network_settings_.nat_traversal_mode == + if (network_settings_.nat_traversal_mode != NetworkSettings::NAT_TRAVERSAL_ENABLED) { - port_allocator.reset(new cricket::HttpPortAllocator( - network_manager.get(), socket_factory.get(), "")); - } else { port_allocator_flags |= cricket::PORTALLOCATOR_DISABLE_STUN | cricket::PORTALLOCATOR_DISABLE_RELAY; - port_allocator.reset( - new cricket::BasicPortAllocator(network_manager.get(), - socket_factory.get())); } port_allocator->set_flags(port_allocator_flags); port_allocator->SetPortRange(network_settings_.min_port, |