Move PseudoTCP and channel auth out of LibjingleTransportFactory.

remoting/protocol/pseudotcp_channel_factory.cc

Index: remoting/protocol/pseudotcp_channel_factory.cc
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b51411dcbb6dc60e8e803cb9a9bdadde7f0d1bee
--- /dev/null
+++ b/remoting/protocol/pseudotcp_channel_factory.cc
@@ -0,0 +1,102 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "remoting/protocol/pseudotcp_channel_factory.h"
+
+#include "base/bind.h"
+#include "jingle/glue/pseudotcp_adapter.h"
+#include "net/base/net_errors.h"
+#include "net/socket/stream_socket.h"
+#include "remoting/base/constants.h"
+#include "remoting/protocol/datagram_channel_factory.h"
+
+namespace remoting {
+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;
+
+}  // namespace
+
+PseudoTcpChannelFactory::PseudoTcpChannelFactory(
+    DatagramChannelFactory* datagram_channel_factory)
+    : datagram_channel_factory_(datagram_channel_factory) {
+}
+
+PseudoTcpChannelFactory::~PseudoTcpChannelFactory() {
+  DCHECK(pending_sockets_.empty());
+}
+
+// ChannelFactory interface.

[Wez, 2014/09/10 02:29:27]

nit: Remove this comment

[Sergey Ulanov, 2014/09/10 21:50:59]

Done.

+void PseudoTcpChannelFactory::CreateChannel(
+    const std::string& name,
+    const ChannelCreatedCallback& callback) {
+  datagram_channel_factory_->CreateChannel(
+      name,
+      base::Bind(&PseudoTcpChannelFactory::OnDatagramChannelCreated,
+                 base::Unretained(this), name, callback));
+}
+
+void PseudoTcpChannelFactory::CancelChannelCreation(const std::string& name) {
+  PendingSocketsMap::iterator it = pending_sockets_.find(name);
+  if (it == pending_sockets_.end()) {
+    datagram_channel_factory_->CancelChannelCreation(name);
+  } else {
+    delete it->second;
+    pending_sockets_.erase(it);
+  }
+}
+
+void PseudoTcpChannelFactory::OnDatagramChannelCreated(
+    const std::string& name,
+    const ChannelCreatedCallback& callback,
+    scoped_ptr<net::Socket> datagram_socket) {
+  jingle_glue::PseudoTcpAdapter* socket =

[Wez, 2014/09/10 02:29:26]

nit: adaptor?

[Sergey Ulanov, 2014/09/10 21:50:59]

adaptEr for consistency :)

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

:D

+      new jingle_glue::PseudoTcpAdapter(datagram_socket.release());
+  pending_sockets_[name] = socket;
+
+  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(&PseudoTcpChannelFactory::OnPseudoTcpConnected,
+                 base::Unretained(this), name, callback));
+  if (result != net::ERR_IO_PENDING)
+    OnPseudoTcpConnected(name, callback, result);
+}
+
+void PseudoTcpChannelFactory::OnPseudoTcpConnected(
+    const std::string& name,
+    const ChannelCreatedCallback& callback,
+    int result) {
+  PendingSocketsMap::iterator it = pending_sockets_.find(name);
+  DCHECK(it != pending_sockets_.end());
+  scoped_ptr<net::StreamSocket> socket(it->second);
+  pending_sockets_.erase(it);
+
+  if (result != net::OK) {
+    // Return NULL if Connect() failed.

[Wez, 2014/09/10 02:29:26]

nit: Does that really need a comment?

[Sergey Ulanov, 2014/09/10 21:50:59]

Done.

+    socket.reset();
+  }
+
+  callback.Run(socket.Pass());
+}
+
+}  // namespace protocol
+}  // namespace remoting