Add description for LOCOPS message.

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

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index e60ef4c280366afef6a2ff6c0664eef8d66565df..035913e9b3f068c317fb0c54e85ff228c3341dfd 100644 (file)
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -66,8 +66,6 @@ distribute_hostchange(struct Client *client)
                ClearDynSpoof(client);
 }
 
-#define HOSTLEN 63
-
 static void
 do_host_cloak_ip(const char *inbuf, char *outbuf)
 {
@@ -79,7 +77,7 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
        int totalcount = 0;
        int ipv6 = 0;
 
-       strncpy(outbuf, inbuf, HOSTLEN);
+       rb_strlcpy(outbuf, inbuf, HOSTLEN + 1);
 
        if (strchr(outbuf, ':'))
        {
@@ -94,16 +92,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++) 
        {
@@ -113,19 +106,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);
        }
 }
@@ -137,7 +124,7 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
        char *tptr;
        uint32_t accum = fnv_hash((const unsigned char*) inbuf, 32);
 
-       strncpy(outbuf, inbuf, HOSTLEN);
+       rb_strlcpy(outbuf, inbuf, HOSTLEN + 1);
 
        /* pass 1: scramble first section of hostname using base26 
         * alphabet toasted against the FNV hash of the string.
@@ -162,9 +149,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);
        }       
@@ -192,7 +177,7 @@ check_umode_change(void *vdata)
                }
                if (strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN);
+                       rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN + 1);
                        distribute_hostchange(source_p);
                }
                else /* not really nice, but we need to send this numeric here */
@@ -204,7 +189,7 @@ check_umode_change(void *vdata)
                if (source_p->localClient->mangledhost != NULL &&
                                !strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN);
+                       rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN + 1);
                        distribute_hostchange(source_p);
                }
        }
@@ -220,7 +205,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
                return;
        }
-       source_p->localClient->mangledhost = rb_malloc(HOSTLEN);
+       source_p->localClient->mangledhost = rb_malloc(HOSTLEN + 1);
        if (!irccmp(source_p->orighost, source_p->sockhost))
                do_host_cloak_ip(source_p->orighost, source_p->localClient->mangledhost);
        else