X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4d7a1ee5d1f53fab128cceef8a57f2aa5746977a..8bd5767b953efd089e0467b02f897f77581e589d:/modules/m_trace.c

diff --git a/modules/m_trace.c b/modules/m_trace.c
index 3d62f685..d04efd19 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -34,7 +34,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -77,7 +76,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 	const char *tname;
 	int doall = 0;
 	int cnt = 0, wilds, dow;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	if(parc > 1)
 	{
@@ -111,7 +110,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 			if(ac2ptr == NULL)
 			{
-				DLINK_FOREACH(ptr, global_client_list.head)
+				RB_DLINK_FOREACH(ptr, global_client_list.head)
 				{
 					ac2ptr = ptr->data;
 
@@ -197,7 +196,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 				report_this_status(source_p, source_p, 0);
 		}
 
-		DLINK_FOREACH(ptr, local_oper_list.head)
+		RB_DLINK_FOREACH(ptr, local_oper_list.head)
 		{
 			target_p = ptr->data;
 
@@ -209,7 +208,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 		if (IsExemptShide(source_p) || !ConfigServerHide.flatten_links)
 		{
-			DLINK_FOREACH(ptr, serv_list.head)
+			RB_DLINK_FOREACH(ptr, serv_list.head)
 			{
 				target_p = ptr->data;
 
@@ -228,7 +227,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* source_p is opered */
 
 	/* report all direct connections */
-	DLINK_FOREACH(ptr, lclient_list.head)
+	RB_DLINK_FOREACH(ptr, lclient_list.head)
 	{
 		target_p = ptr->data;
 
@@ -242,7 +241,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 		cnt = report_this_status(source_p, target_p, dow);
 	}
 
-	DLINK_FOREACH(ptr, serv_list.head)
+	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{
 		target_p = ptr->data;
 
@@ -254,7 +253,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(MyConnect(source_p))
 	{
-		DLINK_FOREACH(ptr, unknown_list.head)
+		RB_DLINK_FOREACH(ptr, unknown_list.head)
 		{
 			target_p = ptr->data;
 
@@ -280,7 +279,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(doall)
 	{
-		DLINK_FOREACH(ptr, class_list.head)
+		RB_DLINK_FOREACH(ptr, class_list.head)
 		{
 			cltmp = ptr->data;
 
@@ -307,11 +306,11 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
 static void
 count_downlinks(struct Client *server_p, int *pservcount, int *pusercount)
 {
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	(*pservcount)++;
-	*pusercount += dlink_list_length(&server_p->serv->users);
-	DLINK_FOREACH(ptr, server_p->serv->servers.head)
+	*pusercount += rb_dlink_list_length(&server_p->serv->users);
+	RB_DLINK_FOREACH(ptr, server_p->serv->servers.head)
 	{
 		count_downlinks(ptr->data, pservcount, pusercount);
 	}
@@ -370,7 +369,7 @@ report_this_status(struct Client *source_p, struct Client *target_p,
 		sendto_one_numeric(source_p, RPL_TRACEUNKNOWN,
 				   form_str(RPL_TRACEUNKNOWN),
 				   class_name, name, ip,
-				   CurrentTime - target_p->localClient->firsttime);
+				   rb_current_time() - target_p->localClient->firsttime);
 		cnt++;
 		break;
 
@@ -387,16 +386,16 @@ report_this_status(struct Client *source_p, struct Client *target_p,
 						   form_str(RPL_TRACEOPERATOR),
 						   class_name, name,
 						   show_ip(source_p, target_p) ? ip : "255.255.255.255",
-						   CurrentTime - target_p->localClient->lasttime,
-						   CurrentTime - target_p->localClient->last);
+						   rb_current_time() - target_p->localClient->lasttime,
+						   rb_current_time() - target_p->localClient->last);
 
 			else
 				sendto_one_numeric(source_p, RPL_TRACEUSER, 
 						   form_str(RPL_TRACEUSER),
 						   class_name, name,
 						   show_ip(source_p, target_p) ? ip : "255.255.255.255",
-						   CurrentTime - target_p->localClient->lasttime,
-						   CurrentTime - target_p->localClient->last);
+						   rb_current_time() - target_p->localClient->lasttime,
+						   rb_current_time() - target_p->localClient->last);
 			cnt++;
 		}
 		break;
@@ -411,7 +410,7 @@ report_this_status(struct Client *source_p, struct Client *target_p,
 			sendto_one_numeric(source_p, RPL_TRACESERVER, form_str(RPL_TRACESERVER),
 				   class_name, servcount, usercount, name,
 				   *(target_p->serv->by) ? target_p->serv->by : "*", "*",
-				   me.name, CurrentTime - target_p->localClient->lasttime);
+				   me.name, rb_current_time() - target_p->localClient->lasttime);
 			cnt++;
 
 		}