Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: remoting/protocol/pseudotcp_channel_factory.cc

Issue 570463002: Revert of Move PseudoTCP and channel auth out of LibjingleTransportFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clean_dgrams
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/secure_channel_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pseudotcp_channel_factory.cc
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
deleted file mode 100644
index 689db92bde51b7fc45e81acb6fc24f26d5ef66f2..0000000000000000000000000000000000000000
--- a/remoting/protocol/pseudotcp_channel_factory.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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() {
- // CancelChannelCreation() is expected to be called before destruction.
- DCHECK(pending_sockets_.empty());
-}
-
-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* adapter =
- new jingle_glue::PseudoTcpAdapter(datagram_socket.release());
- pending_sockets_[name] = adapter;
-
- adapter->SetSendBufferSize(kTcpSendBufferSize);
- adapter->SetReceiveBufferSize(kTcpReceiveBufferSize);
- adapter->SetNoDelay(true);
- adapter->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)
- adapter->SetWriteWaitsForSend(true);
-
- int result = adapter->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)
- socket.reset();
-
- callback.Run(socket.Pass());
-}
-
-} // namespace protocol
-} // namespace remoting
« no previous file with comments | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/secure_channel_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698