Fixes for bug #12

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

diff --git a/include/users.h b/include/users.h
index c7ed73264dca449fdfd7c2b753e34e207c278b02..109644c87ad8ee3b5dd7f2f8b4b1790c97d4463b 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __USERS_H__
-#define __USERS_H__
+#ifndef USERS_H
+#define USERS_H
 
 #include "socket.h"
 #include "inspsocket.h"
@@ -92,14 +92,6 @@ struct CoreExport ConnectClass : public refcountbase
         */
        unsigned int pingtime;
 
-       /** (Optional) Password for this line
-        */
-       std::string pass;
-
-       /** (Optional) Hash Method for this line
-        */
-       std::string hash;
-
        /** Maximum size of sendq for users in this class (bytes)
         * Users cannot send commands if they go over this limit
         */
@@ -129,13 +121,13 @@ struct CoreExport ConnectClass : public refcountbase
         */
        unsigned long maxglobal;
 
-       /** Max channels for this class
+       /** True if max connections for this class is hit and a warning is wanted
         */
-       unsigned int maxchans;
+       bool maxconnwarn;
 
-       /** Port number this connect class applies to
+       /** Max channels for this class
         */
-       int port;
+       unsigned int maxchans;
 
        /** How many users may be in this connect class before they are refused?
         * (0 = no limit = default)
@@ -152,11 +144,8 @@ struct CoreExport ConnectClass : public refcountbase
        /** Update the settings in this block to match the given block */
        void Update(const ConnectClass* newSettings);
 
-
        const std::string& GetName() { return name; }
-       const std::string& GetPass() { return pass; }
        const std::string& GetHost() { return host; }
-       const int GetPort() { return port; }
 
        /** Returns the registration timeout
         */
@@ -198,7 +187,7 @@ struct CoreExport ConnectClass : public refcountbase
         */
        unsigned int GetPenaltyThreshold()
        {
-               return (penaltythreshold ? penaltythreshold : 10);
+               return penaltythreshold ? penaltythreshold : (fakelag ? 10 : 20);
        }
 
        unsigned int GetCommandRate()
@@ -206,7 +195,7 @@ struct CoreExport ConnectClass : public refcountbase
                return commandrate ? commandrate : 1000;
        }
 
-       /** Returusn the maximum number of local sessions
+       /** Return the maximum number of local sessions
         */
        unsigned long GetMaxLocal()
        {
@@ -363,6 +352,12 @@ 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;
@@ -727,6 +722,8 @@ class CoreExport UserIOHandler : public StreamSocket
        void AddWriteBuf(const std::string &data);
 };
 
+typedef unsigned int already_sent_t;
+
 class CoreExport LocalUser : public User
 {
        /** A list of channels the user has a pending invite to.
@@ -791,6 +788,9 @@ class CoreExport LocalUser : public User
         */
        unsigned int CommandFloodPenalty;
 
+       static already_sent_t already_sent_id;
+       already_sent_t already_sent;
+
        /** Stored reverse lookup from res_forward. Should not be used after resolution.
         */
        std::string stored_host;
@@ -866,8 +866,6 @@ class CoreExport LocalUser : public User
         * @return True if the user can set or unset this mode.
         */
        bool HasModePermission(unsigned char mode, ModeType type);
-
-       inline int GetFd() { return eh.GetFd(); }
 };
 
 class CoreExport RemoteUser : public User
@@ -919,12 +917,8 @@ inline FakeUser* IS_SERVER(User* u)
 class CoreExport UserResolver : public Resolver
 {
  private:
-       /** User this class is 'attached' to.
-        */
-       LocalUser* bound_user;
-       /** File descriptor teh lookup is bound to
-        */
-       int bound_fd;
+       /** UUID we are looking up */
+       std::string uuid;
        /** True if the lookup is forward, false if is a reverse lookup
         */
        bool fwd;