Port ircd-seven banfowards to charybdis.

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 81942898f8d7798817cc298ee35d3628c4a9fd57..7c732e073795faa796b3ce06ec6e1dcd9904266e 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -71,6 +71,7 @@ struct ConfItem
        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 */
@@ -94,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
@@ -203,7 +205,7 @@ struct config_file_entry
        int min_nonwildcard;
        int min_nonwildcard_simple;
        int default_floodcount;
-       int client_flood;
+       int default_ident_timeout;
        int use_egd;
        int ping_cookie;
        int tkline_expire_notices;
@@ -221,6 +223,14 @@ struct config_file_entry
        int default_umodes;
        int global_snotices;
        int operspy_dont_care_user_info;
+       int use_propagated_bans;
+
+       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;
+
 };
 
 struct config_channel_entry
@@ -228,7 +238,6 @@ struct config_channel_entry
        int use_except;
        int use_invex;
        int use_knock;
-       int use_forward;
        int knock_delay;
        int knock_delay_channel;
        int max_bans;
@@ -242,6 +251,8 @@ struct config_channel_entry
        int kick_on_split_riding;
        int only_ascii_channels;
        int resv_forcepart;
+       int channel_target_change;
+       int disable_local_channels;
 };
 
 struct config_server_hide
@@ -303,6 +314,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,
@@ -320,6 +333,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 *);
+extern void replace_old_ban(struct ConfItem *);
+
 extern void read_conf_files(int cold);
 
 extern int attach_conf(struct Client *, struct ConfItem *);
@@ -339,6 +356,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 *);