X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fchannels.h;h=a6568cb1e8198ffd25ccd286725cf7d427b09b32;hb=c73881748324fb454153c2d0fd85e8b80996b2b7;hp=c00ab054101973b7ba23ad964412d55e52e6e15c;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/channels.h b/include/channels.h index c00ab0541..a6568cb1e 100644 --- a/include/channels.h +++ b/include/channels.h @@ -24,12 +24,14 @@ #include #include -#define CM_TOPICLOCK 1 -#define CM_NOEXTERNAL 2 -#define CM_INVITEONLY 4 -#define CM_MODERATED 8 -#define CM_SECRET 16 -#define CM_PRIVATE 32 +enum ChannelModes { + CM_TOPICLOCK = 1, + CM_NOEXTERNAL = 2, + CM_INVITEONLY = 4, + CM_MODERATED = 8, + CM_SECRET = 16, + CM_PRIVATE = 32 +}; class userrec; @@ -72,19 +74,6 @@ class InviteItem : public HostItem { }; - -/** Holds a custom parameter to a module-defined channel mode - * e.g. for +L this would hold the channel name. - */ - -class ModeParameter : public classbase -{ - public: - char mode; - char parameter[MAXBUF]; - char channel[CHANMAX]; -}; - /** Holds a complete ban list */ typedef std::vector BanList; @@ -97,6 +86,16 @@ typedef std::vector ExemptList; */ typedef std::vector InviteList; +class userrec; + +/** A list of users on a channel + */ +typedef std::map CUList; + +/** A list of custom modes parameters on a channel + */ +typedef std::map CustomModeList; + /** Holds all relevent information for a channel. * This class represents a channel, and contains its name, modes, time created, topic, topic set time, * etc, and an instance of the BanList type. @@ -110,17 +109,26 @@ class chanrec : public Extensible /** Custom modes for the channel. * Plugins may use this field in any way they see fit. */ - char custom_modes[MAXMODES]; /* modes handled by modules */ + char custom_modes[64]; /* modes handled by modules */ - /** User list (casted to char*'s to stop forward declaration stuff) - * (chicken and egg scenario!) + /** User lists + * There are four user lists, one for + * all the users, one for the ops, one for + * the halfops and another for the voices. */ - std::map internal_userlist; - + CUList internal_userlist; + CUList internal_op_userlist; + CUList internal_halfop_userlist; + CUList internal_voice_userlist; + + /** Parameters for custom modes + */ + CustomModeList custom_mode_params; + /** Channel topic. * If this is an empty string, no channel topic is set. */ - char topic[MAXBUF]; + char topic[MAXTOPIC]; /** Creation time. */ time_t created; @@ -145,7 +153,7 @@ class chanrec : public Extensible /** Contains a bitmask of the CM_* builtin (RFC) binary mode symbols */ - char binarymodes; + //char binarymodes; /** The list of all bans set on the channel. */ @@ -192,33 +200,41 @@ class chanrec : public Extensible long GetUserCounter(); /** Add a user pointer to the internal reference list - * @param castuser This should be a pointer to a userrec, casted to char* + * @param user The user to add * * The data inserted into the reference list is a table as it is * an arbitary pointer compared to other users by its memory address, * as this is a very fast 32 or 64 bit integer comparison. */ - void AddUser(char* castuser); + void AddUser(userrec* user); + void AddOppedUser(userrec* user); + void AddHalfoppedUser(userrec* user); + void AddVoicedUser(userrec* user); /** Delete a user pointer to the internal reference list - * @param castuser This should be a pointer to a userrec, casted to char* - * - * The data removed from the reference list is a table as it is - * an arbitary pointer compared to other users by its memory address, - * as this is a very fast 32 or 64 bit integer comparison. + * @param user The user to delete + * @return number of users left on the channel */ - void DelUser(char* castuser); + unsigned long DelUser(userrec* user); + void DelOppedUser(userrec* user); + void DelHalfoppedUser(userrec* user); + void DelVoicedUser(userrec* user); /** Obrain the internal reference list - * The internal reference list contains a list of userrec* - * cast to char*. These are used for rapid comparison to determine + * The internal reference list contains a list of userrec*. + * These are used for rapid comparison to determine * channel membership for PRIVMSG, NOTICE, QUIT, PART etc. * The resulting pointer to the vector should be considered * readonly and only modified via AddUser and DelUser. * - * @return This function returns a vector of userrec pointers, each of which has been casted to char* to prevent circular references + * @return This function returns pointer to a map of userrec pointers (CUList*). */ - std::map *GetUsers(); + CUList* GetUsers(); + CUList* GetOppedUsers(); + CUList* GetHalfoppedUsers(); + CUList* GetVoicedUsers(); + + bool HasUser(userrec* user); /** Creates a channel record and initialises it with default values */ @@ -227,14 +243,13 @@ class chanrec : public Extensible virtual ~chanrec() { /* stub */ } }; -/* used to hold a channel and a users modes on that channel, e.g. +v, +h, +o +/** used to hold a channel and a users modes on that channel, e.g. +v, +h, +o * needs to come AFTER struct chanrec */ - -#define UCMODE_OP 1 -#define UCMODE_VOICE 2 -#define UCMODE_HOP 4 -#define UCMODE_PROTECT 8 -#define UCMODE_FOUNDER 16 +enum UserChannelModes { + UCMODE_OP = 1, + UCMODE_VOICE = 2, + UCMODE_HOP = 4 +}; /** Holds a user's modes on a channel * This class associates a users privilages with a channel by creating a pointer link between @@ -254,13 +269,14 @@ class ucrec : public classbase */ chanrec *channel; - ucrec() { /* stub */ } + ucrec() : uc_modes(0), channel(NULL) { /* stub */ } virtual ~ucrec() { /* stub */ } }; chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override); chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local); void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason); +void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents); #endif