[Chromoting] LogToServer correctly handles multiple simultaneous connections.

remoting/host/log_to_server.h

 // Copyright (c) 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.
 
 #ifndef REMOTING_HOST_LOG_TO_SERVER_H_
 #define REMOTING_HOST_LOG_TO_SERVER_H_
 
 #include <deque>
+#include <map>
+#include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/server_log_entry.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/transport.h"
 
 namespace base {
@@ skipping 16 matching lines @@
                     public HostStatusObserver,
                     public SignalStrategy::Listener {
  public:
   explicit LogToServer(ChromotingHost* host,
                        ServerLogEntry::Mode mode,
                        SignalStrategy* signal_strategy);
   virtual ~LogToServer();
 
   // Logs a session state change. Currently, this is either
   // connection or disconnection.
-  void LogSessionStateChange(bool connected);
+  void LogSessionStateChange(const std::string& jid, bool connected);
 
   // SignalStrategy::Listener interface.
   virtual void OnSignalStrategyStateChange(
       SignalStrategy::State state) OVERRIDE;
 
   // HostStatusObserver interface.
   virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
   virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
   virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
       const protocol::TransportRoute& route) OVERRIDE;
   virtual void OnShutdown() OVERRIDE;
 
  private:
+  class ConnectionInfo {
+   public:
+    ConnectionInfo();
+    void set_route_type(const protocol::TransportRoute::RouteType& route_type);
+    protocol::TransportRoute::RouteType get_route_type() const;
+    bool get_route_type_set() const;
+
+   private:
+    protocol::TransportRoute::RouteType route_type_;
+    bool route_type_set_;

[Wez, 2012/05/21 20:40:13]

Can you use the presence of an entry for the client connection JID in the
|connection_info/type_| table as indicating that the type is set, and thereby
avoid the need for this class?

[simonmorris, 2012/05/21 22:34:36]

Done.

+  };
+
   void Log(const ServerLogEntry& entry);
   void SendPendingEntries();
 
   scoped_refptr<ChromotingHost> host_;
   ServerLogEntry::Mode mode_;
   SignalStrategy* signal_strategy_;
   scoped_ptr<IqSender> iq_sender_;
-  protocol::TransportRoute::RouteType connection_type_;
-  bool connection_type_set_;
+  // A map from client JID to info about that client's connection to this host.
+  std::map<std::string, ConnectionInfo> connection_info_;
   std::deque<ServerLogEntry> pending_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(LogToServer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_LOG_TO_SERVER_H_