Minor cleanup to command throttling code:

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 4a28a3079c959fc21372b623d3f95e3a99daab40..5e2c204acea4b09a1bceae8f039d3e5271b01795 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -252,8 +252,8 @@ struct LocalUser
         * to avoid flooding.
         *   -- adrian
         */
-       int allow_read;         /* how many we're allowed to read in this second */
-       int actually_read;      /* how many we've actually read in this second */
+       int dummy1;
+       int dummy0;
        int sent_parsed;        /* how many messages we've parsed in this second */
        time_t last_knock;      /* time of last knock */
        unsigned long random_ping;
@@ -303,10 +303,8 @@ struct ListClient
 {
        unsigned int hash_indice;
        unsigned int users_min, users_max;
-
-       /* It would be nice to add other modifiers,
-        * but not for 1.1 --nenolod
-        */
+       time_t created_min, created_max, topic_min, topic_max;
+       int operspy;
 };
 
 /*
@@ -403,6 +401,7 @@ struct ListClient
 #define FLAGS_SERVICE     0x200000     /* network service */
 #define FLAGS_TGCHANGE     0x400000    /* we're allowed to clear something */
 #define FLAGS_DYNSPOOF     0x800000    /* dynamic spoof, only opers see ip */
+#define FLAGS_TGEXCESSIVE  0x1000000   /* whether the client has attemped to change targets excessively fast */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL             0x00000001
@@ -443,6 +442,8 @@ struct ListClient
 
 #define CLICAP_MULTI_PREFIX    0x0001
 #define CLICAP_SASL            0x0002
+#define CLICAP_ACCOUNT_NOTIFY  0x0004
+#define CLICAP_EXTENDED_JOIN   0x0008
 
 /*
  * flags macros.
@@ -477,6 +478,9 @@ struct ListClient
 #define IsDynSpoof(x)          ((x)->flags & FLAGS_DYNSPOOF)
 #define SetDynSpoof(x)         ((x)->flags |= FLAGS_DYNSPOOF)
 #define ClearDynSpoof(x)       ((x)->flags &= ~FLAGS_DYNSPOOF)
+#define IsTGExcessive(x)       ((x)->flags & FLAGS_TGEXCESSIVE)
+#define SetTGExcessive(x)      ((x)->flags |= FLAGS_TGEXCESSIVE)
+#define ClearTGExcessive(x)    ((x)->flags &= ~FLAGS_TGEXCESSIVE)
 
 /* local flags */