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

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 63f99af0..215f48d9 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,6 +39,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "reject.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);
@@ -69,6 +70,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	char *p;
 	int host_mask;
 	int type;
+	int duration;
 
 	mask = LOCAL_COPY(parv[1]);
 
@@ -136,6 +138,21 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 			return 0;
 		}
+		/* Otherwise, aconf is an exempt{} */
+		if(aconf == NULL &&
+				(duration = is_reject_ip((struct sockaddr *)&ip)))
+			sendto_one(source_p, form_str(RPL_TESTLINE),
+					me.name, source_p->name,
+					'!',
+					duration / 60,
+					host, "Reject cache");
+		if(aconf == NULL &&
+				(duration = is_throttle_ip((struct sockaddr *)&ip)))
+			sendto_one(source_p, form_str(RPL_TESTLINE),
+					me.name, source_p->name,
+					'!',
+					duration / 60,
+					host, "Throttled");
 	}
 
 	if (username != NULL)
@@ -155,7 +172,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 #ifdef RB_IPV6
 				 (type == HM_IPV6) ? AF_INET6 : 
 #endif
-				  AF_INET) : 0)))
+				  AF_INET) : 0, NULL)))
 	{
 		static char buf[HOSTLEN+USERLEN+2];
 
@@ -193,7 +210,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	if(aconf && aconf->status & CONF_CLIENT)
 	{
 		sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
-				aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+				aconf->name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+				show_iline_prefix(source_p, aconf, aconf->user),
 				aconf->host, aconf->port, aconf->className);
 		return 0;
 	}