X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/0ffb810660845caa183339cc48ffa304dd50c887..486cd3441553ecf11889b938c58af4566fdd5eaa:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index d1736a47..3d9a65e4 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -110,6 +110,7 @@ struct ConfItem
 #define CONF_FLAGS_EXEMPTSHIDE		0x00010000
 #define CONF_FLAGS_EXEMPTJUPE		0x00020000	/* exempt from resv generating warnings */
 #define CONF_FLAGS_NEED_SASL		0x00040000
+#define CONF_FLAGS_EXTEND_CHANS		0x00080000
 #define CONF_FLAGS_ENCRYPTED            0x00200000
 #define CONF_FLAGS_EXEMPTDNSBL		0x04000000
 
@@ -132,6 +133,7 @@ struct ConfItem
 #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
 #define IsNeedSasl(x)		((x)->flags & CONF_FLAGS_NEED_SASL)
 #define IsConfExemptDNSBL(x)	((x)->flags & CONF_FLAGS_EXEMPTDNSBL)
+#define IsConfExtendChans(x)	((x)->flags & CONF_FLAGS_EXTEND_CHANS)
 #define IsConfSSLNeeded(x)	((x)->flags & CONF_FLAGS_NEED_SSL)
 
 /* flag definitions for opers now in client.h */
@@ -141,8 +143,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;
@@ -150,7 +150,9 @@ struct config_file_entry
 
 	char *identifyservice;
 	char *identifycommand;
-	
+
+	char *sasl_service;
+
 	char *fname_userlog;
 	char *fname_fuserlog;
 	char *fname_operlog;
@@ -205,9 +207,7 @@ struct config_file_entry
 	int min_nonwildcard;
 	int min_nonwildcard_simple;
 	int default_floodcount;
-	int client_flood;
-	int ident_timeout;
-	int use_egd;
+	int default_ident_timeout;
 	int ping_cookie;
 	int tkline_expire_notices;
 	int use_whois_actually;
@@ -221,23 +221,38 @@ 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;
+
+	int hide_opers_in_whois;
 };
 
 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;
 	int max_bans_large;
 	int max_chans_per_user;
+	int max_chans_per_user_large;
 	int no_create_on_split;
 	int no_join_on_split;
 	int default_split_server_count;
@@ -246,6 +261,11 @@ 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;
+	int strip_topic_colors;
 };
 
 struct config_server_hide
@@ -262,7 +282,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;
@@ -277,6 +296,7 @@ struct server_info
 	char *ssl_ca_cert;
 	char *ssl_cert;
 	char *ssl_dh_params;
+	char *ssl_cipher_list;
 	int ssld_count;
 };
 
@@ -327,7 +347,7 @@ 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 *);
+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);
@@ -340,7 +360,7 @@ 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 **);