Automated merge with ssh://hg.atheme.org//hg/charybdis

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

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 0bcba6ea3bc08b8f0bfab721380514f3e7952f76..bee4fcc12c305506a0754285205a8dfc4aadff09 100644 (file)
--- 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,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]);
 
@@ -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)
@@ -161,14 +183,17 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                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;
                }
        }