Generate the "Temporary K-line %d min" part from aconf->hold - aconf->created.

[irc/rqf/shadowircd.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 8ce8f01dfe91c5cb8bd511c8c9b1dba8590866b7..4dbdd6030848e6b464b9480882d669db8af0ff72 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -64,9 +64,12 @@ 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) */
+       time_t created;         /* Creation time (for klines etc) */
        char *className;        /* Name of class */
        struct Class *c_class;  /* Class of connection */
        rb_patricia_node_t *pnode;      /* Our patricia node */
@@ -89,6 +92,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 +126,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 +134,13 @@ 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 *static_quit;
        char *servicestring;
        char *kline_reason;
 
@@ -160,6 +162,7 @@ struct config_file_entry
        int dots_in_ident;
        int failed_oper_notice;
        int anti_nick_flood;
+       int use_part_messages;
        int anti_spam_exit_message_time;
        int max_accept;
        int max_monitor;
@@ -187,6 +190,7 @@ struct config_file_entry
        int pace_wait_simple;
        int short_motd;
        int no_oper_flood;
+       int true_no_oper_flood;
        int hide_server;
        int hide_spoof_ips;
        int hide_error_messages;
@@ -210,20 +214,28 @@ 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;
+       int expire_override_time;
 };
 
 struct config_channel_entry
 {
+       char * autochanmodes;
+       char * exemptchanops;
+       int use_halfop;
+       int use_admin;
        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 +247,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 +273,7 @@ struct config_server_hide
 struct server_info
 {
        char *name;
-       char sid[3];
+       char sid[4];
        char *description;
        char *network_name;
        char *network_desc;
@@ -324,6 +349,7 @@ 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 **);
+extern char *get_user_ban_reason(struct ConfItem *aconf);
 extern void get_printable_kline(struct Client *, struct ConfItem *,
                                char **, char **, char **, char **);
 
@@ -331,23 +357,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 +372,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);