Pretty symlink logic for help files

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

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 3a2a5064c271bcd794b5d30d675d5d120c71db11..402887e80c80739c3123207f5a316c2603c5a2ce 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -36,7 +36,6 @@
 #define INCLUDED_s_newconf_h
 
 #include "setup.h"
-#include "tools.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/rsa.h>
@@ -44,17 +43,17 @@
 
 struct ConfItem;
 
-extern dlink_list cluster_conf_list;
-extern dlink_list shared_conf_list;
-extern dlink_list oper_conf_list;
-extern dlink_list hubleaf_conf_list;
-extern dlink_list server_conf_list;
-extern dlink_list xline_conf_list;
-extern dlink_list resv_conf_list;
-extern dlink_list nd_list;
-extern dlink_list tgchange_list;
+extern rb_dlink_list cluster_conf_list;
+extern rb_dlink_list shared_conf_list;
+extern rb_dlink_list oper_conf_list;
+extern rb_dlink_list hubleaf_conf_list;
+extern rb_dlink_list server_conf_list;
+extern rb_dlink_list xline_conf_list;
+extern rb_dlink_list resv_conf_list;
+extern rb_dlink_list nd_list;
+extern rb_dlink_list tgchange_list;
 
-struct _patricia_tree_t *tgchange_tree;
+extern struct _rb_patricia_tree_t *tgchange_tree;
 
 extern void init_s_newconf(void);
 extern void clear_s_newconf(void);
@@ -67,8 +66,8 @@ typedef struct
 {
        char *ip;
        time_t expiry;
-       patricia_node_t *pnode;
-       dlink_node node;
+       rb_patricia_node_t *pnode;
+       rb_dlink_node node;
 } tgchange;
 
 void add_tgchange(const char *host);
@@ -81,7 +80,7 @@ struct remote_conf
        char *host;
        char *server;
        int flags;
-       dlink_node node;
+       rb_dlink_node node;
 };
 
 /* flags used in shared/cluster */
@@ -96,6 +95,9 @@ struct remote_conf
 #define SHARED_PRESV   0x0100
 #define SHARED_UNRESV  0x0200
 #define SHARED_REHASH  0x0400
+#define SHARED_TDLINE  0x0800
+#define SHARED_PDLINE  0x1000
+#define SHARED_UNDLINE 0x2000
 
 #define SHARED_ALL     (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
                        SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
@@ -140,7 +142,6 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define OPER_LOCKILL   0x00008
 #define OPER_GLOBKILL  0x00010
 #define OPER_REMOTE    0x00020
-#define OPER_GLINE     0x00040
 #define OPER_XLINE     0x00080
 #define OPER_RESV      0x00100
 #define OPER_NICKS     0x00200
@@ -156,7 +157,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 /* 0x400000 and above are in client.h */
 
 #define OPER_FLAGS     (OPER_KLINE|OPER_UNKLINE|OPER_LOCKILL|OPER_GLOBKILL|\
-                        OPER_REMOTE|OPER_GLINE|OPER_XLINE|OPER_RESV|\
+                        OPER_REMOTE|OPER_XLINE|OPER_RESV|\
                         OPER_NICKS|OPER_REHASH|OPER_DIE|OPER_ADMIN|\
                         OPER_HADMIN|OPER_OPERWALL|OPER_INVIS|OPER_SPY|\
                         OPER_REMOTEBAN|OPER_MASSNOTICE)
@@ -167,7 +168,6 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperLocalKill(x)      ((x)->flags2 & OPER_LOCKILL)
 #define IsOperRemote(x)         ((x)->flags2 & OPER_REMOTE)
 #define IsOperUnkline(x)        ((x)->flags2 & OPER_UNKLINE)
-#define IsOperGline(x)          ((x)->flags2 & OPER_GLINE)
 #define IsOperN(x)              ((x)->flags2 & OPER_NICKS)
 #define IsOperK(x)              ((x)->flags2 & OPER_KLINE)
 #define IsOperXline(x)          ((x)->flags2 & OPER_XLINE)
@@ -204,11 +204,11 @@ struct server_conf
        time_t hold;
 
        int aftype;
-       struct irc_sockaddr_storage my_ipnum;
+       struct rb_sockaddr_storage my_ipnum;
 
        char *class_name;
        struct Class *class;
-       dlink_node node;
+       rb_dlink_node node;
 };
 
 #define SERVER_ILLEGAL         0x0001
@@ -217,6 +217,7 @@ struct server_conf
 #define SERVER_COMPRESSED      0x0008
 #define SERVER_TB              0x0010
 #define SERVER_AUTOCONN                0x0020
+#define SERVER_SSL             0x0040
 
 #define ServerConfIllegal(x)   ((x)->flags & SERVER_ILLEGAL)
 #define ServerConfVhosted(x)   ((x)->flags & SERVER_VHOSTED)
@@ -224,6 +225,7 @@ struct server_conf
 #define ServerConfCompressed(x)        ((x)->flags & SERVER_COMPRESSED)
 #define ServerConfTb(x)                ((x)->flags & SERVER_TB)
 #define ServerConfAutoconn(x)  ((x)->flags & SERVER_AUTOCONN)
+#define ServerConfSSL(x)       ((x)->flags & SERVER_SSL)
 
 extern struct server_conf *make_server_conf(void);
 extern void free_server_conf(struct server_conf *);
@@ -234,7 +236,7 @@ extern struct server_conf *find_server_conf(const char *name);
 
 extern void attach_server_conf(struct Client *, struct server_conf *);
 extern void detach_server_conf(struct Client *);
-extern void set_server_conf_autoconn(struct Client *source_p, char *name, 
+extern void set_server_conf_autoconn(struct Client *source_p, const char *name, 
                                        int newval);
 
 
@@ -251,7 +253,7 @@ struct nd_entry
 {
        char name[NICKLEN+1];
        time_t expire;
-       dlink_node lnode;       /* node in ll */
+       rb_dlink_node lnode;    /* node in ll */
 };
 
 extern void add_nd_entry(const char *name);