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

diff --git a/include/client.h b/include/client.h
index 42ffcf4..178a9a3 100644
--- a/include/client.h
+++ b/include/client.h
@@ -38,9 +38,9 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
+#include "privilege.h"
 
 /* other structs */
 struct Blacklist;
@@ -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;
 };
@@ -182,8 +169,14 @@ struct Client
 	 */
 	rb_dlink_list on_allow_list;
 
+	time_t first_received_message_time;
+	int received_number_of_privmsgs;
+	int flood_noticed;
+
 	local_user_t *localClient;
 	pre_client_t *preClient;
+
+	time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
 };
 
 struct LocalUser
@@ -203,9 +196,6 @@ struct LocalUser
 	int oper_warn_count_down;	/* warn opers of this possible 
 					   spambot every time this gets to 0 */
 	time_t last_caller_id_time;
-	time_t first_received_message_time;
-	int received_number_of_privmsgs;
-	int flood_noticed;
 
 	time_t lasttime;	/* last time we parsed something */
 	time_t firsttime;	/* time client was created */
@@ -244,6 +234,7 @@ struct LocalUser
 	 * agreed. lets get rid of it someday! --nenolod
 	 */
 	char *passwd;
+	char *auth_user;
 	char *opername; /* name of operator{} block being used or tried (challenge) */
 	char *challenge;
 	char *fullcaps;
@@ -254,16 +245,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 +279,14 @@ 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 */
+	struct _ssl_ctl *z_ctl;			/* second ctl for ssl+zlib */
+	uint32_t localflags;
+	struct ZipStats *zipstats;		/* zipstats */
+	uint16_t cork_count;			/* used for corking/uncorking connections */
+	struct ev_entry *event;			/* used for associated events */
+
+	struct PrivilegeSet *privset;		/* privset... */
 };
 
 struct PreClient
@@ -313,6 +301,8 @@ struct PreClient
 
 	rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */
 	struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */
+
+	struct rb_sockaddr_storage lip; /* address of our side of the connection */
 };
 
 struct ListClient
@@ -325,12 +315,6 @@ struct ListClient
 	 */
 };
 
-struct exit_client_hook
-{
-	struct Client *client_p;
-	char exit_message[TOPICLEN];
-};
-
 /*
  * status macros.
  */
@@ -393,12 +377,7 @@ struct exit_client_hook
  * ts stuff
  */
 #define TS_CURRENT	6
-
-#ifdef TS6_ONLY
 #define TS_MIN          6
-#else
-#define TS_MIN          3
-#endif
 
 #define TS_DOESTS       0x10000000
 #define DoesTS(x)       ((x)->tsinfo & TS_DOESTS)
@@ -423,42 +402,43 @@ struct exit_client_hook
 #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 */
-#define FLAGS_MARK	   0x20000	/* marked client */
-#define FLAGS_HIDDEN       0x40000	/* hidden server */
-#define FLAGS_EOB          0x80000	/* EOB */
-#define FLAGS_MYCONNECT	   0x100000	/* MyConnect */
-#define FLAGS_IOERROR      0x200000	/* IO error */
-#define FLAGS_SERVICE	   0x400000	/* network service */
-#define FLAGS_TGCHANGE     0x800000	/* we're allowed to clear something */
-#define FLAGS_DYNSPOOF     0x1000000	/* dynamic spoof, only opers see ip */
-#define FLAGS_EXUNKNOWN	   0x2000000	/* too many unknowns exit.. */
+#define FLAGS_MARK	   0x10000	/* marked client */
+#define FLAGS_HIDDEN       0x20000	/* hidden server */
+#define FLAGS_EOB          0x40000	/* EOB */
+#define FLAGS_MYCONNECT	   0x80000	/* MyConnect */
+#define FLAGS_IOERROR      0x100000	/* IO error */
+#define FLAGS_SERVICE	   0x200000	/* network service */
+#define FLAGS_TGCHANGE     0x400000	/* we're allowed to clear something */
+#define FLAGS_DYNSPOOF     0x800000	/* dynamic spoof, only opers see ip */
+
+/* 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,8 +484,16 @@ struct exit_client_hook
 #define IsDynSpoof(x)		((x)->flags & FLAGS_DYNSPOOF)
 #define SetDynSpoof(x)		((x)->flags |= FLAGS_DYNSPOOF)
 #define ClearDynSpoof(x)	((x)->flags &= ~FLAGS_DYNSPOOF)
-#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 +509,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)
@@ -539,8 +530,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)
@@ -560,6 +549,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
  */
@@ -570,12 +564,10 @@ 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);
 
 extern const char *get_client_name(struct Client *client, int show_ip);
-extern const char *get_server_name(struct Client *client, int show_ip);
 extern const char *log_client_name(struct Client *, int);
 extern int is_remote_connect(struct Client *);
 extern void init_client(void);
@@ -612,7 +604,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 */