X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/70c365cb350315dd2146847f05a276938fb042aa..742ddc8fac87a5dd713110df6f2a76f56d34b00b:/modules/m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index a261d415..7aa27a88 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -1,5 +1,5 @@
 /* modules/m_testline.c
- * 
+ *
  *  Copyright (C) 2004 Lee Hardy <lee@leeh.co.uk>
  *  Copyright (C) 2004-2005 ircd-ratbox development team
  *
@@ -26,8 +26,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: m_testline.c 3303 2007-03-28 15:22:49Z jilles $
  */
 #include "stdinc.h"
 #include "send.h"
@@ -39,25 +37,28 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "sprintf_irc.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 **);
+static const char testline_desc[] = "Provides the ability to test I/K/D/X lines and RESVs";
+
+static void mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message testline_msgtab = {
-	"TESTLINE", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+	"TESTLINE", 0, 0, 0, 0,
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
 };
 struct Message testgecos_msgtab = {
-	"TESTGECOS", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
+	"TESTGECOS", 0, 0, 0, 0,
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
-DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 3303 $");
 
-static int
-mo_testline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+DECLARE_MODULE_AV2(testline, NULL, NULL, testline_clist, NULL, NULL, NULL, NULL, testline_desc);
+
+static void
+mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct ConfItem *aconf;
 	struct ConfItem *resv_p;
@@ -70,6 +71,9 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	char *p;
 	int host_mask;
 	int type;
+	int duration;
+	char *puser, *phost, *reason, *operreason;
+	char reasonbuf[BUFSIZE];
 
 	mask = LOCAL_COPY(parv[1]);
 
@@ -82,7 +86,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 					me.name, source_p->name,
 					resv_p->hold ? 'q' : 'Q',
 					resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-					resv_p->name, resv_p->passwd);
+					resv_p->host, resv_p->passwd);
 			/* this is a false positive, so make sure it isn't counted in stats q
 			 * --nenolod
 			 */
@@ -91,7 +95,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 		else
 			sendto_one(source_p, form_str(RPL_NOTESTLINE),
 					me.name, source_p->name, parv[1]);
-		return 0;
+		return;
 	}
 
 	if((p = strchr(mask, '!')))
@@ -101,7 +105,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 		mask = p;
 
 		if(EmptyString(mask))
-			return 0;
+			return;
 	}
 
 	if((p = strchr(mask, '@')))
@@ -111,76 +115,83 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 		host = p;
 
 		if(EmptyString(host))
-			return 0;
+			return;
 	}
 	else
 		host = mask;
 
 	/* parses as an IP, check for a dline */
-	if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
+	if((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST)
 	{
-#ifdef IPV6
 		if(type == HM_IPV6)
 			aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
 		else
-#endif
 			aconf = find_dline((struct sockaddr *)&ip, AF_INET);
 
 		if(aconf && aconf->status & CONF_DLINE)
 		{
+			get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+			snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+				operreason ? "|" : "", operreason ? operreason : "");
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
-				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
-				aconf->host, aconf->passwd);
+				(aconf->flags & CONF_FLAGS_TEMPORARY) ?
+				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
+				phost, reasonbuf);
 
-			return 0;
+			return;
 		}
+		/* 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 / 60L,
+					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 / 60L,
+					host, "Throttled");
 	}
 
 	if (username != NULL)
 	{
-		strlcpy(user_trunc, username, sizeof user_trunc);
-		strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, username, sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
 	}
 	else
 	{
-		strlcpy(user_trunc, "dummy", sizeof user_trunc);
-		strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
 	}
 	/* now look for a matching I/K/G */
 	if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
 				(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
 				(type != HM_HOST) ? (
-#ifdef IPV6
-				 (type == HM_IPV6) ? AF_INET6 : 
-#endif
-				  AF_INET) : 0)))
+				 (type == HM_IPV6) ? AF_INET6 :
+				  AF_INET) : 0, NULL)))
 	{
 		static char buf[HOSTLEN+USERLEN+2];
 
 		if(aconf->status & CONF_KILL)
 		{
-			rb_snprintf(buf, sizeof(buf), "%s@%s", 
-					aconf->user, aconf->host);
+			get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+			snprintf(buf, sizeof(buf), "%s@%s",
+					puser, phost);
+			snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+				operreason ? "|" : "", operreason ? operreason : "");
 			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) ? 
+				(aconf->flags & CONF_FLAGS_TEMPORARY) ?
 				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-				buf, aconf->passwd);
-			return 0;
-		}
-		else if(aconf->status & CONF_GLINE)
-		{
-			rb_snprintf(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 - rb_current_time()) / 60),
-				buf, aconf->passwd);
-			return 0;
+				buf, reasonbuf);
+			return;
 		}
 	}
 
@@ -191,32 +202,32 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 				me.name, source_p->name,
 				resv_p->hold ? 'q' : 'Q',
 				resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-				resv_p->name, resv_p->passwd);
+				resv_p->host, resv_p->passwd);
 
 		/* this is a false positive, so make sure it isn't counted in stats q
 		 * --nenolod
 		 */
 		resv_p->port--;
-		return 0;
+		return;
 	}
 
 	/* no matching resv, we can print the I: if it exists */
 	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->info.name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+				show_iline_prefix(source_p, aconf, aconf->user),
 				aconf->host, aconf->port, aconf->className);
-		return 0;
+		return;
 	}
 
 	/* nothing matches.. */
 	sendto_one(source_p, form_str(RPL_NOTESTLINE),
 			me.name, source_p->name, parv[1]);
-	return 0;
 }
 
-static int
-mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct ConfItem *aconf;
 
@@ -224,13 +235,12 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
 	{
 		sendto_one(source_p, form_str(RPL_NOTESTLINE),
 				me.name, source_p->name, parv[1]);
-		return 0;
+		return;
 	}
 
 	sendto_one(source_p, form_str(RPL_TESTLINE),
 			me.name, source_p->name,
 			aconf->hold ? 'x' : 'X',
 			aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-			aconf->name, aconf->passwd);
-	return 0;
+			aconf->host, aconf->passwd);
 }