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 0b6adccb1a242f5852045b5481445bc6da3a475b..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,10 +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_CHKACCESS    0x0040      /* ok to check clients access if set */
+#define FLAGS_PING_COOKIE  0x0040      /* has sent ping cookie */
 #define FLAGS_GOTID        0x0080      /* successful ident lookup achieved */
-#define FLAGS_NEEDID       0x0100      /* I-lines say must use ident return */
+#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 */
@@ -453,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
@@ -471,8 +467,6 @@ struct exit_client_hook
                              UMODE_WALLOP | UMODE_LOCOPS)
 #define DEFAULT_OPER_SNOMASK SNO_GENERAL
 
-#define FLAGS_ID     (FLAGS_NEEDID | FLAGS_GOTID)
-
 #define CLICAP_MULTI_PREFIX    0x0001
 #define CLICAP_SASL            0x0002
 
@@ -480,9 +474,6 @@ struct exit_client_hook
  * flags macros.
  */
 #define IsPerson(x)             (IsClient(x) && (x)->user != NULL)
-#define DoAccess(x)             ((x)->flags & FLAGS_CHKACCESS)
-#define SetAccess(x)            ((x)->flags |= FLAGS_CHKACCESS)
-#define ClearAccess(x)          ((x)->flags &= ~FLAGS_CHKACCESS)
 #define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
 #define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
 #define MyConnect(x)           ((x)->flags & FLAGS_MYCONNECT)
@@ -525,28 +516,20 @@ struct exit_client_hook
                                 if (MyClient((x)) && !IsOper((x)) && !IsServer((x))) \
                                  (x)->handler = CLIENT_HANDLER; }
 
-#define IsPrivileged(x)         (IsOper(x) || IsServer(x))
-
 /* umode flags */
 #define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
 #define SetInvisible(x)         ((x)->umodes |= UMODE_INVISIBLE)
 #define ClearInvisible(x)       ((x)->umodes &= ~UMODE_INVISIBLE)
 #define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
-#define ClearWallops(x)         ((x)->umodes &= ~UMODE_WALLOP)
 #define SendLocops(x)           ((x)->umodes & UMODE_LOCOPS)
 #define SendServNotice(x)       ((x)->umodes & UMODE_SERVNOTICE)
 #define SendOperwall(x)         ((x)->umodes & UMODE_OPERWALL)
-#define SetWallops(x)           ((x)->umodes |= UMODE_WALLOP)
-#define SetCallerId(x)         ((x)->umodes |= UMODE_CALLERID)
 #define IsSetCallerId(x)       ((x)->umodes & UMODE_CALLERID)
 #define IsService(x)           ((x)->umodes & UMODE_SERVICE)
 #define IsDeaf(x)              ((x)->umodes & UMODE_DEAF)
 #define IsNoForward(x)         ((x)->umodes & UMODE_NOFORWARD)
 #define IsSetRegOnlyMsg(x)     ((x)->umodes & UMODE_REGONLYMSG)
 
-#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
-#define IsNeedId(x)             (((x)->flags & FLAGS_NEEDID) != 0)
-
 #define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
 #define IsGotId(x)              (((x)->flags & FLAGS_GOTID) != 0)
 
@@ -555,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)
@@ -572,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