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

Unified Diff: remoting/protocol/secure_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/secure_channel_factory.h ('k') | remoting/protocol/session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/secure_channel_factory.cc
diff --git a/remoting/protocol/secure_channel_factory.cc b/remoting/protocol/secure_channel_factory.cc
deleted file mode 100644
index df98378afc8fdb155371b275e5111e4928d21364..0000000000000000000000000000000000000000
--- a/remoting/protocol/secure_channel_factory.cc
+++ /dev/null
@@ -1,83 +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/secure_channel_factory.h"
-
-#include "base/bind.h"
-#include "net/socket/stream_socket.h"
-#include "remoting/protocol/authenticator.h"
-#include "remoting/protocol/channel_authenticator.h"
-
-namespace remoting {
-namespace protocol {
-
-SecureChannelFactory::SecureChannelFactory(
- StreamChannelFactory* channel_factory,
- Authenticator* authenticator)
- : channel_factory_(channel_factory),
- authenticator_(authenticator) {
- DCHECK_EQ(authenticator_->state(), Authenticator::ACCEPTED);
-}
-
-SecureChannelFactory::~SecureChannelFactory() {
- // CancelChannelCreation() is expected to be called before destruction.
- DCHECK(channel_authenticators_.empty());
-}
-
-void SecureChannelFactory::CreateChannel(
- const std::string& name,
- const ChannelCreatedCallback& callback) {
- DCHECK(!callback.is_null());
- channel_factory_->CreateChannel(
- name,
- base::Bind(&SecureChannelFactory::OnBaseChannelCreated,
- base::Unretained(this), name, callback));
-}
-
-void SecureChannelFactory::CancelChannelCreation(
- const std::string& name) {
- AuthenticatorMap::iterator it = channel_authenticators_.find(name);
- if (it == channel_authenticators_.end()) {
- channel_factory_->CancelChannelCreation(name);
- } else {
- delete it->second;
- channel_authenticators_.erase(it);
- }
-}
-
-void SecureChannelFactory::OnBaseChannelCreated(
- const std::string& name,
- const ChannelCreatedCallback& callback,
- scoped_ptr<net::StreamSocket> socket) {
- if (!socket) {
- callback.Run(scoped_ptr<net::StreamSocket>());
- return;
- }
-
- ChannelAuthenticator* channel_authenticator =
- authenticator_->CreateChannelAuthenticator().release();
- channel_authenticators_[name] = channel_authenticator;
- channel_authenticator->SecureAndAuthenticate(
- socket.Pass(),
- base::Bind(&SecureChannelFactory::OnSecureChannelCreated,
- base::Unretained(this), name, callback));
-}
-
-void SecureChannelFactory::OnSecureChannelCreated(
- const std::string& name,
- const ChannelCreatedCallback& callback,
- int error,
- scoped_ptr<net::StreamSocket> socket) {
- DCHECK((socket && error == net::OK) || (!socket && error != net::OK));
-
- AuthenticatorMap::iterator it = channel_authenticators_.find(name);
- DCHECK(it != channel_authenticators_.end());
- delete it->second;
- channel_authenticators_.erase(it);
-
- callback.Run(socket.Pass());
-}
-
-} // namespace protocol
-} // namespace remoting
« no previous file with comments | « remoting/protocol/secure_channel_factory.h ('k') | remoting/protocol/session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698