OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef REMOTING_HOST_LOG_TO_SERVER_H_ | 5 #ifndef REMOTING_HOST_LOG_TO_SERVER_H_ |
6 #define REMOTING_HOST_LOG_TO_SERVER_H_ | 6 #define REMOTING_HOST_LOG_TO_SERVER_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 | 9 |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/threading/non_thread_safe.h" | 12 #include "base/threading/non_thread_safe.h" |
13 #include "remoting/host/host_status_observer.h" | 13 #include "remoting/host/host_status_observer.h" |
14 #include "remoting/host/server_log_entry.h" | 14 #include "remoting/host/server_log_entry.h" |
15 #include "remoting/jingle_glue/signal_strategy.h" | 15 #include "remoting/jingle_glue/signal_strategy.h" |
| 16 #include "remoting/protocol/transport.h" |
16 | 17 |
17 namespace base { | 18 namespace base { |
18 class MessageLoopProxy; | 19 class MessageLoopProxy; |
19 } // namespace base | 20 } // namespace base |
20 | 21 |
21 namespace buzz { | 22 namespace buzz { |
22 class XmlElement; | 23 class XmlElement; |
23 } // namespace buzz | 24 } // namespace buzz |
24 | 25 |
25 namespace remoting { | 26 namespace remoting { |
(...skipping 18 matching lines...) Expand all Loading... |
44 void LogSessionStateChange(bool connected); | 45 void LogSessionStateChange(bool connected); |
45 | 46 |
46 // SignalStrategy::Listener interface. | 47 // SignalStrategy::Listener interface. |
47 virtual void OnSignalStrategyStateChange( | 48 virtual void OnSignalStrategyStateChange( |
48 SignalStrategy::State state) OVERRIDE; | 49 SignalStrategy::State state) OVERRIDE; |
49 | 50 |
50 // HostStatusObserver interface. | 51 // HostStatusObserver interface. |
51 virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE; | 52 virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE; |
52 virtual void OnClientDisconnected(const std::string& jid) OVERRIDE; | 53 virtual void OnClientDisconnected(const std::string& jid) OVERRIDE; |
53 virtual void OnAccessDenied(const std::string& jid) OVERRIDE; | 54 virtual void OnAccessDenied(const std::string& jid) OVERRIDE; |
| 55 virtual void OnClientRouteChange( |
| 56 const std::string& jid, |
| 57 const std::string& channel_name, |
| 58 const protocol::TransportRoute& route) OVERRIDE; |
54 virtual void OnShutdown() OVERRIDE; | 59 virtual void OnShutdown() OVERRIDE; |
55 | 60 |
56 private: | 61 private: |
57 void Log(const ServerLogEntry& entry); | 62 void Log(const ServerLogEntry& entry); |
58 void SendPendingEntries(); | 63 void SendPendingEntries(); |
59 | 64 |
60 scoped_refptr<ChromotingHost> host_; | 65 scoped_refptr<ChromotingHost> host_; |
61 ServerLogEntry::Mode mode_; | 66 ServerLogEntry::Mode mode_; |
62 SignalStrategy* signal_strategy_; | 67 SignalStrategy* signal_strategy_; |
63 scoped_ptr<IqSender> iq_sender_; | 68 scoped_ptr<IqSender> iq_sender_; |
| 69 protocol::TransportRoute::RouteType connection_type_; |
| 70 bool connection_type_set_; |
64 std::deque<ServerLogEntry> pending_entries_; | 71 std::deque<ServerLogEntry> pending_entries_; |
65 | 72 |
66 DISALLOW_COPY_AND_ASSIGN(LogToServer); | 73 DISALLOW_COPY_AND_ASSIGN(LogToServer); |
67 }; | 74 }; |
68 | 75 |
69 } // namespace remoting | 76 } // namespace remoting |
70 | 77 |
71 #endif // REMOTING_HOST_LOG_TO_SERVER_H_ | 78 #endif // REMOTING_HOST_LOG_TO_SERVER_H_ |
OLD | NEW |