Remove ^M on line endings.

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

diff --git a/include/s_conf.h b/include/s_conf.h
index 6881536cc964badec469b6049b6c8c92b7ed06c2..16c4987b7eac17dd638bb229ad2bf6aedd2ab028 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -36,7 +36,6 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "patricia.h"
 
 struct Client;
 struct DNSReply;
@@ -47,7 +46,7 @@ struct hostent;
 
 struct ip_value
 {
-       struct irc_sockaddr_storage ip;
+       struct rb_sockaddr_storage ip;
        int ip_mask;
        int type;
 };
@@ -70,7 +69,7 @@ struct ConfItem
        time_t hold;            /* Hold action until this time (calendar time) */
        char *className;        /* Name of class */
        struct Class *c_class;  /* Class of connection */
-       patricia_node_t *pnode; /* Our patricia node */
+       rb_patricia_node_t *pnode;      /* Our patricia node */
 };
 
 #define CONF_ILLEGAL            0x80000000
@@ -81,7 +80,6 @@ struct ConfItem
 #define CONF_RESV_NICK         0x0200
 #define CONF_RESV              (CONF_RESV_CHANNEL | CONF_RESV_NICK)
 
-#define CONF_GLINE             0x10000
 #define CONF_DLINE             0x20000
 #define CONF_EXEMPTDLINE      0x100000
 
@@ -98,7 +96,6 @@ struct ConfItem
 #define CONF_FLAGS_SPOOF_IP             0x00000200
 #define CONF_FLAGS_SPOOF_NOTICE                0x00000400
 #define CONF_FLAGS_REDIR                0x00000800
-#define CONF_FLAGS_EXEMPTGLINE          0x00001000
 #define CONF_FLAGS_EXEMPTRESV          0x00002000      /* exempt from resvs */
 #define CONF_FLAGS_EXEMPTFLOOD          0x00004000
 #define CONF_FLAGS_EXEMPTSPAMBOT       0x00008000
@@ -121,7 +118,6 @@ struct ConfItem
 #define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
 #define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
 #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
-#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
 #define IsConfExemptFlood(x)    ((x)->flags & CONF_FLAGS_EXEMPTFLOOD)
 #define IsConfExemptSpambot(x) ((x)->flags & CONF_FLAGS_EXEMPTSPAMBOT)
 #define IsConfExemptShide(x)   ((x)->flags & CONF_FLAGS_EXEMPTSHIDE)
@@ -164,7 +160,6 @@ struct config_file_entry
        char *fname_foperlog;
        char *fname_serverlog;
        char *fname_killlog;
-       char *fname_glinelog;
        char *fname_klinelog;
        char *fname_operspylog;
        char *fname_ioerrorlog;
@@ -201,10 +196,6 @@ struct config_file_entry
        int pace_wait_simple;
        int short_motd;
        int no_oper_flood;
-       int glines;
-       int gline_time;
-       int gline_min_cidr;
-       int gline_min_cidr6;
        int hide_server;
        int hide_spoof_ips;
        int hide_error_messages;
@@ -272,15 +263,19 @@ struct server_info
        char *network_desc;
        int hub;
        struct sockaddr_in ip;
-#ifdef IPV6
+       int default_max_clients;
+#ifdef RB_IPV6
        struct sockaddr_in6 ip6;
 #endif
        int specific_ipv4_vhost;
-#ifdef IPV6
+#ifdef RB_IPV6
        int specific_ipv6_vhost;
 #endif
-
-       int max_clients;
+       char *ssl_private_key;
+       char *ssl_ca_cert;
+       char *ssl_cert;
+       char *ssl_dh_params;
+       int ssld_count;
 };
 
 struct admin_info
@@ -308,7 +303,7 @@ extern struct server_info ServerInfo;       /* defined in ircd.c */
 extern struct admin_info AdminInfo;    /* defined in ircd.c */
 /* End GLOBAL section */
 
-dlink_list service_list;
+rb_dlink_list service_list;
 
 typedef enum temp_list
 {
@@ -319,8 +314,8 @@ typedef enum temp_list
        LAST_TEMP_TYPE
 } temp_list;
 
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
 
 extern void init_s_conf(void);
 
@@ -359,7 +354,7 @@ extern void write_confitem(KlineType, struct Client *, char *, char *,
 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 *, dlink_list *);
+extern void show_temp_klines(struct Client *, rb_dlink_list *);
 
 extern const char *get_conf_name(KlineType);
 extern int rehash(int);