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

Unified Diff: remoting/protocol/channel_dispatcher_base.cc

Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/channel_dispatcher_base.h ('k') | remoting/protocol/channel_multiplexer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_dispatcher_base.cc
diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc
index 575b1e57913206218e774cd82976e21ce29f2745..e7e0f5b033c325689a168885352cc470142e5044 100644
--- a/remoting/protocol/channel_dispatcher_base.cc
+++ b/remoting/protocol/channel_dispatcher_base.cc
@@ -5,7 +5,7 @@
#include "remoting/protocol/channel_dispatcher_base.h"
#include "base/bind.h"
-#include "net/socket/stream_socket.h"
+#include "remoting/protocol/p2p_stream_socket.h"
#include "remoting/protocol/session.h"
#include "remoting/protocol/session_config.h"
#include "remoting/protocol/stream_channel_factory.h"
@@ -20,7 +20,6 @@ ChannelDispatcherBase::ChannelDispatcherBase(const char* channel_name)
}
ChannelDispatcherBase::~ChannelDispatcherBase() {
- writer()->Close();
if (channel_factory_)
channel_factory_->CancelChannelCreation(channel_name_);
}
@@ -49,7 +48,7 @@ void ChannelDispatcherBase::Init(Session* session,
}
void ChannelDispatcherBase::OnChannelReady(
- scoped_ptr<net::StreamSocket> socket) {
+ scoped_ptr<P2PStreamSocket> socket) {
if (!socket.get()) {
event_handler_->OnChannelError(this, CHANNEL_CONNECTION_ERROR);
return;
@@ -57,9 +56,10 @@ void ChannelDispatcherBase::OnChannelReady(
channel_factory_ = nullptr;
channel_ = socket.Pass();
- writer_.Init(channel_.get(),
- base::Bind(&ChannelDispatcherBase::OnReadWriteFailed,
- base::Unretained(this)));
+ writer_.Init(
+ base::Bind(&P2PStreamSocket::Write, base::Unretained(channel_.get())),
+ base::Bind(&ChannelDispatcherBase::OnReadWriteFailed,
+ base::Unretained(this)));
reader_.StartReading(channel_.get(),
base::Bind(&ChannelDispatcherBase::OnReadWriteFailed,
base::Unretained(this)));
« no previous file with comments | « remoting/protocol/channel_dispatcher_base.h ('k') | remoting/protocol/channel_multiplexer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698