Track who set a dline/kline/xline/resv as in ratbox3.

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 16c4987b7eac17dd638bb229ad2bf6aedd2ab028..a46e3535dc472e8f7583f9fb99a848d746f99a9f 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -60,13 +60,18 @@ struct ConfItem
        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) */
        char *className;        /* Name of class */
        struct Class *c_class;  /* Class of connection */
        rb_patricia_node_t *pnode;      /* Our patricia node */
@@ -88,7 +93,9 @@ struct ConfItem
 /* aConfItem->flags */
 
 /* Generic flags... */
-/* access 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
 #define CONF_FLAGS_EXEMPTKLINE          0x00000040
@@ -102,18 +109,14 @@ struct ConfItem
 #define CONF_FLAGS_EXEMPTSHIDE         0x00010000
 #define CONF_FLAGS_EXEMPTJUPE          0x00020000      /* exempt from resv generating warnings */
 #define CONF_FLAGS_NEED_SASL           0x00040000
-/* server flags */
-#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00080000
-#define CONF_FLAGS_LAZY_LINK            0x00100000
 #define CONF_FLAGS_ENCRYPTED            0x00200000
-#define CONF_FLAGS_COMPRESSED           0x00400000
-#define CONF_FLAGS_TEMPORARY            0x00800000
-#define CONF_FLAGS_TB                  0x01000000
-#define CONF_FLAGS_VHOSTED             0x02000000
 #define CONF_FLAGS_EXEMPTDNSBL         0x04000000
 
 
 /* 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)
@@ -126,11 +129,9 @@ struct ConfItem
 #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
 #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
 #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
-#define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
-#define IsConfVhosted(x)       ((x)->flags & CONF_FLAGS_VHOSTED)
-#define IsConfTburst(x)                ((x)->flags & CONF_FLAGS_TB)
 #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 */
 
@@ -138,12 +139,7 @@ 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;
@@ -219,12 +215,13 @@ 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;
 };
 
 struct config_channel_entry
@@ -244,6 +241,8 @@ struct config_channel_entry
        int default_split_user_count;
        int burst_topicwho;
        int kick_on_split_riding;
+       int only_ascii_channels;
+       int resv_forcepart;
 };
 
 struct config_server_hide
@@ -257,7 +256,7 @@ struct config_server_hide
 struct server_info
 {
        char *name;
-       char sid[3];
+       char sid[4];
        char *description;
        char *network_name;
        char *network_desc;
@@ -303,7 +302,7 @@ extern struct server_info ServerInfo;       /* defined in ircd.c */
 extern struct admin_info AdminInfo;    /* defined in ircd.c */
 /* End GLOBAL section */
 
-rb_dlink_list service_list;
+extern rb_dlink_list service_list;
 
 typedef enum temp_list
 {
@@ -314,8 +313,8 @@ typedef enum temp_list
        LAST_TEMP_TYPE
 } temp_list;
 
-rb_dlink_list temp_klines[LAST_TEMP_TYPE];
-rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+extern rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+extern rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
 
 extern void init_s_conf(void);
 
@@ -333,6 +332,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 **);
 
@@ -340,23 +340,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);
 
@@ -367,14 +355,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);