diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 00:40:50 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 00:40:50 +0000 |
| commit | 951785568c509f1a127b3d6a1cc48f3796b20b96 (patch) | |
| tree | dfc5d31ea54b01a3eef4361d83eda1d02245de5f /remoting/protocol | |
| parent | 57a9cbcb121746271589eb014661ec5cc0d17303 (diff) | |
| download | chromium_src-951785568c509f1a127b3d6a1cc48f3796b20b96.zip chromium_src-951785568c509f1a127b3d6a1cc48f3796b20b96.tar.gz chromium_src-951785568c509f1a127b3d6a1cc48f3796b20b96.tar.bz2 | |
Implement HostPortAllocator.
HostPortAllocator is a PortAllocator specific to Chromoting host.
BUG=103991
Review URL: https://chromiumcodereview.appspot.com/10160013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 6 | ||||
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index 1c39f80..526e669 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -289,13 +289,9 @@ void LibjingleStreamTransport::NotifyConnectFailed() { } // namespace LibjingleTransportFactory::LibjingleTransportFactory( - scoped_ptr<talk_base::NetworkManager> network_manager, - scoped_ptr<talk_base::PacketSocketFactory> socket_factory, scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator, bool incoming_only) - : network_manager_(network_manager.Pass()), - socket_factory_(socket_factory.Pass()), - http_port_allocator_(port_allocator.get()), + : http_port_allocator_(port_allocator.get()), port_allocator_(port_allocator.Pass()), incoming_only_(incoming_only) { } diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h index fb47b00..0cead6d 100644 --- a/remoting/protocol/libjingle_transport_factory.h +++ b/remoting/protocol/libjingle_transport_factory.h @@ -22,9 +22,11 @@ namespace protocol { class LibjingleTransportFactory : public TransportFactory { public: + // Need to use cricket::HttpPortAllocatorBase pointer for the + // |port_allocator|, so that it is possible to configure + // |port_allocator| with STUN/Relay addresses. + // TODO(sergeyu): Reconsider this design. LibjingleTransportFactory( - scoped_ptr<talk_base::NetworkManager> network_manager, - scoped_ptr<talk_base::PacketSocketFactory> socket_factory, scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator, bool incoming_only); |