Some global structs cleaned up a bit in their initalization and declarations.

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

diff --git a/include/client.h b/include/client.h
index 08a6cc345d6870e4372ee3666a258f2ab329ab5f..6f3d62a095f1c44a6244b284aa93068d77d5f0e8 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -254,7 +254,7 @@ struct LocalUser
        /* time challenge response is valid for */
        time_t chal_time;
 
-       int ctrlfd;             /* For servers:
+       rb_fde_t *ctrlF;        /* For servers:
                                   control fd used for sending commands
                                   to servlink */
 
@@ -296,10 +296,6 @@ struct LocalUser
 
        char *mangledhost; /* non-NULL if host mangling module loaded and
                              applicable to this client */
-
-       struct rb_sockaddr_storage *lip;        /* alloc before auth/freed after auth */\r
-       struct _ssl_ctl *ssl_ctl;               /* which ssl daemon we're associate with */
-       rb_uint32_t localflags;
 };
 
 struct PreClient
@@ -465,10 +461,6 @@ struct exit_client_hook
 #define FLAGS2_EXEMPTSHIDE     0x40000000
 #define FLAGS2_EXEMPTJUPE      0x80000000
 
-/* flags for local clients, this needs stuff moved from above to here at some point */\r
-#define LFLAGS_SSL             0x00000001\r
-#define LFLAGS_FLUSH           0x00000002
-
 #define DEFAULT_OPER_UMODES (UMODE_SERVNOTICE | UMODE_OPERWALL | \
                              UMODE_WALLOP | UMODE_LOCOPS)
 #define DEFAULT_OPER_SNOMASK SNO_GENERAL
@@ -511,16 +503,6 @@ struct exit_client_hook
 #define ClearDynSpoof(x)       ((x)->flags &= ~FLAGS_DYNSPOOF)
 #define IsExUnknown(x)         ((x)->flags & FLAGS_EXUNKNOWN)
 #define SetExUnknown(x)                ((x)->flags |= FLAGS_EXUNKNOWN)
-\r
-/* local flags */\r
-\r
-#define IsSSL(x)               ((x)->localClient->localflags & LFLAGS_SSL)\r
-#define SetSSL(x)              ((x)->localClient->localflags |= LFLAGS_SSL)\r
-#define ClearSSL(x)            ((x)->localClient->localflags &= ~LFLAGS_SSL)\r
-\r
-#define IsFlush(x)             ((x)->localClient->localflags & LFLAGS_FLUSH)\r
-#define SetFlush(x)            ((x)->localClient->localflags |= LFLAGS_FLUSH)\r
-#define ClearFlush(x)          ((x)->localClient->localflags &= ~LFLAGS_FLUSH)
 
 /* oper flags */
 #define MyOper(x)               (MyConnect(x) && IsOper(x))