X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f14bcab7bc8dd270e1e5b54426525760584f13c7..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/src/class.c

diff --git a/src/class.c b/src/class.c
index 878e694..3b55fff 100644
--- a/src/class.c
+++ b/src/class.c
@@ -27,7 +27,6 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
@@ -36,8 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
-#include "memory.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2
@@ -51,7 +49,7 @@ make_class(void)
 {
 	struct Class *tmp;
 
-	tmp = (struct Class *) MyMalloc(sizeof(struct Class));
+	tmp = rb_malloc(sizeof(struct Class));
 
 	ConFreq(tmp) = DEFAULT_CONNECTFREQUENCY;
 	PingFreq(tmp) = DEFAULT_PINGFREQUENCY;
@@ -68,8 +66,8 @@ free_class(struct Class *tmp)
 	if(tmp->ip_limits)
 		rb_destroy_patricia(tmp->ip_limits, NULL);
 
-	MyFree(tmp->class_name);
-	MyFree(tmp);
+	rb_free(tmp->class_name);
+	rb_free(tmp);
 
 }
 
@@ -201,7 +199,8 @@ add_class(struct Class *classptr)
 		PingFreq(tmpptr) = PingFreq(classptr);
 		MaxSendq(tmpptr) = MaxSendq(classptr);
 		ConFreq(tmpptr) = ConFreq(classptr);
-		CidrBitlen(tmpptr) = CidrBitlen(classptr);
+		CidrIpv4Bitlen(tmpptr) = CidrIpv4Bitlen(classptr);
+		CidrIpv6Bitlen(tmpptr) = CidrIpv6Bitlen(classptr);
 		CidrAmount(tmpptr) = CidrAmount(classptr);
 
 		free_class(classptr);
@@ -274,7 +273,7 @@ void
 initclass()
 {
 	default_class = make_class();
-	DupString(ClassName(default_class), "default");
+	ClassName(default_class) = rb_strdup("default");
 }
 
 /*