Move PseudoTCP and channel auth out of LibjingleTransportFactory.

remoting/protocol/libjingle_transport_factory.cc

Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index cc31440968ce51137640336f7ca4788493474ece..f03d069be8b131dcf6668d01a3b6907b530e4f8c 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -9,11 +9,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "jingle/glue/channel_socket_adapter.h"
-#include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
-#include "remoting/base/constants.h"
-#include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/signaling/jingle_info_request.h"
 #include "third_party/libjingle/source/talk/p2p/base/constants.h"
@@ -28,15 +25,6 @@ namespace protocol {
 
 namespace {
 
-// Value is chosen to balance the extra latency against the reduced
-// load due to ACK traffic.
-const int kTcpAckDelayMilliseconds = 10;
-
-// Values for the TCP send and receive buffer size. This should be tuned to
-// accommodate high latency network but not backlog the decoding pipeline.
-const int kTcpReceiveBufferSize = 256 * 1024;
-const int kTcpSendBufferSize = kTcpReceiveBufferSize + 30 * 1024;
-
 // Try connecting ICE twice with timeout of 15 seconds for each attempt.
 const int kMaxReconnectAttempts = 2;
 const int kReconnectDelaySeconds = 15;
@@ -44,25 +32,23 @@ const int kReconnectDelaySeconds = 15;
 // Get fresh STUN/Relay configuration every hour.
 const int kJingleInfoUpdatePeriodSeconds = 3600;
 
-class LibjingleStreamTransport
-    : public StreamTransport,
-      public base::SupportsWeakPtr<LibjingleStreamTransport>,
+class LibjingleTransport
+    : public Transport,
+      public base::SupportsWeakPtr<LibjingleTransport>,
       public sigslot::has_slots<> {
  public:
-  LibjingleStreamTransport(cricket::PortAllocator* port_allocator,
+  LibjingleTransport(cricket::PortAllocator* port_allocator,
                            const NetworkSettings& network_settings);
-  virtual ~LibjingleStreamTransport();
+  virtual ~LibjingleTransport();
 
   // Called by JingleTransportFactory when it has fresh Jingle info.
   void OnCanStart();
 
-  // StreamTransport interface.
-  virtual void Initialize(
+  // Transport interface.
+  virtual void Connect(
       const std::string& name,
       Transport::EventHandler* event_handler,
-      scoped_ptr<ChannelAuthenticator> authenticator) OVERRIDE;
-  virtual void Connect(
-      const StreamTransport::ConnectedCallback& callback) OVERRIDE;
+      const Transport::ConnectedCallback& callback) OVERRIDE;
   virtual void AddRemoteCandidate(const cricket::Candidate& candidate) OVERRIDE;
   virtual const std::string& name() const OVERRIDE;
   virtual bool is_connected() const OVERRIDE;
@@ -78,13 +64,6 @@ class LibjingleStreamTransport
                      const cricket::Candidate& candidate);
   void OnWritableState(cricket::TransportChannel* channel);
 
-  // Callback for PseudoTcpAdapter::Connect().
-  void OnTcpConnected(int result);
-
-  // Callback for Authenticator::SecureAndAuthenticate();
-  void OnAuthenticationDone(net::Error error,
-                            scoped_ptr<net::StreamSocket> socket);
-
   // Callback for jingle_glue::TransportChannelSocketAdapter to notify when the
   // socket is destroyed.
   void OnChannelDestroyed();
@@ -92,17 +71,12 @@ class LibjingleStreamTransport
   // Tries to connect by restarting ICE. Called by |reconnect_timer_|.
   void TryReconnect();
 
-  // Helper methods to call |callback_|.
-  void NotifyConnected(scoped_ptr<net::StreamSocket> socket);
-  void NotifyConnectFailed();
-
   cricket::PortAllocator* port_allocator_;
   NetworkSettings network_settings_;
 
   std::string name_;
   EventHandler* event_handler_;
-  StreamTransport::ConnectedCallback callback_;
-  scoped_ptr<ChannelAuthenticator> authenticator_;
+  Transport::ConnectedCallback callback_;
   std::string ice_username_fragment_;
   std::string ice_password_;
 
@@ -112,15 +86,12 @@ class LibjingleStreamTransport
   scoped_ptr<cricket::P2PTransportChannel> channel_;
   bool channel_was_writable_;
   int connect_attempts_left_;
-  base::RepeatingTimer<LibjingleStreamTransport> reconnect_timer_;
-
-  // We own |socket_| until it is connected.
-  scoped_ptr<jingle_glue::PseudoTcpAdapter> socket_;
+  base::RepeatingTimer<LibjingleTransport> reconnect_timer_;
 
-  DISALLOW_COPY_AND_ASSIGN(LibjingleStreamTransport);
+  DISALLOW_COPY_AND_ASSIGN(LibjingleTransport);
 };
 
-LibjingleStreamTransport::LibjingleStreamTransport(
+LibjingleTransport::LibjingleTransport(
     cricket::PortAllocator* port_allocator,
     const NetworkSettings& network_settings)
     : port_allocator_(port_allocator),
@@ -136,11 +107,10 @@ LibjingleStreamTransport::LibjingleStreamTransport(
   DCHECK(!ice_password_.empty());
 }
 
-LibjingleStreamTransport::~LibjingleStreamTransport() {
+LibjingleTransport::~LibjingleTransport() {
   DCHECK(event_handler_);
+
   event_handler_->OnTransportDeleted(this);
-  // Channel should be already destroyed if we were connected.
-  DCHECK(!is_connected() || socket_.get() == NULL);
 
   if (channel_.get()) {
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
@@ -148,7 +118,7 @@ LibjingleStreamTransport::~LibjingleStreamTransport() {
   }
 }
 
-void LibjingleStreamTransport::OnCanStart() {
+void LibjingleTransport::OnCanStart() {
   DCHECK(CalledOnValidThread());
 
   DCHECK(!can_start_);
@@ -164,33 +134,24 @@ void LibjingleStreamTransport::OnCanStart() {
   }
 }
 
-void LibjingleStreamTransport::Initialize(
+void LibjingleTransport::Connect(
     const std::string& name,
     Transport::EventHandler* event_handler,
-    scoped_ptr<ChannelAuthenticator> authenticator) {
+    const Transport::ConnectedCallback& callback) {
   DCHECK(CalledOnValidThread());
-
-  DCHECK(!name.empty());
   DCHECK(event_handler);
-
-  // Can be initialized only once.
   DCHECK(name_.empty());
+  DCHECK(!name.empty());

[Wez, 2014/09/10 22:19:42]

DCHECK(!callback.is_null())?

[Sergey Ulanov, 2014/09/10 22:49:31]

Done.

 
   name_ = name;
   event_handler_ = event_handler;
-  authenticator_ = authenticator.Pass();
-}
-
-void LibjingleStreamTransport::Connect(
-    const StreamTransport::ConnectedCallback& callback) {
-  DCHECK(CalledOnValidThread());
   callback_ = callback;
 
   if (can_start_)
     DoStart();
 }
 
-void LibjingleStreamTransport::DoStart() {
+void LibjingleTransport::DoStart() {
   DCHECK(!channel_.get());
 
   // Create P2PTransportChannel, attach signal handlers and connect it.
@@ -200,13 +161,13 @@ void LibjingleStreamTransport::DoStart() {
   channel_->SetIceProtocolType(cricket::ICEPROTO_GOOGLE);
   channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
   channel_->SignalRequestSignaling.connect(
-      this, &LibjingleStreamTransport::OnRequestSignaling);
+      this, &LibjingleTransport::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
-      this, &LibjingleStreamTransport::OnCandidateReady);
+      this, &LibjingleTransport::OnCandidateReady);
   channel_->SignalRouteChange.connect(
-      this, &LibjingleStreamTransport::OnRouteChange);
+      this, &LibjingleTransport::OnRouteChange);
   channel_->SignalWritableState.connect(
-      this, &LibjingleStreamTransport::OnWritableState);
+      this, &LibjingleTransport::OnWritableState);
   channel_->set_incoming_only(
       !(network_settings_.flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING));
 
@@ -217,37 +178,20 @@ void LibjingleStreamTransport::DoStart() {
   // Start reconnection timer.
   reconnect_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kReconnectDelaySeconds),
-      this, &LibjingleStreamTransport::TryReconnect);
+      this, &LibjingleTransport::TryReconnect);
 
   // Create net::Socket adapter for the P2PTransportChannel.
-  scoped_ptr<jingle_glue::TransportChannelSocketAdapter> channel_adapter(
+  scoped_ptr<jingle_glue::TransportChannelSocketAdapter> socket(
       new jingle_glue::TransportChannelSocketAdapter(channel_.get()));
+  socket->SetOnDestroyedCallback(base::Bind(
+      &LibjingleTransport::OnChannelDestroyed, base::Unretained(this)));
 
-  channel_adapter->SetOnDestroyedCallback(base::Bind(
-      &LibjingleStreamTransport::OnChannelDestroyed, base::Unretained(this)));
-
-  // Configure and connect PseudoTCP adapter.
-  socket_.reset(
-      new jingle_glue::PseudoTcpAdapter(channel_adapter.release()));
-  socket_->SetSendBufferSize(kTcpSendBufferSize);
-  socket_->SetReceiveBufferSize(kTcpReceiveBufferSize);
-  socket_->SetNoDelay(true);
-  socket_->SetAckDelay(kTcpAckDelayMilliseconds);
-
-  // TODO(sergeyu): This is a hack to improve latency of the video
-  // channel. Consider removing it once we have better flow control
-  // implemented.
-  if (name_ == kVideoChannelName)
-    socket_->SetWriteWaitsForSend(true);
-
-  int result = socket_->Connect(
-      base::Bind(&LibjingleStreamTransport::OnTcpConnected,
-                 base::Unretained(this)));
-  if (result != net::ERR_IO_PENDING)
-    OnTcpConnected(result);
+  Transport::ConnectedCallback callback = callback_;
+  callback_.Reset();
+  callback.Run(socket.PassAs<net::Socket>());
 }
 
-void LibjingleStreamTransport::AddRemoteCandidate(
+void LibjingleTransport::AddRemoteCandidate(
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
 
@@ -265,30 +209,30 @@ void LibjingleStreamTransport::AddRemoteCandidate(
   }
 }
 
-const std::string& LibjingleStreamTransport::name() const {
+const std::string& LibjingleTransport::name() const {
   DCHECK(CalledOnValidThread());
   return name_;
 }
 
-bool LibjingleStreamTransport::is_connected() const {
+bool LibjingleTransport::is_connected() const {
   DCHECK(CalledOnValidThread());
   return callback_.is_null();
 }
 
-void LibjingleStreamTransport::OnRequestSignaling(
+void LibjingleTransport::OnRequestSignaling(
     cricket::TransportChannelImpl* channel) {
   DCHECK(CalledOnValidThread());
   channel_->OnSignalingReady();
 }
 
-void LibjingleStreamTransport::OnCandidateReady(
+void LibjingleTransport::OnCandidateReady(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
   event_handler_->OnTransportCandidate(this, candidate);
 }
 
-void LibjingleStreamTransport::OnRouteChange(
+void LibjingleTransport::OnRouteChange(
     cricket::TransportChannel* channel,
     const cricket::Candidate& candidate) {
   TransportRoute route;
@@ -319,7 +263,7 @@ void LibjingleStreamTransport::OnRouteChange(
   event_handler_->OnTransportRouteChange(this, route);
 }
 
-void LibjingleStreamTransport::OnWritableState(
+void LibjingleTransport::OnWritableState(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(channel, channel_.get());
 
@@ -333,39 +277,14 @@ void LibjingleStreamTransport::OnWritableState(
   }
 }
 
-void LibjingleStreamTransport::OnTcpConnected(int result) {
-  DCHECK(CalledOnValidThread());
-
-  if (result != net::OK) {
-    NotifyConnectFailed();
-    return;
-  }
-
-  authenticator_->SecureAndAuthenticate(
-      socket_.PassAs<net::StreamSocket>(),
-      base::Bind(&LibjingleStreamTransport::OnAuthenticationDone,
-                 base::Unretained(this)));
-}
-
-void LibjingleStreamTransport::OnAuthenticationDone(
-    net::Error error,
-    scoped_ptr<net::StreamSocket> socket) {
-  if (error != net::OK) {
-    NotifyConnectFailed();
-    return;
-  }
-
-  NotifyConnected(socket.Pass());
-}
-
-void LibjingleStreamTransport::OnChannelDestroyed() {
+void LibjingleTransport::OnChannelDestroyed() {
   if (is_connected()) {
     // The connection socket is being deleted, so delete the transport too.
     delete this;
   }
 }
 
-void LibjingleStreamTransport::TryReconnect() {
+void LibjingleTransport::TryReconnect() {
   DCHECK(!channel_->writable());
 
   if (connect_attempts_left_ <= 0) {
@@ -383,31 +302,6 @@ void LibjingleStreamTransport::TryReconnect() {
   channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
 }
 
-void LibjingleStreamTransport::NotifyConnected(
-    scoped_ptr<net::StreamSocket> socket) {
-  DCHECK(!is_connected());
-  StreamTransport::ConnectedCallback callback = callback_;
-  callback_.Reset();
-  callback.Run(socket.Pass());
-}
-
-void LibjingleStreamTransport::NotifyConnectFailed() {
-  DCHECK(!is_connected());
-
-  socket_.reset();
-
-  // This method may be called in response to a libjingle signal, so
-  // libjingle objects must be deleted asynchronously.
-  if (channel_.get()) {
-    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
-        FROM_HERE, channel_.release());
-  }
-
-  authenticator_.reset();
-
-  NotifyConnected(scoped_ptr<net::StreamSocket>());
-}
-
 }  // namespace
 
 LibjingleTransportFactory::LibjingleTransportFactory(
@@ -431,9 +325,9 @@ void LibjingleTransportFactory::PrepareTokens() {
   EnsureFreshJingleInfo();
 }
 
-scoped_ptr<StreamTransport> LibjingleTransportFactory::CreateStreamTransport() {
-  scoped_ptr<LibjingleStreamTransport> result(
-      new LibjingleStreamTransport(port_allocator_.get(), network_settings_));
+scoped_ptr<Transport> LibjingleTransportFactory::CreateTransport() {
+  scoped_ptr<LibjingleTransport> result(
+      new LibjingleTransport(port_allocator_.get(), network_settings_));
 
   EnsureFreshJingleInfo();
 
@@ -441,19 +335,13 @@ scoped_ptr<StreamTransport> LibjingleTransportFactory::CreateStreamTransport() {
   // transport until the request is finished.
   if (jingle_info_request_) {
     on_jingle_info_callbacks_.push_back(
-        base::Bind(&LibjingleStreamTransport::OnCanStart,
+        base::Bind(&LibjingleTransport::OnCanStart,
                    result->AsWeakPtr()));
   } else {
     result->OnCanStart();
   }
 
-  return result.PassAs<StreamTransport>();
-}
-
-scoped_ptr<DatagramTransport>
-LibjingleTransportFactory::CreateDatagramTransport() {
-  NOTIMPLEMENTED();
-  return scoped_ptr<DatagramTransport>();
+  return result.PassAs<Transport>();
 }
 
 void LibjingleTransportFactory::EnsureFreshJingleInfo() {