X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c98390004f4f14cd8215302d77313f81e2546e22..bf019bb06d4c89e505eeeecaa7d4f08f62b50365:/modules/m_gline.c

diff --git a/modules/m_gline.c b/modules/m_gline.c
index 1d9ecb8..8301c87 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_gline.h"
 #include "channel.h"
 #include "client.h"
@@ -36,7 +35,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "scache.h"
@@ -47,6 +45,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_log.h"
+#include "reject.h"
 
 static int mo_gline(struct Client *, struct Client *, int, const char **);
 static int mc_gline(struct Client *, struct Client *, int, const char **);
@@ -555,15 +554,15 @@ set_local_gline(struct Client *source_p, const char *user,
 		oper_reason++;
 
 		if(!EmptyString(oper_reason))
-			DupString(aconf->spasswd, oper_reason);
+			aconf->spasswd = rb_strdup(oper_reason);
 	}
 
-	ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+	rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
 
-	DupString(aconf->passwd, buffer);
-	DupString(aconf->user, user);
-	DupString(aconf->host, host);
-	aconf->hold = CurrentTime + ConfigFileEntry.gline_time;
+	aconf->passwd = rb_strdup(buffer);
+	aconf->user = rb_strdup(user);
+	aconf->host = rb_strdup(host);
+	aconf->hold = rb_current_time() + ConfigFileEntry.gline_time;
 	add_gline(aconf);
 
 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -588,7 +587,7 @@ static int
 majority_gline(struct Client *source_p, const char *user,
 	       const char *host, const char *reason)
 {
-	dlink_node *pending_node;
+	rb_dlink_node *pending_node;
 	struct gline_pending *pending;
 
 	/* to avoid desync.. --fl */
@@ -598,7 +597,7 @@ majority_gline(struct Client *source_p, const char *user,
 	if(find_is_glined(host, user))
 		return NO;
 
-	DLINK_FOREACH(pending_node, pending_glines.head)
+	RB_DLINK_FOREACH(pending_node, pending_glines.head)
 	{
 		pending = pending_node->data;
 
@@ -650,10 +649,10 @@ majority_gline(struct Client *source_p, const char *user,
 					sizeof(pending->oper_user2));
 				strlcpy(pending->oper_host2, source_p->host,
 					sizeof(pending->oper_host2));
-				DupString(pending->reason2, reason);
+				pending->reason2 = rb_strdup(reason);
 				pending->oper_server2 = scache_get_name(source_p->servptr->serv->nameinfo);
-				pending->last_gline_time = CurrentTime;
-				pending->time_request2 = CurrentTime;
+				pending->last_gline_time = rb_current_time();
+				pending->time_request2 = rb_current_time();
 				return NO;
 			}
 		}
@@ -661,7 +660,7 @@ majority_gline(struct Client *source_p, const char *user,
 
 	/* no pending gline, create a new one */
 	pending = (struct gline_pending *) 
-			    MyMalloc(sizeof(struct gline_pending));
+			    rb_malloc(sizeof(struct gline_pending));
 
 	strlcpy(pending->oper_nick1, source_p->name,
 		sizeof(pending->oper_nick1));
@@ -674,13 +673,13 @@ majority_gline(struct Client *source_p, const char *user,
 
 	strlcpy(pending->user, user, sizeof(pending->user));
 	strlcpy(pending->host, host, sizeof(pending->host));
-	DupString(pending->reason1, reason);
+	pending->reason1 = rb_strdup(reason);
 	pending->reason2 = NULL;
 
-	pending->last_gline_time = CurrentTime;
-	pending->time_request1 = CurrentTime;
+	pending->last_gline_time = rb_current_time();
+	pending->time_request1 = rb_current_time();
 
-	dlinkAddAlloc(pending, &pending_glines);
+	rb_dlinkAddAlloc(pending, &pending_glines);
 
 	return NO;
 }
@@ -695,14 +694,14 @@ static int
 remove_temp_gline(const char *user, const char *host)
 {
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	struct irc_sockaddr_storage addr, caddr;
+	rb_dlink_node *ptr;
+	struct rb_sockaddr_storage addr, caddr;
 	int bits, cbits;
 	int mtype, gtype;
 
 	mtype = parse_netmask(host, (struct sockaddr *)&addr, &bits);
 
-	DLINK_FOREACH(ptr, glines.head)
+	RB_DLINK_FOREACH(ptr, glines.head)
 	{
 		aconf = ptr->data;
 
@@ -721,7 +720,8 @@ remove_temp_gline(const char *user, const char *host)
 						(struct sockaddr *)&caddr, bits))
 			continue;
 
-		dlinkDestroy(ptr, &glines);
+		rb_dlinkDestroy(ptr, &glines);
+		remove_reject_mask(aconf->user, aconf->host);
 		delete_one_address_conf(aconf->host, aconf);
 		return YES;
 	}