Include messages.h for macro form_str in select extensions

[solanum.git] / extensions / ip_cloaking.c

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index 657ab646b89800f6f6bf6299b463316c043b15c8..69a01d1cf3374b24ac9dc4c1432ceee1dfaf9a2f 100644 (file)
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,4 +1,9 @@
-/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
+/* 
+ * Charybdis: an advanced ircd
+ * ip_cloaking.c: provide user hostname cloaking
+ *
+ * Written originally by nenolod, altered to use FNV by Elizabeth in 2008
+ */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -12,9 +17,6 @@
 #include "s_serv.h"
 #include "numeric.h"
 
-/* if you're modifying this module, you'll probably to change this */
-#define KEY 0x13748cfa
-
 static int
 _modinit(void)
 {
@@ -45,25 +47,28 @@ DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
                        ip_cloaking_hfnlist, "$Revision: 3526 $");
 
 static void
-distribute_hostchange(struct Client *client)
+distribute_hostchange(struct Client *client_p, char *newhost)
 {
-       if (irccmp(client->host, client->orighost))
-               sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :is now your hidden host",
-                       client->host);
+       if (newhost != client_p->orighost)
+               sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
+                       newhost);
        else
-               sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :hostname reset",
-                       client->host);
+               sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :hostname reset",
+                       newhost);
 
        sendto_server(NULL, NULL,
                CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
-               use_id(&me), use_id(client), client->host);
+               use_id(&me), use_id(client_p), newhost);
        sendto_server(NULL, NULL,
                CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
-               use_id(&me), use_id(client), client->host);
-       if (irccmp(client->host, client->orighost))
-               SetDynSpoof(client);
+               use_id(&me), use_id(client_p), newhost);
+
+       change_nick_user_host(client_p, client_p->name, client_p->username, newhost, 0, "Changing host");
+
+       if (newhost != client_p->orighost)
+               SetDynSpoof(client_p);
        else
-               ClearDynSpoof(client);
+               ClearDynSpoof(client_p);
 }
 
 static void
@@ -92,16 +97,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 +111,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 +154,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);
        }       
@@ -190,8 +182,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 + 1);
-                       distribute_hostchange(source_p);
+                       distribute_hostchange(source_p, source_p->localClient->mangledhost);
                }
                else /* not really nice, but we need to send this numeric here */
                        sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
@@ -202,8 +193,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 + 1);
-                       distribute_hostchange(source_p);
+                       distribute_hostchange(source_p, source_p->orighost);
                }
        }
 }