diff options
| author | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:43:58 +0000 |
|---|---|---|
| committer | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:43:58 +0000 |
| commit | b67b395db6db42fc165eb1ea888232653241e91c (patch) | |
| tree | 7e51178137af23eafd49d45bce64214bc78c6812 /remoting/host/log_to_server.h | |
| parent | ccc6118cf1b753febff945ab984bf0efec5cdd6e (diff) | |
| download | chromium_src-b67b395db6db42fc165eb1ea888232653241e91c.zip chromium_src-b67b395db6db42fc165eb1ea888232653241e91c.tar.gz chromium_src-b67b395db6db42fc165eb1ea888232653241e91c.tar.bz2 | |
[Chromoting] LogToServer correctly handles multiple simultaneous connections.
BUG=128753
Review URL: https://chromiumcodereview.appspot.com/10413035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/log_to_server.h')
| -rw-r--r-- | remoting/host/log_to_server.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/remoting/host/log_to_server.h b/remoting/host/log_to_server.h index 520eeee..765239645 100644 --- a/remoting/host/log_to_server.h +++ b/remoting/host/log_to_server.h @@ -6,6 +6,8 @@ #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" @@ -42,7 +44,7 @@ class LogToServer : public base::NonThreadSafe, // 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( @@ -64,8 +66,10 @@ class LogToServer : public base::NonThreadSafe, 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 the route type of that client's connection to + // this host. + std::map<std::string, protocol::TransportRoute::RouteType> + connection_route_type_; std::deque<ServerLogEntry> pending_entries_; DISALLOW_COPY_AND_ASSIGN(LogToServer); |