diff options
| -rw-r--r-- | include/connection.h | 79 | ||||
| -rw-r--r-- | include/users.h | 52 |
2 files changed, 50 insertions, 81 deletions
diff --git a/include/connection.h b/include/connection.h deleted file mode 100644 index c90a953d2..000000000 --- a/include/connection.h +++ /dev/null @@ -1,79 +0,0 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ - * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits - * - * This program is free but copyrighted software; see - * the file COPYING for details. - * - * --------------------------------------------------- - */ - -#ifndef __CONNECTION_H__ -#define __CONNECTION_H__ - -#include <ctime> -#include "inspircd_config.h" -#include "base.h" -#include "socketengine.h" - -/** connection is the base class of User, and holds basic user properties. - * This can be extended for holding other user-like objects in the future. - */ -class CoreExport connection : public EventHandler -{ - public: - /** Hostname of connection. - * This should be valid as per RFC1035. - */ - std::string host; - - /** Stats counter for bytes inbound - */ - int bytes_in; - - /** Stats counter for bytes outbound - */ - int bytes_out; - - /** Stats counter for commands inbound - */ - int cmds_in; - - /** Stats counter for commands outbound - */ - int cmds_out; - - /** True if user has authenticated, false if otherwise - */ - bool haspassed; - - /** Used by User to indicate the registration status of the connection - * It is a bitfield of the REG_NICK, REG_USER and REG_ALL bits to indicate - * the connection state. - */ - char registered; - - /** Time the connection was last pinged - */ - time_t lastping; - - /** Time the connection was created, set in the constructor. This - * may be different from the time the user's classbase object was - * created. - */ - time_t signon; - - /** Time that the connection last sent a message, used to calculate idle time - */ - time_t idle_lastmsg; - - /** Used by PING checking code - */ - time_t nping; -}; - - -#endif diff --git a/include/users.h b/include/users.h index 508681ddd..c4c85fb0f 100644 --- a/include/users.h +++ b/include/users.h @@ -15,7 +15,6 @@ #define __USERS_H__ #include "socket.h" -#include "connection.h" #include "dns.h" #include "mode.h" @@ -413,7 +412,7 @@ class CoreExport VisData * by nickname, or the FindDescriptor method of the InspIRCd class to find a specific user by their * file descriptor value. */ -class CoreExport User : public connection +class CoreExport User : public EventHandler { private: /** Pointer to creator. @@ -472,6 +471,55 @@ class CoreExport User : public connection */ VisData* Visibility; + /** Hostname of connection. + * This should be valid as per RFC1035. + */ + std::string host; + + /** Stats counter for bytes inbound + */ + int bytes_in; + + /** Stats counter for bytes outbound + */ + int bytes_out; + + /** Stats counter for commands inbound + */ + int cmds_in; + + /** Stats counter for commands outbound + */ + int cmds_out; + + /** True if user has authenticated, false if otherwise + */ + bool haspassed; + + /** Used by User to indicate the registration status of the connection + * It is a bitfield of the REG_NICK, REG_USER and REG_ALL bits to indicate + * the connection state. + */ + char registered; + + /** Time the connection was last pinged + */ + time_t lastping; + + /** Time the connection was created, set in the constructor. This + * may be different from the time the user's classbase object was + * created. + */ + time_t signon; + + /** Time that the connection last sent a message, used to calculate idle time + */ + time_t idle_lastmsg; + + /** Used by PING checking code + */ + time_t nping; + /** Stored reverse lookup from res_forward */ std::string stored_host; |