X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=d64c942801fa6f017fcca5022a8044b95def07ea;hb=6279a01bf5b6da48bedfdfe2d39dde69e46ae401;hp=fa7ea0cfb2e9de0c65a670025ebc020391bcffb6;hpb=a266dadd1351d10b56ec187c7b6f7af75350ed68;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/users.h b/include/users.h index fa7ea0cfb..d64c94280 100644 --- a/include/users.h +++ b/include/users.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -16,12 +16,18 @@ #include "inspircd_config.h" #include "channels.h" -#include "connection.h" #include "inspstring.h" +#include "connection.h" #include +#ifdef THREADED_DNS +#include +#endif #ifndef __USERS_H__ #define __USERS_H__ + +#include "hashcomp.h" +#include "cull_list.h" #define STATUS_OP 4 #define STATUS_HOP 2 @@ -31,12 +37,14 @@ #define CC_ALLOW 0 #define CC_DENY 1 +template inline string ConvToStr(const T &in); + /** Holds a channel name to which a user has been invited. */ class Invited : public classbase { public: - char channel[CHANMAX]; + irc::string channel; }; @@ -47,7 +55,7 @@ class ConnectClass : public classbase public: /** Type of line, either CC_ALLOW or CC_DENY */ - int type; + char type; /** Max time to register the connection in seconds */ int registration_timeout; @@ -56,17 +64,17 @@ class ConnectClass : public classbase int flood; /** Host mask for this line */ - char host[MAXBUF]; + std::string host; /** Number of seconds between pings for this line */ int pingtime; /** (Optional) Password for this line */ - char pass[MAXBUF]; + std::string pass; /** Threshold value for flood disconnect */ - long threshold; + int threshold; /** Maximum size of sendq for users in this class (bytes) */ @@ -75,17 +83,17 @@ class ConnectClass : public classbase /** Maximum size of recvq for users in this class (bytes) */ long recvqmax; + + /** Local max when connecting by this connection class + */ + long maxlocal; + + /** Global max when connecting by this connection class + */ + long maxglobal; - ConnectClass() + ConnectClass() : registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0) { - registration_timeout = 0; - flood = 0; - pingtime = 0; - threshold = 0; - sendqmax = 0; - recvqmax = 0; - strlcpy(host,"",MAXBUF); - strlcpy(pass,"",MAXBUF); } }; @@ -121,39 +129,38 @@ class userrec : public connection char nick[NICKMAX]; /** The users ident reply. + * Two characters are added to the user-defined limit to compensate for the tilde etc. */ - char ident[64]; + char ident[IDENTMAX+2]; /** The host displayed to non-opers (used for cloaking etc). * This usually matches the value of userrec::host. */ - char dhost[256]; + char dhost[160]; /** The users full name. */ - char fullname[128]; + char fullname[MAXGECOS+1]; /** 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. + * it is limited to length 54, as there can only be a maximum of 52 + * user modes (26 upper, 26 lower case) a null terminating char, and + * an optional + character. */ - char modes[MAXBUF]; + char modes[54]; - ucrec chans[MAXCHANS]; + std::vector chans; /** The server the user is connected to. */ - char server[256]; + char* server; /** The user's away message. * If this string is empty, the user is not marked as away. */ - char awaymsg[512]; - - /** 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]; + char awaymsg[MAXAWAY+1]; /** Number of lines the user can place into the buffer * (up to the global NetBufferSize bytes) before they @@ -165,7 +172,7 @@ class userrec : public connection * If they do not send their details in this time limit they * will be disconnected */ - unsigned long timeout; + unsigned int timeout; /** The oper type they logged in as, if they are an oper. * This is used to check permissions in operclasses, so that @@ -180,13 +187,13 @@ class userrec : public connection /** Number of seconds between PINGs for this user (set from <connect:allow> tag */ - unsigned long pingmax; + unsigned int pingmax; /** Password specified by the user when they registered. * This is stored even if the block doesnt need a password, so that * modules may check it. */ - char password[MAXBUF]; + char password[64]; /** User's receive queue. * Lines from the IRCd awaiting processing are stored here. @@ -201,10 +208,14 @@ class userrec : public connection /** Flood counters */ - long lines_in; + int lines_in; time_t reset_due; long threshold; + /** IPV4 ip address + */ + in_addr ip4; + /* Write error string */ std::string WriteError; @@ -219,8 +230,6 @@ class userrec : public connection userrec(); - virtual ~userrec() { } - /** Returns the full displayed host of the user * This member function returns the hostname of the user as seen by other users * on the server, in nick!ident&at;host form. @@ -236,23 +245,27 @@ class userrec : public connection /** Returns true if a user is invited to a channel. */ - virtual bool IsInvited(char* channel); + virtual bool IsInvited(irc::string &channel); /** Adds a channel to a users invite list (invites them to a channel) */ - virtual void InviteTo(char* channel); + virtual void InviteTo(irc::string &channel); /** Removes a channel from a users invite list. * This member function is called on successfully joining an invite only channel * to which the user has previously been invited, to clear the invitation. */ - virtual void RemoveInvite(char* channel); + virtual void RemoveInvite(irc::string &channel); /** Returns true or false for if a user can execute a privilaged oper command. * This is done by looking up their oper type from userrec::oper, then referencing * this to their oper classes and checking the commands they can execute. */ - bool HasPermission(char* command); + bool HasPermission(std::string &command); + + /** Calls read() to read some data for this user using their fd. + */ + int ReadData(void* buffer, size_t size); /** This method adds data to the buffer of the user. * The buffer can grow to any size within limits of the available memory, @@ -308,7 +321,47 @@ class userrec : public connection */ void FlushWriteBuf(); + /** Returns the list of channels this user has been invited to but has not yet joined. + */ + InvitedList* GetInviteList(); + + void MakeHost(char* nhost); + + char* MakeWildHost(); + + /** Shuts down and closes the user's socket + */ + void CloseSocket(); + + virtual ~userrec(); + +#ifdef THREADED_DNS + pthread_t dnsthread; +#endif +}; + +/** A lightweight userrec used by WHOWAS + */ +class WhoWasUser +{ + public: + char nick[NICKMAX]; + char ident[IDENTMAX+1]; + char dhost[160]; + char host[160]; + char fullname[MAXGECOS+1]; + char server[256]; + time_t signon; }; +void AddOper(userrec* user); +void DeleteOper(userrec* user); +void kill_link(userrec *user,const char* r); +void kill_link_silent(userrec *user,const char* r); +void AddWhoWas(userrec* u); +void AddClient(int socket, int port, bool iscached, in_addr ip4); +void FullConnectUser(userrec* user, CullList* Goners); +userrec* ReHashNick(char* Old, char* New); +void force_nickchange(userrec* user,const char* newnick); #endif