X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/bc475bf02014dd7d97b5b9d20be2a191f6edd269..5da17c500b44990ff7731058f4ebdf923db5ba29:/include/client.h

diff --git a/include/client.h b/include/client.h
index 42ffcf4..d5d15f5 100644
--- a/include/client.h
+++ b/include/client.h
@@ -254,16 +254,7 @@ struct LocalUser
 	/* time challenge response is valid for */
 	time_t chal_time;
 
-	int ctrlfd;		/* For servers:
-				   control fd used for sending commands
-				   to servlink */
-
-	struct SlinkRpl slinkrpl;	/* slink reply being parsed */
-	unsigned char *slinkq;	/* sendq for control data */
-	int slinkq_ofs;		/* ofset into slinkq */
-	int slinkq_len;		/* length remaining after slinkq_ofs */
-
-	struct ZipStats zipstats;
+	struct DNSQuery *dnsquery; /* for outgoing server's name lookup */
 
 	time_t last_away;	/* Away since... */
 	time_t last;
@@ -297,8 +288,11 @@ 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 */
 	struct _ssl_ctl *ssl_ctl;		/* which ssl daemon we're associate with */
+	rb_uint32_t localflags;
+	struct ZipStats *zipstats;		/* zipstats */
+	rb_uint16_t cork_count;			/* used for corking/uncorking connections */
+	struct ev_entry *event;			/* used for associated events */
 };
 
 struct PreClient
@@ -434,6 +428,11 @@ struct exit_client_hook
 #define FLAGS_DYNSPOOF     0x1000000	/* dynamic spoof, only opers see ip */
 #define FLAGS_EXUNKNOWN	   0x2000000	/* too many unknowns exit.. */
 
+/* flags for local clients, this needs stuff moved from above to here at some point */
+#define LFLAGS_SSL		0x00000001
+#define LFLAGS_FLUSH		0x00000002
+#define LFLAGS_CORK		0x00000004
+
 /* umodes, settable flags */
 /* lots of this moved to snomask -- jilles */
 #define UMODE_SERVNOTICE   0x0001	/* server notices */
@@ -450,6 +449,7 @@ struct exit_client_hook
 /* user information flags, only settable by remote mode or local oper */
 #define UMODE_OPER         0x100000	/* Operator */
 #define UMODE_ADMIN        0x200000	/* Admin on server */
+#define UMODE_SSLCLIENT    0x1000000	/* using SSL */
 
 #define UMODE_ALL	   UMODE_SERVNOTICE
 
@@ -507,6 +507,16 @@ struct exit_client_hook
 #define IsExUnknown(x)		((x)->flags & FLAGS_EXUNKNOWN)
 #define SetExUnknown(x)		((x)->flags |= FLAGS_EXUNKNOWN)
 
+/* local flags */
+
+#define IsSSL(x)		((x)->localClient->localflags & LFLAGS_SSL)
+#define SetSSL(x)		((x)->localClient->localflags |= LFLAGS_SSL)
+#define ClearSSL(x)		((x)->localClient->localflags &= ~LFLAGS_SSL)
+
+#define IsFlush(x)		((x)->localClient->localflags & LFLAGS_FLUSH)
+#define SetFlush(x)		((x)->localClient->localflags |= LFLAGS_FLUSH)
+#define ClearFlush(x)		((x)->localClient->localflags &= ~LFLAGS_FLUSH)
+
 /* oper flags */
 #define MyOper(x)               (MyConnect(x) && IsOper(x))
 
@@ -521,6 +531,9 @@ struct exit_client_hook
 #define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
 #define SetInvisible(x)         ((x)->umodes |= UMODE_INVISIBLE)
 #define ClearInvisible(x)       ((x)->umodes &= ~UMODE_INVISIBLE)
+#define IsSSLClient(x)		((x)->umodes & UMODE_SSLCLIENT)
+#define SetSSLClient(x)		((x)->umodes |= UMODE_SSLCLIENT)
+#define ClearSSLClient(x)	((x)->umodes &= ~UMODE_SSLCLIENT)
 #define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
 #define SendLocops(x)           ((x)->umodes & UMODE_LOCOPS)
 #define SendServNotice(x)       ((x)->umodes & UMODE_SERVNOTICE)
@@ -560,6 +573,11 @@ struct exit_client_hook
 #define IsFloodDone(x)          ((x)->flags & FLAGS_FLOODDONE)
 #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
 
+/* These also operate on the uplink from which it came */
+#define IsCork(x)		(MyConnect(x) ? (x)->localClient->cork_count : (x)->from->localClient->cork_count)
+#define SetCork(x)		(MyConnect(x) ? (x)->localClient->cork_count++ : (x)->from->localClient->cork_count++ )
+#define ClearCork(x)		(MyConnect(x) ? (x)->localClient->cork_count-- : (x)->from->localClient->cork_count--)
+
 /*
  * definitions for get_client_name
  */
@@ -612,7 +630,7 @@ extern void close_connection(struct Client *);
 extern void init_uid(void);
 extern char *generate_uid(void);
 
-void allocate_away(struct Client *);
+void allocate_away(struct Client *);
 void free_away(struct Client *);
 
 #endif /* INCLUDED_client_h */