Remove ^M on line endings.

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index c57bd09569c8d975349f82cf43ef3212aeee0258..51e5b77a25e3b56350fdc87886b5d1b5a6a367cd 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -27,14 +27,14 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: m_testline.c 2757 2006-11-10 22:58:15Z jilles $
+ * $Id: m_testline.c 3303 2007-03-28 15:22:49Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "client.h"
 #include "modules.h"
 #include "msg.h"
+#include "hash.h"
 #include "hostmask.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -54,14 +54,14 @@ struct Message testgecos_msgtab = {
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
-DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 2757 $");
+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[])
 {
        struct ConfItem *aconf;
        struct ConfItem *resv_p;
-       struct irc_sockaddr_storage ip;
+       struct rb_sockaddr_storage ip;
        char user_trunc[USERLEN + 1], notildeuser_trunc[USERLEN + 1];
        const char *name = NULL;
        const char *username = NULL;
@@ -73,6 +73,27 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
        mask = LOCAL_COPY(parv[1]);
 
+       if (IsChannelName(mask))
+       {
+               resv_p = hash_find_resv(mask);
+               if (resv_p != NULL)
+               {
+                       sendto_one(source_p, form_str(RPL_TESTLINE),
+                                       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);
+                       /* this is a false positive, so make sure it isn't counted in stats q
+                        * --nenolod
+                        */
+                       resv_p->port--;
+               }
+               else
+                       sendto_one(source_p, form_str(RPL_NOTESTLINE),
+                                       me.name, source_p->name, parv[1]);
+               return 0;
+       }
+
        if((p = strchr(mask, '!')))
        {
                *p++ = '\0';
@@ -98,7 +119,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        /* parses as an IP, check for a dline */
        if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
        {
-#ifdef IPV6
+#ifdef RB_IPV6
                if(type == HM_IPV6)
                        aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
                else
@@ -111,7 +132,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                                me.name, source_p->name,
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-                                (long) ((aconf->hold - CurrentTime) / 60) : 0L, 
+                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
                                aconf->host, aconf->passwd);
 
                        return 0;
@@ -132,7 +153,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
                                (type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
                                (type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
                                 (type == HM_IPV6) ? AF_INET6 : 
 #endif
                                  AF_INET) : 0)))
@@ -141,23 +162,13 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                if(aconf->status & CONF_KILL)
                {
-                       ircsnprintf(buf, sizeof(buf), "%s@%s", 
+                       rb_snprintf(buf, sizeof(buf), "%s@%s", 
                                        aconf->user, aconf->host);
                        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 - CurrentTime) / 60) : 0L,
-                               buf, aconf->passwd);
-                       return 0;
-               }
-               else if(aconf->status & CONF_GLINE)
-               {
-                       ircsnprintf(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 - CurrentTime) / 60),
+                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                                buf, aconf->passwd);
                        return 0;
                }
@@ -169,7 +180,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                sendto_one(source_p, form_str(RPL_TESTLINE),
                                me.name, source_p->name,
                                resv_p->hold ? 'q' : 'Q',
-                               resv_p->hold ? (long) ((resv_p->hold - CurrentTime) / 60) : 0L,
+                               resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
                                resv_p->name, resv_p->passwd);
 
                /* this is a false positive, so make sure it isn't counted in stats q
@@ -209,7 +220,7 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
        sendto_one(source_p, form_str(RPL_TESTLINE),
                        me.name, source_p->name,
                        aconf->hold ? 'x' : 'X',
-                       aconf->hold ? (long) ((aconf->hold - CurrentTime) / 60) : 0L,
+                       aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                        aconf->name, aconf->passwd);
        return 0;
 }