X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/21c9d815d7293b2fa7e531e8f9f69db2e3399554..b717a466d06010bfd93e5a71c734c6461733cf69:/include/client.h

diff --git a/include/client.h b/include/client.h
index 943098e..9308355 100644
--- a/include/client.h
+++ b/include/client.h
@@ -109,25 +109,12 @@ struct Server
 	struct scache_entry *nameinfo;
 };
 
-struct SlinkRpl
-{
-	int command;
-	int datalen;
-	int gotdatalen;
-	int readdata;
-	unsigned char *data;
-};
-
 struct ZipStats
 {
-	unsigned long in;
-	unsigned long in_wire;
-	unsigned long out;
-	unsigned long out_wire;
-	unsigned long inK;
-	unsigned long inK_wire;
-	unsigned long outK;
-	unsigned long outK_wire;
+	unsigned long long in;
+	unsigned long long in_wire;
+	unsigned long long out;
+	unsigned long long out_wire;
 	double in_ratio;
 	double out_ratio;
 };
@@ -233,7 +220,7 @@ struct LocalUser
 	conf_item_t *att_conf;		/* attached conf */
 	struct server_conf *att_sconf;
 
-	struct irc_sockaddr_storage ip;
+	struct rb_sockaddr_storage ip;
 	time_t last_nick_change;
 	int number_of_nick_changes;
 
@@ -254,16 +241,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;
@@ -296,6 +274,12 @@ struct LocalUser
 
 	char *mangledhost; /* non-NULL if host mangling module loaded and
 			      applicable to this client */
+
+	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
@@ -431,31 +415,34 @@ 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 */
-#define UMODE_WALLOP       0x0100	/* send wallops to them */
-#define UMODE_OPERWALL     0x0200	/* Operwalls */
-#define UMODE_INVISIBLE    0x0400	/* makes user invisible */
-#define UMODE_CALLERID     0x2000	/* block unless caller id's */
-#define UMODE_LOCOPS       0x8000	/* show locops */
-#define UMODE_SERVICE      0x40000
-#define UMODE_DEAF	   0x80000
-#define UMODE_NOFORWARD    0x400000	/* don't forward */
-#define UMODE_REGONLYMSG   0x800000	/* only allow logged in users to msg */
+#define UMODE_WALLOP       0x0002	/* send wallops to them */
+#define UMODE_OPERWALL     0x0004	/* Operwalls */
+#define UMODE_INVISIBLE    0x0008	/* makes user invisible */
+#define UMODE_CALLERID     0x0010	/* block unless caller id's */
+#define UMODE_LOCOPS       0x0020	/* show locops */
+#define UMODE_SERVICE      0x0040
+#define UMODE_DEAF	   0x0080
+#define UMODE_NOFORWARD    0x0100	/* don't forward */
+#define UMODE_REGONLYMSG   0x0200	/* only allow logged in users to msg */
 
 /* 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_ALL	   UMODE_SERVNOTICE
+#define UMODE_OPER         0x1000	/* Operator */
+#define UMODE_ADMIN        0x2000	/* Admin on server */
+#define UMODE_SSLCLIENT    0x4000	/* using SSL */
 
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
 #define FLAGS2_EXEMPTRESV	0x00400000
-#define FLAGS2_EXEMPTGLINE      0x00800000
-#define FLAGS2_EXEMPTKLINE      0x01000000
-#define FLAGS2_EXEMPTFLOOD      0x02000000
+#define FLAGS2_EXEMPTKLINE      0x00800000
+#define FLAGS2_EXEMPTFLOOD      0x01000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT	0x20000000
 #define FLAGS2_EXEMPTSHIDE	0x40000000
@@ -504,6 +491,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))
 
@@ -518,6 +515,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)
@@ -536,8 +536,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
 #define SetExemptFlood(x)       ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
 #define IsExemptSpambot(x)	((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
@@ -557,6 +555,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
  */
@@ -567,7 +570,6 @@ struct exit_client_hook
 extern void check_banned_lines(void);
 extern void check_klines_event(void *unused);
 extern void check_klines(void);
-extern void check_glines(void);
 extern void check_dlines(void);
 extern void check_xlines(void);
 
@@ -609,7 +611,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 */