304 -> RPL_SYNTAX

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index b500235338b32fd88c890d8b53789b5f06735466..503a1e5680d146ad2965c9bf7b1a350711cd16a7 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -17,7 +17,6 @@
 #include "socket.h"
 #include "connection.h"
 #include "dns.h"
-
 #include "mode.h"
 
 /** Channel status for a user
@@ -447,6 +446,10 @@ class CoreExport User : public connection
         */
        std::string cached_fullrealhost;
 
+       /** Set by GetIPString() to avoid constantly re-grabbing IP via sockets voodoo.
+        */
+       std::string cachedip;
+
        /** When we erase the user (in the destructor),
         * we call this method to subtract one from all
         * mode characters this user is making use of.
@@ -530,20 +533,21 @@ class CoreExport User : public connection
        std::string fullname;
        
        /** 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
+        * NOT a null terminated string.
+        * Also NOT an array.
+        * Much love to the STL for giving us an easy to use bitset, saving us RAM.
+        * if (modes[modeletter-65]) is set, then the mode is
         * set, for example, to work out if mode +s is set, we  check the field
         * User::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.
         */
-       unsigned char modes[64];
+       std::bitset<64> modes;
 
        /** What snomasks are set on this user.
         * This functions the same as the above modes.
         */
-       unsigned char snomasks[64];
+       std::bitset<64> snomasks;
 
        /** Channels this user is on, and the permissions they have there
         */
@@ -624,10 +628,6 @@ class CoreExport User : public connection
         * GetIPString/GetPort to obtain its values.
         */
        sockaddr* ip;
-       
-       /** Set by GetIPString() to avoid constantly re-grabbing IP via sockets voodoo.
-        */
-       std::string cachedip;
 
        /** Initialize the clients sockaddr
         * @param protocol_family The protocol family of the IP address, AF_INET or AF_INET6
@@ -660,10 +660,6 @@ class CoreExport User : public connection
         */
        const char *GetCIDRMask(int range);
 
-       /* Write error string
-        */
-       std::string WriteError;
-
        /** This is true if the user matched an exception (E:Line). It is used to save time on ban checks.
         */
        bool exempt;
@@ -829,24 +825,9 @@ class CoreExport User : public connection
         */
        std::string GetBuffer();
 
-       /** Sets the write error for a connection. This is done because the actual disconnect
-        * of a client may occur at an inopportune time such as half way through /LIST output.
-        * The WriteErrors of clients are checked at a more ideal time (in the mainloop) and
-        * errored clients purged.
-        * @param error The error string to set.
-        */
-       void SetWriteError(const std::string &error);
-
-       /** Returns the write error which last occured on this connection or an empty string
-        * if none occured.
-        * @return The error string which has occured for this user
-        */
-       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.
+        * sendq value, the user will be removed, and further buffer adds will be dropped.
         * @param data The data to add to the write buffer
         */
        void AddWriteBuf(const std::string &data);