Update TODO.

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

diff --git a/include/class.h b/include/class.h
index 93adb9cad6662946414199a072b64f152531153f..c076c185aa2f02f72f6e5aefda8b93ec3b505a7e 100644 (file)
--- a/include/class.h
+++ b/include/class.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_class_h
 #define INCLUDED_class_h
 
-#include "tools.h"
-
 struct ConfItem;
 struct Client;
 struct _patricia_tree_t;
@@ -45,13 +43,14 @@ struct Class
        int con_freq;
        int ping_freq;
        int total;
-       struct _patricia_tree_t *ip_limits;
-       int cidr_bitlen;
+       rb_patricia_tree_t *ip_limits;
+       int cidr_ipv4_bitlen;
+       int cidr_ipv6_bitlen;
        int cidr_amount;
 
 };
 
-extern dlink_list class_list;
+extern rb_dlink_list class_list;
 extern struct Class *default_class;
 
 #define ClassName(x)   ((x)->class_name)
@@ -64,7 +63,8 @@ extern struct Class *default_class;
 #define MaxSendq(x)     ((x)->max_sendq)
 #define CurrUsers(x)    ((x)->total)
 #define IpLimits(x)     ((x)->ip_limits)
-#define CidrBitlen(x)   ((x)->cidr_bitlen)
+#define CidrIpv4Bitlen(x)   ((x)->cidr_ipv4_bitlen)
+#define CidrIpv6Bitlen(x)   ((x)->cidr_ipv6_bitlen)
 #define CidrAmount(x)  ((x)->cidr_amount)
 #define ClassPtr(x)      ((x)->c_class)
 
@@ -79,7 +79,8 @@ extern struct Class *default_class;
 #define ConfCurrUsers(x) (ClassPtr(x)->total)
 #define ConfIpLimits(x) (ClassPtr(x)->ip_limits)
 #define ConfCidrAmount(x) (ClassPtr(x)->cidr_amount)
-#define ConfCidrBitlen(x) (ClassPtr(x)->cidr_bitlen)
+#define ConfCidrIpv4Bitlen(x) (ClassPtr(x)->cidr_ipv4_bitlen)
+#define ConfCidrIpv6Bitlen(x) (ClassPtr(x)->cidr_ipv6_bitlen)
 
 void add_class(struct Class *);