X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/60817ff45cd9441ce3f3dde5d1beee487f383599..220c9db54ddedea4f0a4b67bd4cf7f7e4a6a3303:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 8ce8f01..10f6601 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -64,6 +64,8 @@ struct ConfItem
 	char *host;		/* host part of user@host */
 	char *passwd;		/* doubles as kline reason *ugh* */
 	char *spasswd;		/* Password to send. */
+	char *autojoin;		/* channels for users to autojoin to on connect */
+	char *autojoin_opers; /* channels for opers to autojoin on oper-up */
 	char *user;		/* user part of user@host */
 	int port;
 	time_t hold;		/* Hold action until this time (calendar time) */
@@ -89,6 +91,7 @@ struct ConfItem
 
 /* Generic flags... */
 #define CONF_FLAGS_TEMPORARY            0x00800000
+#define CONF_FLAGS_NEED_SSL		0x00000002
 /* auth{} flags... */
 #define CONF_FLAGS_NO_TILDE             0x00000004
 #define CONF_FLAGS_NEED_IDENTD          0x00000008
@@ -122,6 +125,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 IsConfSSLNeeded(x)	((x)->flags & CONF_FLAGS_NEED_SSL)
 
 /* flag definitions for opers now in client.h */
 
@@ -129,16 +133,12 @@ struct config_file_entry
 {
 	const char *dpath;	/* DPATH if set from command line */
 	const char *configfile;
-	const char *klinefile;
-	const char *dlinefile;
-	const char *xlinefile;
-	const char *resvfile;
 
-	char *servlink_path;
 	char *egdpool_path;
 
 	char *default_operstring;
 	char *default_adminstring;
+	char *default_operhost;
 	char *servicestring;
 	char *kline_reason;
 
@@ -210,20 +210,27 @@ struct config_file_entry
 	int reject_ban_time;
 	int reject_after_count;
 	int reject_duration;
+	int throttle_count;
+	int throttle_duration;
 	int target_change;
 	int collision_fnc;
 	int default_umodes;
 	int global_snotices;
 	int operspy_dont_care_user_info;
-	int max_unknown_ip;
+	int secret_channels_in_whois;
 };
 
 struct config_channel_entry
 {
+	char * autochanmodes;
+	char * exemptchanops;
+	int use_halfop;
+	int use_owner;
 	int use_except;
 	int use_invex;
 	int use_knock;
 	int use_forward;
+	int use_local_channels;
 	int knock_delay;
 	int knock_delay_channel;
 	int max_bans;
@@ -235,6 +242,19 @@ struct config_channel_entry
 	int default_split_user_count;
 	int burst_topicwho;
 	int kick_on_split_riding;
+	int only_ascii_channels;
+	int cycle_host_change;
+	int host_in_topic;
+	int resv_forcepart;
+	int kick_no_rejoin_time;
+
+	int exempt_cmode_c;
+	int exempt_cmode_C;
+	int exempt_cmode_D;
+	int exempt_cmode_T;
+	int exempt_cmode_N;
+	int exempt_cmode_G;
+	int exempt_cmode_K;
 };
 
 struct config_server_hide
@@ -248,7 +268,7 @@ struct config_server_hide
 struct server_info
 {
 	char *name;
-	char sid[3];
+	char sid[4];
 	char *description;
 	char *network_name;
 	char *network_desc;
@@ -331,23 +351,11 @@ extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);
 extern int conf_fgets(char *, int, FILE *);
 
-typedef enum
-{
-	CONF_TYPE,
-	KLINE_TYPE,
-	DLINE_TYPE,
-	RESV_TYPE
-}
-KlineType;
-
-extern void write_confitem(KlineType, struct Client *, char *, char *,
-			   const char *, const char *, const char *, int);
 extern void add_temp_kline(struct ConfItem *);
 extern void add_temp_dline(struct ConfItem *);
 extern void report_temp_klines(struct Client *);
 extern void show_temp_klines(struct Client *, rb_dlink_list *);
 
-extern const char *get_conf_name(KlineType);
 extern int rehash(int);
 extern void rehash_bans(int);
 
@@ -358,14 +366,6 @@ extern void conf_add_class(struct ConfItem *, int);
 extern void conf_add_d_conf(struct ConfItem *);
 extern void flush_expired_ips(void *);
 
-
-/* XXX consider moving these into kdparse.h */
-extern void parse_k_file(FILE * fb);
-extern void parse_d_file(FILE * fb);
-extern void parse_x_file(FILE * fb);
-extern void parse_resv_file(FILE *);
-extern char *getfield(char *newline);
-
 extern char *get_oper_name(struct Client *client_p);
 
 extern int yylex(void);