Fix ConnectionToClient to connect stubs only after authentication.

remoting/protocol/connection_to_client.cc

 // Copyright 2012 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/connection_to_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "net/base/io_buffer.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_control_dispatcher.h"
 #include "remoting/protocol/host_event_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/host_video_dispatcher.h"
 #include "remoting/protocol/input_stub.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToClient::ConnectionToClient(protocol::Session* session)
     : handler_(nullptr),
-      clipboard_stub_(nullptr),
-      host_stub_(nullptr),
-      input_stub_(nullptr),
       session_(session) {
   session_->SetEventHandler(this);
 }
 
 ConnectionToClient::~ConnectionToClient() {
 }
 
 void ConnectionToClient::SetEventHandler(EventHandler* event_handler) {
   DCHECK(CalledOnValidThread());
   handler_ = event_handler;
@@ skipping 31 matching lines @@
 
 // Return pointer to ClientStub.
 ClientStub* ConnectionToClient::client_stub() {
   DCHECK(CalledOnValidThread());
   return control_dispatcher_.get();
 }
 
 void ConnectionToClient::set_clipboard_stub(
     protocol::ClipboardStub* clipboard_stub) {
   DCHECK(CalledOnValidThread());
-  clipboard_stub_ = clipboard_stub;
-}
-
-ClipboardStub* ConnectionToClient::clipboard_stub() {
-  DCHECK(CalledOnValidThread());
-  return clipboard_stub_;
+  control_dispatcher_->set_clipboard_stub(clipboard_stub);
 }
 
 void ConnectionToClient::set_host_stub(protocol::HostStub* host_stub) {
   DCHECK(CalledOnValidThread());
-  host_stub_ = host_stub;
-}
-
-HostStub* ConnectionToClient::host_stub() {
-  DCHECK(CalledOnValidThread());
-  return host_stub_;
+  control_dispatcher_->set_host_stub(host_stub);
 }
 
 void ConnectionToClient::set_input_stub(protocol::InputStub* input_stub) {
   DCHECK(CalledOnValidThread());
-  input_stub_ = input_stub;
-}
-
-InputStub* ConnectionToClient::input_stub() {
-  DCHECK(CalledOnValidThread());
-  return input_stub_;
+  event_dispatcher_->set_input_stub(input_stub);
 }
 
 void ConnectionToClient::OnSessionStateChange(Session::State state) {
   DCHECK(CalledOnValidThread());
 
   DCHECK(handler_);
   switch(state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::CONNECTED:
       // Don't care about these events.
       break;
     case Session::AUTHENTICATING:
       handler_->OnConnectionAuthenticating(this);
       break;
     case Session::AUTHENTICATED:
       // Initialize channels.
       control_dispatcher_.reset(new HostControlDispatcher());
       control_dispatcher_->Init(session_.get(),
                                 session_->config().control_config(), this);
-      control_dispatcher_->set_clipboard_stub(clipboard_stub_);
-      control_dispatcher_->set_host_stub(host_stub_);
 
       event_dispatcher_.reset(new HostEventDispatcher());
       event_dispatcher_->Init(session_.get(), session_->config().event_config(),
                               this);
-      event_dispatcher_->set_input_stub(input_stub_);
       event_dispatcher_->set_event_timestamp_callback(base::Bind(
           &ConnectionToClient::OnEventTimestamp, base::Unretained(this)));
 
       video_dispatcher_.reset(new HostVideoDispatcher());
       video_dispatcher_->Init(session_.get(), session_->config().video_config(),
                               this);
 
       audio_writer_ = AudioWriter::Create(session_->config());
       if (audio_writer_.get()) {
         audio_writer_->Init(session_.get(), session_->config().audio_config(),
@@ skipping 61 matching lines @@
 
 void ConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting