X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5b96d9a6b92f3ca219ff2baab7596cc94580813d..6445c1cf0be42ce98eef3dc74cd2f1077871596a:/include/class.h

diff --git a/include/class.h b/include/class.h
index 78064ebd..9a1ab251 100644
--- a/include/class.h
+++ b/include/class.h
@@ -20,15 +20,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: class.h 6 2005-09-10 01:02:21Z nenolod $
  */
 
 #ifndef INCLUDED_class_h
 #define INCLUDED_class_h
 
-#include "tools.h"
-
 struct ConfItem;
 struct Client;
 struct _patricia_tree_t;
@@ -45,8 +41,9 @@ 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;
 
 };
@@ -64,7 +61,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 +77,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 *);