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

Side by Side Diff: remoting/protocol/channel_multiplexer.cc

Issue 551173004: 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 unified diff | Download patch
« no previous file with comments | « remoting/protocol/channel_multiplexer.h ('k') | remoting/protocol/datagram_channel_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/channel_multiplexer.h" 5 #include "remoting/protocol/channel_multiplexer.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 if (!read_callback_.is_null()) { 346 if (!read_callback_.is_null()) {
347 int result = channel_->DoRead(read_buffer_.get(), read_buffer_size_); 347 int result = channel_->DoRead(read_buffer_.get(), read_buffer_size_);
348 read_buffer_ = NULL; 348 read_buffer_ = NULL;
349 DCHECK_GT(result, 0); 349 DCHECK_GT(result, 0);
350 net::CompletionCallback cb; 350 net::CompletionCallback cb;
351 std::swap(cb, read_callback_); 351 std::swap(cb, read_callback_);
352 cb.Run(result); 352 cb.Run(result);
353 } 353 }
354 } 354 }
355 355
356 ChannelMultiplexer::ChannelMultiplexer(ChannelFactory* factory, 356 ChannelMultiplexer::ChannelMultiplexer(StreamChannelFactory* factory,
357 const std::string& base_channel_name) 357 const std::string& base_channel_name)
358 : base_channel_factory_(factory), 358 : base_channel_factory_(factory),
359 base_channel_name_(base_channel_name), 359 base_channel_name_(base_channel_name),
360 next_channel_id_(0), 360 next_channel_id_(0),
361 weak_factory_(this) { 361 weak_factory_(this) {
362 } 362 }
363 363
364 ChannelMultiplexer::~ChannelMultiplexer() { 364 ChannelMultiplexer::~ChannelMultiplexer() {
365 DCHECK(pending_channels_.empty()); 365 DCHECK(pending_channels_.empty());
366 STLDeleteValues(&channels_); 366 STLDeleteValues(&channels_);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 channel->OnIncomingPacket(packet.Pass(), done_task); 503 channel->OnIncomingPacket(packet.Pass(), done_task);
504 } 504 }
505 505
506 bool ChannelMultiplexer::DoWrite(scoped_ptr<MultiplexPacket> packet, 506 bool ChannelMultiplexer::DoWrite(scoped_ptr<MultiplexPacket> packet,
507 const base::Closure& done_task) { 507 const base::Closure& done_task) {
508 return writer_.Write(SerializeAndFrameMessage(*packet), done_task); 508 return writer_.Write(SerializeAndFrameMessage(*packet), done_task);
509 } 509 }
510 510
511 } // namespace protocol 511 } // namespace protocol
512 } // namespace remoting 512 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/channel_multiplexer.h ('k') | remoting/protocol/datagram_channel_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698