Merge pull request #140 from viatsko/remove-snprintf

[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..e378a72faf56e299a1d70a4cb3e1a7b58490fbcf 100644 (file)
--- a/extensions/ip_cloaking_3.0.c
+++ b/extensions/ip_cloaking_3.0.c
@@ -44,25 +44,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);
 }
 
 #define Nval 0x8c3a48ac
@@ -138,7 +141,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 +151,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 +160,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 +189,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 +200,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);
                }
        }
 }