A new authenticated connection evicts an old one.

remoting/host/chromoting_host.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/access_verifier.h"
 #include "remoting/host/capturer.h"
+#include "remoting/host/client_session.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/jingle_glue/jingle_client.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 class Task;
 
 namespace remoting {
@@ skipping 31 matching lines @@
 //    After we have done all the initialization we'll start the ScreenRecorder.
 //    We'll then enter the running state of the host process.
 //
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public protocol::ConnectionToClient::EventHandler,
-                       public DesktopEnvironment::EventHandler,
+                       public ClientSession::EventHandler,
                        public JingleClient::Callback {
  public:
   // Factory methods that must be used to create ChromotingHost instances.
   // Default capturer and input stub are used if it is not specified.
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config);
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config,
                                 DesktopEnvironment* environment);
 
@@ skipping 21 matching lines @@
   // protocol::ConnectionToClient::EventHandler implementations
   virtual void OnConnectionOpened(protocol::ConnectionToClient* client);
   virtual void OnConnectionClosed(protocol::ConnectionToClient* client);
   virtual void OnConnectionFailed(protocol::ConnectionToClient* client);
 
   ////////////////////////////////////////////////////////////////////////////
   // JingleClient::Callback implementations
   virtual void OnStateChange(JingleClient* client, JingleClient::State state);
 
   ////////////////////////////////////////////////////////////////////////////
-  // DesktopEnvironment::EventHandler implementations
-  virtual void LocalLoginSucceeded();
-  virtual void LocalLoginFailed();
+  // ClientSession::EventHandler implementations
+  virtual void LocalLoginSucceeded(
+      scoped_refptr<protocol::ConnectionToClient> client);
+  virtual void LocalLoginFailed(
+      scoped_refptr<protocol::ConnectionToClient> client);
 
   // Callback for ChromotingServer.
   void OnNewClientSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response);
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
-  // This getter is only used in unit test.
-  protocol::HostStub* host_stub() const;
-
   // This setter is only used in unit test to simulate client connection.
-  void set_connection(protocol::ConnectionToClient* conn) {
-    connection_ = conn;
+  void add_client(ClientSession* client) {

[awong, 2011/03/22 15:11:56]

Chromium style says, add_client() shoudl only be used if this is a trivial
setter.  Please rename AddClient(), and take the implementation out-of-line.

[simonmorris, 2011/03/23 10:35:20]

Done.

+    clients_.push_back(client);
   }
 
  private:
   friend class base::RefCountedThreadSafe<ChromotingHost>;
 
   ChromotingHost(ChromotingHostContext* context, MutableHostConfig* config,
                  DesktopEnvironment* environment);
   virtual ~ChromotingHost();
 
   enum State {
@@ skipping 23 matching lines @@
   // receive connection requests from chromoting client.
   scoped_refptr<JingleClient> jingle_client_;
 
   scoped_refptr<protocol::SessionManager> session_manager_;
 
   // Objects that takes care of sending heartbeats to the chromoting bot.
   scoped_refptr<HeartbeatSender> heartbeat_sender_;
 
   AccessVerifier access_verifier_;
 
-  // A ConnectionToClient manages the connectino to a remote client.
-  // TODO(hclam): Expand this to a list of clients.
-  scoped_refptr<protocol::ConnectionToClient> connection_;
+  // The connections to remote clients.
+  std::vector<scoped_refptr<ClientSession> > clients_;
 
   // Session manager for the host process.
   scoped_refptr<ScreenRecorder> recorder_;
 
   // This task gets executed when this object fails to connect to the
   // talk network or Shutdown() is called.
   scoped_ptr<Task> shutdown_task_;
 
   // Tracks the internal state of the host.
   // This variable is written on the main thread of ChromotingHostContext
   // and read by jingle thread.
   State state_;
 
   // Lock is to lock the access to |state_|.
   base::Lock lock_;
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_