Add `solanum.chat/oper` capablity (#217)

[solanum.git] / extensions / ip_cloaking_3.0.c

diff --git a/extensions/ip_cloaking_3.0.c b/extensions/ip_cloaking_3.0.c
index e80a19a451deea7918a9e6051f8ab86e7db3ec69..2b6f2dcbb371abf27563a92909629168d3bf138d 100644 (file)
--- a/extensions/ip_cloaking_3.0.c
+++ b/extensions/ip_cloaking_3.0.c
@@ -1,4 +1,3 @@
-/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -11,7 +10,9 @@
 #include "s_serv.h"
 #include "numeric.h"
 
-/* if you're modifying this module, you'll probably to change this */
+static const char ip_cloaking_desc[] = "The old IP cloaking mechanism version 3.0";
+
+/* if you're modifying this module, you'll probably want to change this */
 #define KEY 0x13748cfa
 
 static int
@@ -40,29 +41,32 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-                       ip_cloaking_hfnlist, "$Revision: 3526 $");
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+       ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
 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);
 }
 
 #define Nval 0x8c3a48ac
@@ -99,7 +103,7 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 {
        char *tptr;
        unsigned int accum = get_string_weighted_entropy(inbuf);
-       char buf[HOSTLEN];
+       char buf[HOSTLEN + 1] = { 0 };
        int ipv6 = 0;
 
        strncpy(buf, inbuf, HOSTLEN);
@@ -121,11 +125,11 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 
        if(ipv6)
        {
-           snprintf(outbuf, HOSTLEN, "%s:%x", buf, accum);
+           snprintf(outbuf, HOSTLEN, "%.60s:%x", buf, accum);
        }
        else
        {
-           snprintf(outbuf, HOSTLEN, "%s.%x", buf, accum);
+           snprintf(outbuf, HOSTLEN, "%.60s.%x", buf, accum);
        }
 }
 
@@ -138,7 +142,7 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
 
        strncpy(outbuf, inbuf, HOSTLEN);
 
-       /* pass 1: scramble first section of hostname using base26 
+       /* pass 1: scramble first section of hostname using base26
         * alphabet toasted against the weighted entropy of the string.
         *
         * numbers are not changed at this time, only letters.
@@ -148,7 +152,7 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
                if (*tptr == '.')
                        break;
 
-               if (isdigit(*tptr) || *tptr == '-')
+               if (isdigit((unsigned char)*tptr) || *tptr == '-')
                        continue;
 
                *tptr = b26_alphabet[(*tptr * accum) % 26];
@@ -157,11 +161,11 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
        /* pass 2: scramble each number in the address */
        for (tptr = outbuf; *tptr != '\0'; tptr++)
        {
-               if (isdigit(*tptr))
+               if (isdigit((unsigned char)*tptr))
                {
                        *tptr = 48 + ((*tptr * accum) % 10);
                }
-       }       
+       }
 }
 
 static void
@@ -186,8 +190,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);
-                       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",
@@ -198,8 +201,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);
-                       distribute_hostchange(source_p);
+                       distribute_hostchange(source_p, source_p->orighost);
                }
        }
 }
@@ -214,7 +216,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