X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=102e7783f0099645c0f972bba5a2ae22f640b5d0;hb=886f1ba488a5ab9d7fe4d7b4ac6b9c9dc2841738;hp=1328bf0cb89d2b4a2662842f7c188bf6e9ddb104;hpb=74b05d550081fb7a7b41a145cfbc333f8774d438;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 1328bf0cb..102e7783f 100644
--- a/include/users.h
+++ b/include/users.h
@@ -267,10 +267,6 @@ class CoreExport User : public Extensible
 	 */
 	time_t signon;
 
-	/** Time that the connection last sent a message, used to calculate idle time
-	 */
-	time_t idle_lastmsg;
-
 	/** Client address that the user is connected from.
 	 * Do not modify this value directly, use SetClientIP() to change it.
 	 * Port is not valid for remote users.
@@ -347,12 +343,6 @@ class CoreExport User : public Extensible
 	 */
 	unsigned int registered:3;
 
-	/** True when DNS lookups are completed.
-	 * The UserResolver classes res_forward and res_reverse will
-	 * set this value once they complete.
-	 */
-	unsigned int dns_done:1;
-
 	/** Whether or not to send an snotice about this user's quitting
 	 */
 	unsigned int quietquit:1;
@@ -364,27 +354,13 @@ class CoreExport User : public Extensible
 	 */
 	unsigned int quitting:1;
 
-	/** Recursion fix: user is out of SendQ and will be quit as soon as possible.
-	 * This can't be handled normally because QuitUser itself calls Write on other
-	 * users, which could trigger their SendQ to overrun.
-	 */
-	unsigned int quitting_sendq:1;
-
-	/** This is true if the user matched an exception (E:Line). It is used to save time on ban checks.
-	 */
-	unsigned int exempt:1;
-
-	/** has the user responded to their previous ping?
-	 */
-	unsigned int lastping:1;
-
 	/** What type of user is this? */
 	const unsigned int usertype:2;
 
 	/** Get client IP string from sockaddr, using static internal buffer
 	 * @return The IP string
 	 */
-	const char* GetIPString();
+	const std::string& GetIPString();
 
 	/** Get CIDR mask, using default range, for this user
 	 */
@@ -393,21 +369,15 @@ class CoreExport User : public Extensible
 	/** Sets the client IP for this user
 	 * @return true if the conversion was successful
 	 */
-	virtual bool SetClientIP(const char* sip);
+	virtual bool SetClientIP(const char* sip, bool recheck_eline = true);
 
-	virtual void SetClientIP(const irc::sockets::sockaddrs& sa);
+	virtual void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true);
 
 	/** Constructor
 	 * @throw CoreException if the UID allocated to the user already exists
 	 */
 	User(const std::string &uid, const std::string& srv, int objtype);
 
-	/** Check if the user matches a G or K line, and disconnect them if they do.
-	 * @param doZline True if ZLines should be checked (if IP has changed since initial connect)
-	 * Returns true if the user matched a ban, false else.
-	 */
-	bool CheckLines(bool doZline = false);
-
 	/** 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\@host form.
@@ -753,19 +723,19 @@ class CoreExport LocalUser : public User, public InviteBase
 
 	/** Stats counter for bytes inbound
 	 */
-	int bytes_in;
+	unsigned int bytes_in;
 
 	/** Stats counter for bytes outbound
 	 */
-	int bytes_out;
+	unsigned int bytes_out;
 
 	/** Stats counter for commands inbound
 	 */
-	int cmds_in;
+	unsigned int cmds_in;
 
 	/** Stats counter for commands outbound
 	 */
-	int cmds_out;
+	unsigned int cmds_out;
 
 	/** Password specified by the user when they registered (if any).
 	 * This is stored even if the \<connect> block doesnt need a password, so that
@@ -792,10 +762,34 @@ class CoreExport LocalUser : public User, public InviteBase
 	 */
 	int GetServerPort();
 
+	/** Recursion fix: user is out of SendQ and will be quit as soon as possible.
+	 * This can't be handled normally because QuitUser itself calls Write on other
+	 * users, which could trigger their SendQ to overrun.
+	 */
+	unsigned int quitting_sendq:1;
+
+	/** True when DNS lookups are completed.
+	 * The UserResolver classes res_forward and res_reverse will
+	 * set this value once they complete.
+	 */
+	unsigned int dns_done:1;
+
+	/** has the user responded to their previous ping?
+	 */
+	unsigned int lastping:1;
+
+	/** This is true if the user matched an exception (E:Line). It is used to save time on ban checks.
+	 */
+	unsigned int exempt:1;
+
 	/** Used by PING checking code
 	 */
 	time_t nping;
 
+	/** Time that the connection last sent a message, used to calculate idle time
+	 */
+	time_t idle_lastmsg;
+
 	/** This value contains how far into the penalty threshold the user is.
 	 * This is used either to enable fake lag or for excess flood quits
 	 */
@@ -814,6 +808,12 @@ class CoreExport LocalUser : public User, public InviteBase
 	 */
 	void StartDNSLookup();
 
+	/** Check if the user matches a G or K line, and disconnect them if they do.
+	 * @param doZline True if ZLines should be checked (if IP has changed since initial connect)
+	 * Returns true if the user matched a ban, false else.
+	 */
+	bool CheckLines(bool doZline = false);
+
 	/** Use this method to fully connect a user.
 	 * This will send the message of the day, check G/K/E lines, etc.
 	 */
@@ -825,9 +825,9 @@ class CoreExport LocalUser : public User, public InviteBase
 	 */
 	void SetClass(const std::string &explicit_name = "");
 
-	bool SetClientIP(const char* sip);
+	bool SetClientIP(const char* sip, bool recheck_eline = true);
 
-	void SetClientIP(const irc::sockets::sockaddrs& sa);
+	void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true);
 
 	void SendText(const std::string& line);
 	void Write(const std::string& text);