X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/1815320d3bef1e267742ec27d1b0817fb8c2c4e6..fe749d37099c5e63f763dc07aa7eb43be150a757:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 3f9d167b..42e26705 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -56,17 +56,22 @@ extern char conf_line_in[256];
 
 struct ConfItem
 {
-	struct ConfItem *next;	/* list node pointer */
 	unsigned int status;	/* If CONF_ILLEGAL, delete when no clients */
 	unsigned int flags;
 	int clients;		/* Number of *LOCAL* clients using this */
-	char *name;		/* IRC name, nick, server name, or original u@h */
+	union
+	{
+		char *name;	/* IRC name, nick, server name, or original u@h */
+		const char *oper;
+	} info;
 	char *host;		/* host part of user@host */
 	char *passwd;		/* doubles as kline reason *ugh* */
 	char *spasswd;		/* Password to send. */
 	char *user;		/* user part of user@host */
 	int port;
 	time_t hold;		/* Hold action until this time (calendar time) */
+	time_t created;		/* Creation time (for klines etc) */
+	time_t lifetime;	/* Propagated lines: remember until this time */
 	char *className;	/* Name of class */
 	struct Class *c_class;	/* Class of connection */
 	rb_patricia_node_t *pnode;	/* Our patricia node */
@@ -90,6 +95,7 @@ struct ConfItem
 /* Generic flags... */
 #define CONF_FLAGS_TEMPORARY            0x00800000
 #define CONF_FLAGS_NEED_SSL		0x00000002
+#define CONF_FLAGS_MYOPER		0x00080000 /* need to rewrite info.oper on burst */
 /* auth{} flags... */
 #define CONF_FLAGS_NO_TILDE             0x00000004
 #define CONF_FLAGS_NEED_IDENTD          0x00000008
@@ -109,6 +115,9 @@ struct ConfItem
 
 
 /* Macros for struct ConfItem */
+#define IsConfBan(x)		((x)->status & (CONF_KILL|CONF_XLINE|CONF_DLINE|\
+						CONF_RESV_CHANNEL|CONF_RESV_NICK))
+
 #define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
 #define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
 #define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
@@ -132,8 +141,6 @@ struct config_file_entry
 	const char *dpath;	/* DPATH if set from command line */
 	const char *configfile;
 
-	char *egdpool_path;
-
 	char *default_operstring;
 	char *default_adminstring;
 	char *servicestring;
@@ -141,7 +148,9 @@ struct config_file_entry
 
 	char *identifyservice;
 	char *identifycommand;
-	
+
+	char *sasl_service;
+
 	char *fname_userlog;
 	char *fname_fuserlog;
 	char *fname_operlog;
@@ -196,8 +205,7 @@ struct config_file_entry
 	int min_nonwildcard;
 	int min_nonwildcard_simple;
 	int default_floodcount;
-	int client_flood;
-	int use_egd;
+	int default_ident_timeout;
 	int ping_cookie;
 	int tkline_expire_notices;
 	int use_whois_actually;
@@ -211,17 +219,30 @@ struct config_file_entry
 	int throttle_duration;
 	int target_change;
 	int collision_fnc;
+	int resv_fnc;
 	int default_umodes;
 	int global_snotices;
 	int operspy_dont_care_user_info;
+	int use_propagated_bans;
+	int max_ratelimit_tokens;
+	int away_interval;
+
+	int client_flood_max_lines;
+	int client_flood_burst_rate;
+	int client_flood_burst_max;
+	int client_flood_message_time;
+	int client_flood_message_num;
+
+	unsigned int nicklen;
+	int certfp_method;
 };
 
 struct config_channel_entry
 {
 	int use_except;
 	int use_invex;
-	int use_knock;
 	int use_forward;
+	int use_knock;
 	int knock_delay;
 	int knock_delay_channel;
 	int max_bans;
@@ -235,6 +256,10 @@ struct config_channel_entry
 	int kick_on_split_riding;
 	int only_ascii_channels;
 	int resv_forcepart;
+	int channel_target_change;
+	int disable_local_channels;
+	unsigned int autochanmodes;
+	int displayed_usercount;
 };
 
 struct config_server_hide
@@ -251,7 +276,6 @@ struct server_info
 	char sid[4];
 	char *description;
 	char *network_name;
-	char *network_desc;
 	int hub;
 	struct sockaddr_in ip;
 	int default_max_clients;
@@ -266,6 +290,7 @@ struct server_info
 	char *ssl_ca_cert;
 	char *ssl_cert;
 	char *ssl_dh_params;
+	char *ssl_cipher_list;
 	int ssld_count;
 };
 
@@ -296,6 +321,8 @@ extern struct admin_info AdminInfo;	/* defined in ircd.c */
 
 extern rb_dlink_list service_list;
 
+extern rb_dlink_list prop_bans;
+
 typedef enum temp_list
 {
 	TEMP_MIN,
@@ -313,6 +340,10 @@ extern void init_s_conf(void);
 extern struct ConfItem *make_conf(void);
 extern void free_conf(struct ConfItem *);
 
+extern rb_dlink_node *find_prop_ban(unsigned int status, const char *user, const char *host);
+extern void deactivate_conf(struct ConfItem *, rb_dlink_node *, time_t);
+extern void replace_old_ban(struct ConfItem *);
+
 extern void read_conf_files(int cold);
 
 extern int attach_conf(struct Client *, struct ConfItem *);
@@ -323,7 +354,8 @@ extern int detach_conf(struct Client *);
 extern struct ConfItem *find_tkline(const char *, const char *, struct sockaddr *);
 extern char *show_iline_prefix(struct Client *, struct ConfItem *, char *);
 extern void get_printable_conf(struct ConfItem *,
-			       char **, char **, char **, char **, int *, char **);
+			       char **, char **, const char **, char **, int *, char **);
+extern char *get_user_ban_reason(struct ConfItem *aconf);
 extern void get_printable_kline(struct Client *, struct ConfItem *,
 				char **, char **, char **, char **);
 
@@ -331,6 +363,7 @@ extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);
 extern int conf_fgets(char *, int, FILE *);
 
+extern int valid_wild_card(const char *, const char *);
 extern void add_temp_kline(struct ConfItem *);
 extern void add_temp_dline(struct ConfItem *);
 extern void report_temp_klines(struct Client *);