| Index: remoting/host/gnubby_auth_handler_posix.h
|
| diff --git a/remoting/host/gnubby_auth_handler_posix.h b/remoting/host/gnubby_auth_handler_posix.h
|
| index ea0e3b6175b4c006b79c47069a56716ad5705142..419812faae7e270d42cd4a8fb3b66556e089f473 100644
|
| --- a/remoting/host/gnubby_auth_handler_posix.h
|
| +++ b/remoting/host/gnubby_auth_handler_posix.h
|
| @@ -7,19 +7,25 @@
|
|
|
| #include <map>
|
| #include <string>
|
| -#include <vector>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "net/socket/stream_listen_socket.h"
|
| #include "remoting/host/gnubby_auth_handler.h"
|
|
|
| +namespace base {
|
| +class DictionaryValue;
|
| +class Timer;
|
| +} // namespace base
|
| +
|
| namespace remoting {
|
|
|
| namespace protocol {
|
| class ClientStub;
|
| } // namespace protocol
|
|
|
| +class GnubbySocket;
|
| +
|
| class GnubbyAuthHandlerPosix : public GnubbyAuthHandler,
|
| public base::NonThreadSafe,
|
| public net::StreamListenSocket::Delegate {
|
| @@ -28,8 +34,13 @@ class GnubbyAuthHandlerPosix : public GnubbyAuthHandler,
|
| virtual ~GnubbyAuthHandlerPosix();
|
|
|
| bool HasActiveSocketForTesting(net::StreamListenSocket* socket) const;
|
| + int GetConnectionIdForTesting(net::StreamListenSocket* socket) const;
|
| + GnubbySocket* GetGnubbySocketForTesting(
|
| + net::StreamListenSocket* socket) const;
|
|
|
| private:
|
| + typedef std::map<int, GnubbySocket*> ActiveSockets;
|
| +
|
| // GnubbyAuthHandler interface.
|
| virtual void DeliverClientMessage(const std::string& message) OVERRIDE;
|
| virtual void DeliverHostDataMessage(int connection_id,
|
| @@ -47,7 +58,16 @@ class GnubbyAuthHandlerPosix : public GnubbyAuthHandler,
|
| void CreateAuthorizationSocket();
|
|
|
| // Process a gnubby request.
|
| - void ProcessGnubbyRequest(int connection_id, const char* data, int data_len);
|
| + void ProcessGnubbyRequest(int connection_id, const std::string& request_data);
|
| +
|
| + // Gets an active socket iterator for the connection id in |dictionary|.
|
| + ActiveSockets::iterator GetActiveSocket(base::DictionaryValue* dictionary);
|
| +
|
| + // Send an error and close an active socket.
|
| + void SendErrorAndCloseActiveSocket(const ActiveSockets::iterator& iter);
|
| +
|
| + // A request timed out.
|
| + void RequestTimedOut(int connection_id);
|
|
|
| // Interface through which communication with the client occurs.
|
| protocol::ClientStub* client_stub_;
|
| @@ -59,13 +79,8 @@ class GnubbyAuthHandlerPosix : public GnubbyAuthHandler,
|
| int last_connection_id_;
|
|
|
| // Sockets by connection id used to process gnubbyd requests.
|
| - typedef std::map<int, net::StreamListenSocket*> ActiveSockets;
|
| ActiveSockets active_sockets_;
|
|
|
| - // Partial gnubbyd request data by connection id.
|
| - typedef std::map<int, std::vector<char> > ActiveRequests;
|
| - ActiveRequests active_requests_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerPosix);
|
| };
|
|
|
|
|