X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=503a1e5680d146ad2965c9bf7b1a350711cd16a7;hb=93d7a1311d3b22fa9446eda9f7f379f6c0f97956;hp=3edb9a99efb5e9c12e74e8eb94a23102688d6d45;hpb=c92f8ebd92337a009410cc263d4a1392136629d2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 3edb9a99e..503a1e568 100644
--- 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
@@ -278,7 +277,7 @@ public:
 
 	/** Returns the registration timeout
 	 */
-	unsigned int GetRegTimeout()
+	time_t GetRegTimeout()
 	{
 		return (registration_timeout ? registration_timeout : 90);
 	}
@@ -431,10 +430,6 @@ class CoreExport User : public connection
 	 */
 	InvitedList invites;
 
-	/** Number of channels this user is currently on
-	 */
-	unsigned int ChannelCount;
-
 	/** Cached nick!ident@host value using the real hostname
 	 */
 	std::string cached_fullhost;
@@ -451,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.
@@ -534,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
 	 */
@@ -567,12 +567,6 @@ class CoreExport User : public connection
 	 */
 	time_t awaytime;
 
-	/** Timestamp of current time + connection class timeout.
-	 * This user must send USER/NICK before this timestamp is
-	 * reached or they will be disconnected.
-	 */
-	time_t timeout;
-
 	/** The oper type they logged in as, if they are an oper.
 	 * This is used to check permissions in operclasses, so that
 	 * we can say 'yay' or 'nay' to any commands they issue.
@@ -634,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
@@ -670,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;
@@ -698,9 +684,10 @@ class CoreExport User : public connection
 	 */
 	User(InspIRCd* Instance, const std::string &uid = "");
 
-	/** Check if the user matches a G or K line, and disconnect them if they do
+	/** Check if the user matches a G or K line, and disconnect them if they do.
+	 * Returns true if the user matched a ban, false else.
 	 */
-	void CheckLines();
+	bool CheckLines();
 
 	/** Returns the full displayed host of the user
 	 * This member function returns the hostname of the user as seen by other users
@@ -838,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);