X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..0d3fb5c99c432e752a363960ff14ebe727519065:/src/s_gline.c

diff --git a/src/s_gline.c b/src/s_gline.c
index 4eca0e7..326c6da 100644
--- a/src/s_gline.c
+++ b/src/s_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -34,7 +33,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "scache.h"
 #include "send.h"
@@ -42,10 +40,8 @@
 #include "s_serv.h"
 #include "s_gline.h"
 #include "hash.h"
-#include "event.h"
-#include "memory.h"
 
-dlink_list glines;
+rb_dlink_list glines;
 
 static void expire_glines(void);
 static void expire_pending_glines(void);
@@ -59,7 +55,7 @@ static void expire_pending_glines(void);
 void
 add_gline(struct ConfItem *aconf)
 {
-	dlinkAddTailAlloc(aconf, &glines);
+	rb_dlinkAddTailAlloc(aconf, &glines);
 	add_conf_by_address(aconf->host, CONF_GLINE, aconf->user, aconf);
 }
 
@@ -73,10 +69,10 @@ add_gline(struct ConfItem *aconf)
 struct ConfItem *
 find_is_glined(const char *host, const char *user)
 {
-	dlink_node *gline_node;
+	rb_dlink_node *gline_node;
 	struct ConfItem *kill_ptr;
 
-	DLINK_FOREACH(gline_node, glines.head)
+	RB_DLINK_FOREACH(gline_node, glines.head)
 	{
 		kill_ptr = gline_node->data;
 		if((kill_ptr->user && (!user || match(kill_ptr->user, user)))
@@ -116,19 +112,19 @@ cleanup_glines(void *unused)
 static void
 expire_glines()
 {
-	dlink_node *gline_node;
-	dlink_node *next_node;
+	rb_dlink_node *gline_node;
+	rb_dlink_node *next_node;
 	struct ConfItem *kill_ptr;
 
-	DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
+	RB_DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
 	{
 		kill_ptr = gline_node->data;
 
 		/* these are in chronological order */
-		if(kill_ptr->hold > CurrentTime)
+		if(kill_ptr->hold > rb_current_time())
 			break;
 
-		dlinkDestroy(gline_node, &glines);
+		rb_dlinkDestroy(gline_node, &glines);
 		delete_one_address_conf(kill_ptr->host, kill_ptr);
 	}
 }
@@ -146,22 +142,22 @@ expire_glines()
 static void
 expire_pending_glines()
 {
-	dlink_node *pending_node;
-	dlink_node *next_node;
+	rb_dlink_node *pending_node;
+	rb_dlink_node *next_node;
 	struct gline_pending *glp_ptr;
 
-	DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
+	RB_DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
 	{
 		glp_ptr = pending_node->data;
 
 		if(((glp_ptr->last_gline_time + GLINE_PENDING_EXPIRE) <=
-		    CurrentTime) || find_is_glined(glp_ptr->host, glp_ptr->user))
+		    rb_current_time()) || find_is_glined(glp_ptr->host, glp_ptr->user))
 
 		{
-			MyFree(glp_ptr->reason1);
-			MyFree(glp_ptr->reason2);
-			MyFree(glp_ptr);
-			dlinkDestroy(pending_node, &pending_glines);
+			rb_free(glp_ptr->reason1);
+			rb_free(glp_ptr->reason2);
+			rb_free(glp_ptr);
+			rb_dlinkDestroy(pending_node, &pending_glines);
 		}
 	}
 }