libratbox: Clean up uses of strcpy().

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

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index 657ab646b89800f6f6bf6299b463316c043b15c8..1f807ad41d69851cee3f9fffbe6a62a3eff1aaae 100644 (file)
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,4 +1,3 @@
-/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -19,7 +18,7 @@ static int
 _modinit(void)
 {
        /* add the usermode to the available slot */
-       user_modes['h'] = find_umode_slot();
+       user_modes['x'] = find_umode_slot();
        construct_umodebuf();
 
        return 0;
@@ -29,7 +28,7 @@ static void
 _moddeinit(void)
 {
        /* disable the umode and remove it from the available list */
-       user_modes['h'] = 0;
+       user_modes['x'] = 0;
        construct_umodebuf();
 }
 
@@ -92,16 +91,11 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
                 * the actual cloaking would get ugly
                 */
                for (tptr = outbuf; *tptr != '\0'; tptr++)
-               {
-                       if (*tptr == ':') {
+                       if (*tptr == ':')
                                totalcount++;
-                       }
-               }
        }
        else if (!strchr(outbuf, '.'))
-       {
                return;
-       }
 
        for (tptr = outbuf; *tptr != '\0'; tptr++) 
        {
@@ -111,19 +105,13 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
                        continue;
                }
 
-               switch (ipv6)
-               {
-               case 1:
-                       if (sepcount < totalcount / 2)
-                               break;
-               case 0:
-                       if (sepcount < 2)
-                               break;
-               default:
-                       *tptr = chartable[(*tptr + accum) % 20];
+               if (ipv6 && sepcount < totalcount / 2)
+                       continue;
 
-               }
+               if (!ipv6 && sepcount < 2)
+                       continue;
 
+               *tptr = chartable[(*tptr + accum) % 20];
                accum = (accum << 1) | (accum >> 31);
        }
 }
@@ -160,9 +148,7 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
        for (tptr = outbuf; *tptr != '\0'; tptr++)
        {
                if (isdigit(*tptr))
-               {
-                       *tptr = (*tptr + accum) % 10;
-               }
+                       *tptr = '0' + (*tptr + accum) % 10;
 
                accum = (accum << 1) | (accum >> 31);
        }       
@@ -178,14 +164,14 @@ check_umode_change(void *vdata)
                return;
 
        /* didn't change +h umode, we don't need to do anything */
-       if (!((data->oldumodes ^ source_p->umodes) & user_modes['h']))
+       if (!((data->oldumodes ^ source_p->umodes) & user_modes['x']))
                return;
 
-       if (source_p->umodes & user_modes['h'])
+       if (source_p->umodes & user_modes['x'])
        {
                if (IsIPSpoof(source_p) || source_p->localClient->mangledhost == NULL || (IsDynSpoof(source_p) && strcmp(source_p->host, source_p->localClient->mangledhost)))
                {
-                       source_p->umodes &= ~user_modes['h'];
+                       source_p->umodes &= ~user_modes['x'];
                        return;
                }
                if (strcmp(source_p->host, source_p->localClient->mangledhost))
@@ -197,7 +183,7 @@ check_umode_change(void *vdata)
                        sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
                                source_p->host);
        }
-       else if (!(source_p->umodes & user_modes['h']))
+       else if (!(source_p->umodes & user_modes['x']))
        {
                if (source_p->localClient->mangledhost != NULL &&
                                !strcmp(source_p->host, source_p->localClient->mangledhost))
@@ -215,7 +201,7 @@ check_new_user(void *vdata)
 
        if (IsIPSpoof(source_p))
        {
-               source_p->umodes &= ~user_modes['h'];
+               source_p->umodes &= ~user_modes['x'];
                return;
        }
        source_p->localClient->mangledhost = rb_malloc(HOSTLEN + 1);
@@ -224,8 +210,8 @@ check_new_user(void *vdata)
        else
                do_host_cloak_host(source_p->orighost, source_p->localClient->mangledhost);
        if (IsDynSpoof(source_p))
-               source_p->umodes &= ~user_modes['h'];
-       if (source_p->umodes & user_modes['h'])
+               source_p->umodes &= ~user_modes['x'];
+       if (source_p->umodes & user_modes['x'])
        {
                rb_strlcpy(source_p->host, source_p->localClient->mangledhost, sizeof(source_p->host));
                if (irccmp(source_p->host, source_p->orighost))