Merge pull request #284 from edk0/drain

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index dbbdce19486ff0b9bb5b55e1252a5cc424b20152..88a41c3eac0e04c569013ba9e5911b06883d0e01 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -111,6 +111,7 @@ struct ConfItem
 #define CONF_FLAGS_ENCRYPTED           0x00200000
 #define CONF_FLAGS_EXEMPTDNSBL         0x04000000
 #define CONF_FLAGS_EXEMPTPROXY         0x08000000
+#define CONF_FLAGS_ALLOW_SCTP          0x10000000
 
 
 /* Macros for struct ConfItem */
@@ -134,6 +135,7 @@ struct ConfItem
 #define IsConfExemptProxy(x)   ((x)->flags & CONF_FLAGS_EXEMPTPROXY)
 #define IsConfExtendChans(x)   ((x)->flags & CONF_FLAGS_EXTEND_CHANS)
 #define IsConfSSLNeeded(x)     ((x)->flags & CONF_FLAGS_NEED_SSL)
+#define IsConfAllowSCTP(x)     ((x)->flags & CONF_FLAGS_ALLOW_SCTP)
 
 /* flag definitions for opers now in client.h */
 
@@ -176,7 +178,6 @@ struct config_file_entry
        int ts_warn_delta;
        int dline_with_reason;
        int kline_with_reason;
-       int kline_delay;
        int warn_no_nline;
        int nick_delay;
        int non_redundant_klines;
@@ -238,6 +239,9 @@ struct config_file_entry
        int certfp_method;
 
        int hide_opers_in_whois;
+       int hide_opers;
+
+       char *drain_reason;
 };
 
 struct config_channel_entry
@@ -282,15 +286,9 @@ struct server_info
        char *description;
        char *network_name;
        int hub;
-       struct sockaddr_in ip;
+       struct rb_sockaddr_storage bind4;
+       struct rb_sockaddr_storage bind6;
        int default_max_clients;
-#ifdef RB_IPV6
-       struct sockaddr_in6 ip6;
-#endif
-       int specific_ipv4_vhost;
-#ifdef RB_IPV6
-       int specific_ipv6_vhost;
-#endif
        char *ssl_private_key;
        char *ssl_ca_cert;
        char *ssl_cert;