X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..90a3c35b295b07ebe3793bf5d3b882c3c1a5dc7c:/src/reject.c

diff --git a/src/reject.c b/src/reject.c
index ff35117..aaf8fab 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -28,8 +28,6 @@
 #include "patricia.h"
 #include "client.h"
 #include "s_conf.h"
-#include "event.h"
-#include "tools.h"
 #include "reject.h"
 #include "s_stats.h"
 #include "msg.h"
@@ -57,7 +55,7 @@ reject_exit(void *unused)
 	struct Client *client_p;
 	rb_dlink_node *ptr, *ptr_next;
 
-	DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
+	RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
 	{
 		client_p = ptr->data;
 	  	if(IsDead(client_p))
@@ -95,7 +93,7 @@ reject_expires(void *unused)
 	patricia_node_t *pnode;
 	struct reject_data *rdata;
 	
-	DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
 	{
 		pnode = ptr->data;
 		rdata = pnode->data;		
@@ -104,7 +102,7 @@ reject_expires(void *unused)
 			continue;
 
 		rb_dlinkDelete(ptr, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 	}
 }
@@ -196,12 +194,12 @@ flush_reject(void)
 	patricia_node_t *pnode;
 	struct reject_data *rdata;
 	
-	DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
 	{
 		pnode = ptr->data;
 		rdata = pnode->data;
 		rb_dlinkDelete(ptr, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 	}
 }
@@ -220,7 +218,7 @@ remove_reject_ip(const char *ip)
 	{
 		struct reject_data *rdata = pnode->data;
 		rb_dlinkDelete(&rdata->rnode, &reject_list);
-		MyFree(rdata);
+		rb_free(rdata);
 		patricia_remove(reject_tree, pnode);
 		return 1;
 	}
@@ -241,14 +239,14 @@ remove_reject_mask(const char *mask1, const char *mask2)
 		hashv ^= fnv_hash_upper(mask1, 32);
 	if (mask2 != NULL)
 		hashv ^= fnv_hash_upper(mask2, 32);
-	DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+	RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
 	{
 		pnode = ptr->data;
 		rdata = pnode->data;
 		if (rdata->mask_hashv == hashv)
 		{
 			rb_dlinkDelete(ptr, &reject_list);
-			MyFree(rdata);
+			rb_free(rdata);
 			patricia_remove(reject_tree, pnode);
 			n++;
 		}