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

diff --git a/include/client.h b/include/client.h
index f15444c..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;
@@ -111,11 +111,11 @@ struct Server
 
 struct ZipStats
 {
-	unsigned long long in;
-	unsigned long long in_wire;
-	unsigned long long out;
-	unsigned long long out_wire;
-	double in_ratio;
+	unsigned long long in;
+	unsigned long long in_wire;
+	unsigned long long out;
+	unsigned long long out_wire;
+	double in_ratio;
 	double out_ratio;
 };
 
@@ -169,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
@@ -190,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 */
@@ -231,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;
@@ -276,10 +280,13 @@ struct LocalUser
 			      applicable to this client */
 
 	struct _ssl_ctl *ssl_ctl;		/* which ssl daemon we're associate with */
-	rb_uint32_t localflags;
+	struct _ssl_ctl *z_ctl;			/* second ctl for ssl+zlib */
+	uint32_t localflags;
 	struct ZipStats *zipstats;		/* zipstats */
-	rb_uint16_t cork_count;			/* used for corking/uncorking connections */
+	uint16_t cork_count;			/* used for corking/uncorking connections */
 	struct ev_entry *event;			/* used for associated events */
+
+	struct PrivilegeSet *privset;		/* privset... */
 };
 
 struct PreClient
@@ -294,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
@@ -306,12 +315,6 @@ struct ListClient
 	 */
 };
 
-struct exit_client_hook
-{
-	struct Client *client_p;
-	char exit_message[TOPICLEN];
-};
-
 /*
  * status macros.
  */
@@ -374,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)
@@ -404,16 +402,14 @@ 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
@@ -488,8 +484,6 @@ 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 */
 
@@ -574,7 +568,6 @@ 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);