Add some ircd-seven love to CREDITS.

[irc/rqf/shadowircd.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 63f99af0c14a55ca5102bb362a7c9a10306d7f86..05b7148b46f2146fba4e29732d98aeb4293c8778 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,17 +39,18 @@
 #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 **);
 
 struct Message testline_msgtab = {
        "TESTLINE", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+       {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}}
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
@@ -69,6 +70,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]);
 
@@ -81,7 +85,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
                         */
@@ -127,15 +131,33 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                if(aconf && aconf->status & CONF_DLINE)
                {
+                       get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+                       rb_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);
+                               phost, reasonbuf);
 
                        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,20 +177,23 @@ 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];
 
                if(aconf->status & CONF_KILL)
                {
+                       get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
                        rb_snprintf(buf, sizeof(buf), "%s@%s", 
-                                       aconf->user, aconf->host);
+                                       puser, phost);
+                       rb_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) ? 
                                 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-                               buf, aconf->passwd);
+                               buf, reasonbuf);
                        return 0;
                }
        }
@@ -180,7 +205,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
@@ -193,7 +218,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->info.name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+                               show_iline_prefix(source_p, aconf, aconf->user),
                                aconf->host, aconf->port, aconf->className);
                return 0;
        }
@@ -220,6 +246,6 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
                        me.name, source_p->name,
                        aconf->hold ? 'x' : 'X',
                        aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-                       aconf->name, aconf->passwd);
+                       aconf->host, aconf->passwd);
        return 0;
 }