X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/add9f99dfa681fbf6d326e91dd4ffd60f53f1d2b..8e2ebdb80add54d46c9f7f058ad469d70ddf9457:/modules/m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index ca5930b3..51e5b77a 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -30,7 +30,6 @@
  * $Id: m_testline.c 3303 2007-03-28 15:22:49Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "client.h"
 #include "modules.h"
@@ -62,7 +61,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 {
 	struct ConfItem *aconf;
 	struct ConfItem *resv_p;
-	struct irc_sockaddr_storage ip;
+	struct rb_sockaddr_storage ip;
 	char user_trunc[USERLEN + 1], notildeuser_trunc[USERLEN + 1];
 	const char *name = NULL;
 	const char *username = NULL;
@@ -82,7 +81,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 					me.name, source_p->name,
 					resv_p->hold ? 'q' : 'Q',
-					resv_p->hold ? (long) ((resv_p->hold - CurrentTime) / 60) : 0L,
+					resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
 					resv_p->name, resv_p->passwd);
 			/* this is a false positive, so make sure it isn't counted in stats q
 			 * --nenolod
@@ -120,7 +119,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	/* parses as an IP, check for a dline */
 	if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
 	{
-#ifdef IPV6
+#ifdef RB_IPV6
 		if(type == HM_IPV6)
 			aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
 		else
@@ -133,7 +132,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-				 (long) ((aconf->hold - CurrentTime) / 60) : 0L, 
+				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
 				aconf->host, aconf->passwd);
 
 			return 0;
@@ -154,7 +153,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
 				(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
 				(type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
 				 (type == HM_IPV6) ? AF_INET6 : 
 #endif
 				  AF_INET) : 0)))
@@ -163,23 +162,13 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 		if(aconf->status & CONF_KILL)
 		{
-			ircsnprintf(buf, sizeof(buf), "%s@%s", 
+			rb_snprintf(buf, sizeof(buf), "%s@%s", 
 					aconf->user, aconf->host);
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-				 (long) ((aconf->hold - CurrentTime) / 60) : 0L,
-				buf, aconf->passwd);
-			return 0;
-		}
-		else if(aconf->status & CONF_GLINE)
-		{
-			ircsnprintf(buf, sizeof(buf), "%s@%s",
-					aconf->user, aconf->host);
-			sendto_one(source_p, form_str(RPL_TESTLINE),
-				me.name, source_p->name,
-				'G', (long) ((aconf->hold - CurrentTime) / 60),
+				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
 				buf, aconf->passwd);
 			return 0;
 		}
@@ -191,7 +180,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 		sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				resv_p->hold ? 'q' : 'Q',
-				resv_p->hold ? (long) ((resv_p->hold - CurrentTime) / 60) : 0L,
+				resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
 				resv_p->name, resv_p->passwd);
 
 		/* this is a false positive, so make sure it isn't counted in stats q
@@ -231,7 +220,7 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
 	sendto_one(source_p, form_str(RPL_TESTLINE),
 			me.name, source_p->name,
 			aconf->hold ? 'x' : 'X',
-			aconf->hold ? (long) ((aconf->hold - CurrentTime) / 60) : 0L,
+			aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
 			aconf->name, aconf->passwd);
 	return 0;
 }