X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=d20de55a3a83ca181763e91ee9548e233b304383;hb=052dde3aead635863aaefbdafeae5daa6d8eecf8;hp=dddda8dd69d5cff4e3de7098f2ed32ddc1fd513b;hpb=73b9d0c5cb02f0ea8350de28bc3687e0af70ea0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/users.h b/include/users.h index dddda8dd6..d20de55a3 100644 --- a/include/users.h +++ b/include/users.h @@ -1,36 +1,11 @@ /* -$Log$ -Revision 1.1 2003/01/23 19:45:58 brain -Initial revision - -Revision 1.9 2003/01/22 00:44:26 brain -Added documentation comments - -Revision 1.8 2003/01/21 21:11:17 brain -Added documentation - -Revision 1.7 2003/01/17 13:21:38 brain -Added CONNECT ALLOW and CONNECT DENY config tags -Added PASS command - -Revision 1.6 2003/01/17 10:37:55 brain -Added /INVITE command and relevent structures - -Revision 1.5 2003/01/16 20:11:56 brain -fixed some ugly pointer bugs (thanks dblack and a|KK|y!) - -Revision 1.4 2003/01/15 22:47:44 brain -Changed user and channel structs to classes (finally) - -Revision 1.3 2003/01/14 21:14:30 brain -added /ISON command (for mIRC etc basic notify) - */ #include "inspircd_config.h" #include "channels.h" +#include "connection.h" #include @@ -47,7 +22,7 @@ added /ISON command (for mIRC etc basic notify) /** Holds a channel name to which a user has been invited. */ -class Invited +class Invited : public classbase { public: char channel[CHANMAX]; @@ -56,23 +31,31 @@ class Invited /** Holds information relevent to <connect allow> and <connect deny> tags in the config file. */ -class ConnectClass +class ConnectClass : public classbase { public: int type; + int registration_timeout; char host[MAXBUF]; char pass[MAXBUF]; + + ConnectClass() + { + registration_timeout = 0; + strcpy(host,""); + strcpy(pass,""); + } }; /** Holds a complete list of all channels to which a user has been invited and has not yet joined. */ -typedef vector InvitedList; +typedef std::vector InvitedList; /** Holds a complete list of all allow and deny tags from the configuration file (connection classes) */ -typedef vector ClassVector; +typedef std::vector ClassVector; /** Holds all information about a user * This class stores all information about a user connected to the irc server. Everything about a @@ -80,7 +63,7 @@ typedef vector ClassVector; * user's nickname and hostname. Use the Find method of the server class to locate a specific user * by nickname. */ -class userrec +class userrec : public connection { private: @@ -95,18 +78,10 @@ class userrec char nick[NICKMAX]; - /** The users ip address in network order. - */ - unsigned long ip; - /** The users ident reply. */ char ident[64]; - /** The users hostname, or ip address in string form. - */ - char host[256]; - /** The host displayed to non-opers (used for cloaking etc). * This usually matches the value of userrec::host. */ @@ -116,55 +91,12 @@ class userrec */ char fullname[128]; - /** The users file descriptor. - * If this is zero, the socket has been closed and the core has not yet - * realised and removed the record from memory. - */ - int fd; - /** The user's mode string. * This may contain any of the following RFC characters: o, w, s, i * Your module may define other mode characters as it sees fit. */ - char modes[32]; + char modes[MAXBUF]; - /** The users input buffer. - * Used by the C recv() function. - */ - char inbuf[MAXBUF]; - - /** The last time the user was pinged by the core. - * When this value is more than 120 seconds difference from 'time(NULL)', a ping is sent - * to the client. If the user has an outstanding PING request the next time this - * event occurs after 4 total minutes, they are disconnected. - */ - time_t lastping; - - /** The users signon time. - */ - time_t signon; - - /** The time the user last sent a message. - * See also userrec::lastping and userrec::signon - */ - time_t idle_lastmsg; - - /** True if the user replied to their last ping. - * If this is true, the user can be sent another ping at the specified time, otherwise - * they will be discnnected. See also userrec::lastping - */ - time_t nping; - - /** Bit 1 is set if the user sent a NICK command, bit 2 is set if the user sent a USER command. - * If both bits are set then the connection is awaiting MOTD. Sending of MOTD sets bit 3, and - * makes the value of userrec::registered == 7, showing a fully established client session. - */ - int registered; - - /** A list of the channels the user is currently on. - * If any of these values are NULL, the record is not in use and may be associated with - * a channel by the JOIN command. see RFC 1459. - */ ucrec chans[MAXCHANS]; /** The server the user is connected to. @@ -176,40 +108,12 @@ class userrec */ char awaymsg[512]; - /** The port that the user connected to. - */ - int port; - - /** Stores the number of incoming bytes from the connection. - * Used by /STATS - */ - long bytes_in; - - /** Stores the number of outgoing bytes to the connection. - * Used by /STATS - */ - long bytes_out; - - /** Stores the number of incoming commands from the connection. - * Used by /STATS - */ - long cmds_in; - - /** Stores the number of outgoing commands to the connection. - * Used by /STATS - */ - long cmds_out; - /** Stores the result of the last GetFullHost or GetRealHost call. * You may use this to increase the speed of use of this class. */ char result[256]; - /** True if a correct password has been given using PASS command. - * If the user is a member of a connection class that does not require a password, - * the value stored here is of no use. - */ - bool haspassed; + unsigned long timeout; userrec();