Merge pull request #16 from Adam-/insp20

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

diff --git a/include/users.h b/include/users.h
index da68bfd785ff6ef9c97b3e35510075110f9e44f1..3536fc35040b9b991e3032ead6fcd46b6dc602ae 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -25,7 +25,9 @@ enum ClassTypes {
        /** connect:allow */
        CC_ALLOW = 0,
        /** connect:deny */
-       CC_DENY  = 1
+       CC_DENY  = 1,
+       /** named connect block (for opers, etc) */
+       CC_NAMED = 2
 };
 
 /** RFC1459 channel modes
@@ -90,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
         */
@@ -131,10 +125,6 @@ struct CoreExport ConnectClass : public refcountbase
         */
        unsigned int maxchans;
 
-       /** Port number this connect class applies to
-        */
-       int port;
-
        /** How many users may be in this connect class before they are refused?
         * (0 = no limit = default)
         */
@@ -150,11 +140,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
         */
@@ -196,7 +183,7 @@ struct CoreExport ConnectClass : public refcountbase
         */
        unsigned int GetPenaltyThreshold()
        {
-               return (penaltythreshold ? penaltythreshold : 10);
+               return penaltythreshold ? penaltythreshold : (fakelag ? 10 : 20);
        }
 
        unsigned int GetCommandRate()
@@ -204,7 +191,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()
        {
@@ -361,6 +348,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;
@@ -725,6 +718,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.
@@ -789,6 +784,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;
@@ -864,8 +862,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
@@ -917,12 +913,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;