Filter bogus CTCP ACTION messages.

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

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 0bcba6ea3bc08b8f0bfab721380514f3e7952f76..b96f87891bc5cc175a055b51a9e9b98bf4c4841f 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -27,7 +27,6 @@
  * 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,17 +38,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 +69,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 +84,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 +130,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 +182,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;
                }
        }
@@ -180,7 +204,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 +217,7 @@ 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, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+                               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;
@@ -221,6 +245,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;
 }