X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=a7d1c92505cbacb08ff57b517fae7916b0312b28;hb=49ef1162a51906e7444bb7e38736bd816c317db6;hp=71563abfa9354f482d8a3979f3cae52b3ed2ae62;hpb=1e639377cbad496a0b5f7d969a88fb808508f811;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/users.h b/include/users.h index 71563abfa..a7d1c9250 100644 --- a/include/users.h +++ b/include/users.h @@ -14,30 +14,43 @@ * --------------------------------------------------- */ -#include "inspircd_config.h" -#include "channels.h" -#include "inspstring.h" -#include "connection.h" +#ifndef __USERS_H__ +#define __USERS_H__ + #include + #ifdef THREADED_DNS #include #endif - -#ifndef __USERS_H__ -#define __USERS_H__ +#include "inspircd_config.h" +#include "socket.h" +#include "channels.h" +#include "inspstring.h" +#include "connection.h" #include "hashcomp.h" #include "cull_list.h" - -#define STATUS_OP 4 -#define STATUS_HOP 2 -#define STATUS_VOICE 1 -#define STATUS_NORMAL 0 -#define CC_ALLOW 0 -#define CC_DENY 1 +enum ChanStatus { + STATUS_OP = 4, + STATUS_HOP = 2, + STATUS_VOICE = 1, + STATUS_NORMAL = 0 +}; + +enum ClassTypes { + CC_ALLOW = 0, + CC_DENY = 1 +}; -template string ConvToStr(const T &in); +/** RFC1459 channel modes + * */ +enum UserModes { + UM_SERVERNOTICE = 's'-65, + UM_WALLOPS = 'w'-65, + UM_INVISIBLE = 'i'-65, + UM_OPERATOR = 'o'-65, +}; /** Holds a channel name to which a user has been invited. */ @@ -107,6 +120,10 @@ typedef std::vector InvitedList; */ typedef std::vector ClassVector; +/** Typedef for the list of user-channel records for a user + */ +typedef std::vector UserChanList; + /** Holds all information about a user * This class stores all information about a user connected to the irc server. Everything about a * connection is stored here primarily, from the user's socket ID (file descriptor) through to the @@ -136,26 +153,28 @@ class userrec : public connection /** The host displayed to non-opers (used for cloaking etc). * This usually matches the value of userrec::host. */ - char dhost[64]; + char dhost[65]; /** The users full name. */ 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[54]; - - std::vector chans; + /** The user's mode list. + * This is NOT a null terminated string! In the 1.1 version of InspIRCd + * this is an array of values in a similar way to channel modes. + * A value of 1 in field (modeletter-65) indicates that the mode is + * set, for example, to work out if mode +s is set, we check the field + * userrec::modes['s'-65] != 0. + * The following RFC characters o, w, s, i have constants defined via an + * enum, such as UM_SERVERNOTICE and UM_OPETATOR. + */ + char modes[64]; + + UserChanList chans; /** The server the user is connected to. */ - char* server; + const char* server; /** The user's away message. * If this string is empty, the user is not marked as away. @@ -228,6 +247,8 @@ class userrec : public connection */ long recvqmax; + /** Default constructor + */ userrec(); /** Returns the full displayed host of the user @@ -242,6 +263,15 @@ class userrec : public connection * e.g. through a module, then this method will ignore it and return the true hostname. */ virtual char* GetFullRealHost(); + + /* + * Create a displayable mode string for this users umodes + */ + const char* FormatModes(); + + bool IsModeSet(unsigned char m); + + void SetMode(unsigned char m, bool value); /** Returns true if a user is invited to a channel. */ @@ -261,7 +291,7 @@ class userrec : public connection * 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(std::string &command); + bool HasPermission(const std::string &command); /** Calls read() to read some data for this user using their fd. */ @@ -274,7 +304,7 @@ class userrec : public connection * RFC-specified limit per line) then the method will return false and the * text will not be inserted. */ - bool AddBuffer(std::string a); + bool AddBuffer(const std::string &a); /** This method returns true if the buffer contains at least one carriage return * character (e.g. one complete line may be read) @@ -299,19 +329,19 @@ class userrec : public connection * The WriteErrors of clients are checked at a more ideal time (in the mainloop) and * errored clients purged. */ - void SetWriteError(std::string error); + void SetWriteError(const std::string &error); /** Returns the write error which last occured on this connection or an empty string * if none occured. */ - std::string GetWriteError(); + const char* GetWriteError(); /** Adds to the user's write buffer. * You may add any amount of text up to this users sendq value, if you exceed the * sendq value, SetWriteError() will be called to set the users error string to * "SendQ exceeded", and further buffer adds will be dropped. */ - void AddWriteBuf(std::string data); + void AddWriteBuf(const std::string &data); /** Flushes as much of the user's buffer to the file descriptor as possible. * This function may not always flush the entire buffer, rather instead as much of it @@ -325,28 +355,40 @@ class userrec : public connection */ InvitedList* GetInviteList(); - void MakeHost(char* nhost); - + /** Creates a wildcard host. + * Takes a buffer to use and fills the given buffer with the host in the format *!*@hostname + */ char* MakeWildHost(); + /** Creates a host. + * Takes a buffer to use and fills the given buffer with the host in the format nick!user@host + */ + void MakeHost(char* nhost); + /** Shuts down and closes the user's socket */ void CloseSocket(); + /** Default destructor + */ virtual ~userrec(); #ifdef THREADED_DNS + /** Thread used for threaded lookups + */ pthread_t dnsthread; #endif }; +/** Used to hold WHOWAS information + */ class WhoWasGroup { public: char* host; char* dhost; char* ident; - char* server; + const char* server; char* gecos; time_t signon; @@ -357,9 +399,6 @@ class WhoWasGroup typedef std::deque whowas_set; typedef std::map whowas_users; -/** A lightweight userrec used by WHOWAS - */ - void AddOper(userrec* user); void DeleteOper(userrec* user); void kill_link(userrec *user,const char* r); @@ -370,6 +409,15 @@ 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); -void ReadClassesAndTypes(); + +/* Configuration callbacks */ +bool InitTypes(const char* tag); +bool InitClasses(const char* tag); +bool DoType(const char* tag, char** entries, void** values, int* types); +bool DoClass(const char* tag, char** entries, void** values, int* types); +bool DoneClassesAndTypes(const char* tag); + +long FindMatchingGlobal(userrec* user); +long FindMatchingLocal(userrec* user); #endif