Do not check floodcount if user is messaging self.

[irc/rqf/shadowircd.git] / extensions / ip_cloaking.c

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index e7598bb882bb0226e9d4a5c1e5675cb6b8003526..27cb3922f94abcf52c0159dfb2ed924c5330b753 100644 (file)
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,4 +1,4 @@
-/* $Id: ip_cloaking.c 3524 2007-07-06 07:54:54Z nenolod $ */
+/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -9,7 +9,6 @@
 #include "s_conf.h"
 #include "s_user.h"
 #include "s_serv.h"
-#include "tools.h"
 #include "numeric.h"
 
 /* if you're modifying this module, you'll probably to change this */
@@ -42,7 +41,7 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 };
 
 DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-                       ip_cloaking_hfnlist, "$Revision: 3524 $");
+                       ip_cloaking_hfnlist, "$Revision: 3526 $");
 
 static void
 distribute_hostchange(struct Client *client)
@@ -60,9 +59,6 @@ distribute_hostchange(struct Client *client)
        sendto_server(NULL, NULL,
                CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
                use_id(&me), use_id(client), client->host);
-       sendto_server(NULL, NULL,
-               NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-               me.name, client->name, client->host);
        if (irccmp(client->host, client->orighost))
                SetDynSpoof(client);
        else
@@ -109,7 +105,10 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
        tptr = strrchr(buf, '.');
 
        if (tptr == NULL)
+       {
+               strncpy(outbuf, inbuf, HOSTLEN);
                return;
+       }
 
        *tptr++ = '\0';
 
@@ -173,7 +172,7 @@ check_umode_change(void *vdata)
                }
                if (strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN);
+                       rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN);
                        distribute_hostchange(source_p);
                }
                else /* not really nice, but we need to send this numeric here */
@@ -185,7 +184,7 @@ check_umode_change(void *vdata)
                if (source_p->localClient->mangledhost != NULL &&
                                !strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       strlcpy(source_p->host, source_p->orighost, HOSTLEN);
+                       rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN);
                        distribute_hostchange(source_p);
                }
        }
@@ -201,7 +200,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
                return;
        }
-       source_p->localClient->mangledhost = MyMalloc(HOSTLEN);
+       source_p->localClient->mangledhost = rb_malloc(HOSTLEN);
        if (!irccmp(source_p->orighost, source_p->sockhost))
                do_host_cloak_ip(source_p->orighost, source_p->localClient->mangledhost);
        else
@@ -210,7 +209,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
        if (source_p->umodes & user_modes['h'])
        {
-               strlcpy(source_p->host, source_p->localClient->mangledhost, sizeof(source_p->host));
+               rb_strlcpy(source_p->host, source_p->localClient->mangledhost, sizeof(source_p->host));
                if (irccmp(source_p->host, source_p->orighost))
                        SetDynSpoof(source_p);
        }