Remove silly a2client_p, entirely pointless since User.server removal.

[irc/rqf/shadowircd.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index a7e06360c7b725f96f6045e23643937be876d912..a2d2a14ce0c2fe9bd603f04116e0d1b14e3200ec 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -251,7 +251,7 @@ struct LocalUser
        char *fullcaps;
 
        int caps;               /* capabilities bit-field */
-       int fd;                 /* >= 0, for local clients */
+       fde_t *F;               /* >= 0, for local clients */
 
        /* time challenge response is valid for */
        time_t chal_time;
@@ -415,8 +415,11 @@ struct exit_client_hook
 #define FLAGS_DEAD        0x0002       /* Local socket is dead--Exiting soon */
 #define FLAGS_KILLED       0x0004      /* Prevents "QUIT" from being sent for this */
 #define FLAGS_SENTUSER     0x0008      /* Client sent a USER command. */
+#define FLAGS_CLICAP       0x0010      /* In CAP negotiation, wait for CAP END */
 #define FLAGS_CLOSING      0x0020      /* set when closing to suppress errors */
+#define FLAGS_PING_COOKIE  0x0040      /* has sent ping cookie */
 #define FLAGS_GOTID        0x0080      /* successful ident lookup achieved */
+#define FLAGS_FLOODDONE    0x0100      /* flood grace period over / reported */
 #define FLAGS_NORMALEX     0x0400      /* Client exited normally */
 #define FLAGS_SENDQEX      0x0800      /* Sendq exceeded */
 #define FLAGS_SERVLINK     0x10000     /* servlink has servlink process */
@@ -451,16 +454,11 @@ struct exit_client_hook
 
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
-#define FLAGS2_EXEMPTRESV      0x0080000
-#define FLAGS2_EXEMPTGLINE      0x0100000
-#define FLAGS2_EXEMPTKLINE      0x0200000
-#define FLAGS2_EXEMPTFLOOD      0x0400000
-#define FLAGS2_NOLIMIT          0x0800000
-#define FLAGS2_IDLE_LINED       0x1000000
-#define FLAGS2_CLICAP          0x2000000
-#define FLAGS2_PING_COOKIE      0x4000000
-#define FLAGS2_IP_SPOOFING      0x8000000
-#define FLAGS2_FLOODDONE        0x10000000
+#define FLAGS2_EXEMPTRESV      0x00400000
+#define FLAGS2_EXEMPTGLINE      0x00800000
+#define FLAGS2_EXEMPTKLINE      0x01000000
+#define FLAGS2_EXEMPTFLOOD      0x02000000
+#define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT   0x20000000
 #define FLAGS2_EXEMPTSHIDE     0x40000000
 #define FLAGS2_EXEMPTJUPE      0x80000000
@@ -540,8 +538,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptLimits(x)       ((x)->flags2 & FLAGS2_NOLIMIT)
-#define SetExemptLimits(x)      ((x)->flags2 |= FLAGS2_NOLIMIT)
 #define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
 #define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
@@ -557,14 +553,11 @@ struct exit_client_hook
 #define IsIPSpoof(x)            ((x)->flags2 & FLAGS2_IP_SPOOFING)
 #define SetIPSpoof(x)           ((x)->flags2 |= FLAGS2_IP_SPOOFING)
 
-#define SetIdlelined(x)         ((x)->flags2 |= FLAGS2_IDLE_LINED)
-#define IsIdlelined(x)          ((x)->flags2 & FLAGS2_IDLE_LINED)
-
 /* for local users: flood grace period is over
  * for servers: mentioned in networknotice.c notice
  */
-#define IsFloodDone(x)          ((x)->flags2 & FLAGS2_FLOODDONE)
-#define SetFloodDone(x)         ((x)->flags2 |= FLAGS2_FLOODDONE)
+#define IsFloodDone(x)          ((x)->flags & FLAGS_FLOODDONE)
+#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
 
 /*
  * definitions for get_client_name