X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f726dd0928006951a9a03f101fdb0c4d29db86b2..99a80a91512121da8f41c6ced95f6043e558c424:/include/s_newconf.h?ds=sidebyside

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 3a2a506..3567098 100644
--- 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;
+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 */
@@ -204,11 +203,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
@@ -251,7 +250,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);