Add ParamChannelModeHandler

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

diff --git a/include/users.h b/include/users.h
index 48f2b470c9bc1742484cfbd34cc32baa94410c7e..e1171e2c33785c8da36a58b64f171000d46bb509 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -71,6 +71,9 @@ struct CoreExport ConnectClass : public refcountbase
         */
        char type;
 
+       /** True if this class uses fake lag to manage flood, false if it kills */
+       bool fakelag;
+
        /** Connect class name
         */
        std::string name;
@@ -111,7 +114,10 @@ struct CoreExport ConnectClass : public refcountbase
 
        /** Seconds worth of penalty before penalty system activates
         */
-       unsigned long penaltythreshold;
+       unsigned int penaltythreshold;
+
+       /** Maximum rate of commands (units: millicommands per second) */
+       unsigned int commandrate;
 
        /** Local max when connecting by this connection class
         */
@@ -140,7 +146,7 @@ struct CoreExport ConnectClass : public refcountbase
        /** Create a new connect class with inherited settings.
         */
        ConnectClass(ConfigTag* tag, char type, const std::string& mask, const ConnectClass& parent);
-       
+
        /** Update the settings in this block to match the given block */
        void Update(const ConnectClass* newSettings);
 
@@ -149,7 +155,7 @@ struct CoreExport ConnectClass : public refcountbase
        const std::string& GetPass() { return pass; }
        const std::string& GetHost() { return host; }
        const int GetPort() { return port; }
-       
+
        /** Returns the registration timeout
         */
        time_t GetRegTimeout()
@@ -188,9 +194,14 @@ struct CoreExport ConnectClass : public refcountbase
 
        /** Returns the penalty threshold value
         */
-       unsigned long GetPenaltyThreshold()
+       unsigned int GetPenaltyThreshold()
        {
-               return penaltythreshold;
+               return (penaltythreshold ? penaltythreshold : 10);
+       }
+
+       unsigned int GetCommandRate()
+       {
+               return commandrate ? commandrate : 1000;
        }
 
        /** Returusn the maximum number of local sessions
@@ -213,7 +224,7 @@ struct CoreExport ConnectClass : public refcountbase
  * connection is stored here primarily, from the user's socket ID (file descriptor) through to the
  * user's nickname and hostname.
  */
-class CoreExport User : public StreamSocket
+class CoreExport User : public Extensible
 {
  private:
        /** Cached nick!ident@dhost value using the displayed hostname
@@ -706,14 +717,28 @@ class CoreExport User : public StreamSocket
         */
        void ShowRULES();
 
-       virtual void OnDataReady();
-       virtual void OnError(BufferedSocketError error);
        /** Default destructor
         */
        virtual ~User();
        virtual CullResult cull();
 };
 
+class CoreExport UserIOHandler : public StreamSocket
+{
+ public:
+       LocalUser* const user;
+       UserIOHandler(LocalUser* me) : user(me) {}
+       void OnDataReady();
+       void OnError(BufferedSocketError error);
+
+       /** 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, 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);
+};
+
 class CoreExport LocalUser : public User
 {
        /** A list of channels the user has a pending invite to.
@@ -723,9 +748,11 @@ class CoreExport LocalUser : public User
        InvitedList invites;
 
  public:
-       LocalUser();
+       LocalUser(int fd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
        CullResult cull();
 
+       UserIOHandler eh;
+
        /** Stats counter for bytes inbound
         */
        int bytes_in;
@@ -771,10 +798,10 @@ class CoreExport LocalUser : public User
         */
        time_t nping;
 
-       /** This value contains how far into the penalty threshold the user is. Once its over
-        * the penalty threshold then commands are held and processed on-timer.
+       /** 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
         */
-       int Penalty;
+       unsigned int CommandFloodPenalty;
 
        /** Stored reverse lookup from res_forward. Should not be used after resolution.
         */
@@ -797,18 +824,10 @@ class CoreExport LocalUser : public User
         */
        void SetClass(const std::string &explicit_name = "");
 
-       void OnDataReady();
        void SendText(const std::string& line);
        void Write(const std::string& text);
        void Write(const char*, ...) CUSTOM_PRINTF(2, 3);
 
-       /** 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, 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);
-
        /** Returns the list of channels this user has been invited to but has not yet joined.
         * @return A list of channels the user is invited to
         */
@@ -859,6 +878,8 @@ 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