Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / extensions / ip_cloaking_old.c

diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index bcc900ed1385fbd359c05dba3d2c776093276aeb..f33ee46b442effd168a8aa1c2e702dcb719a0b15 100644 (file)
--- a/extensions/ip_cloaking_old.c
+++ b/extensions/ip_cloaking_old.c
@@ -9,7 +9,6 @@
 #include "s_conf.h"
 #include "s_user.h"
 #include "s_serv.h"
-#include "tools.h"
 #include "numeric.h"
 
 /* if you're modifying this module, you'll probably to change this */
@@ -45,28 +44,28 @@ DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
                        ip_cloaking_hfnlist, "$Revision: 3522 $");
 
 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);
-       sendto_server(NULL, NULL,
-               NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-               me.name, client->name, 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
@@ -74,7 +73,7 @@ do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
 {
        int cyc;
        unsigned int hosthash = 1, hosthash2 = 1;
-       unsigned int maxcycle = strlen(inbuf);  
+       unsigned int maxcycle = strlen(inbuf);
        int len1;
        const char *rest, *next;
 
@@ -103,7 +102,7 @@ do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
                /* try to avoid truncation -- jilles */
                while (len1 + strlen(rest) >= HOSTLEN && (next = strchr(rest + 1, '.')) != NULL)
                        rest = next;
-               strlcat(outbuf, rest, HOSTLEN);
+               rb_strlcat(outbuf, rest, HOSTLEN);
        }
        else
                rb_snprintf(outbuf, HOSTLEN, "%X%X.%s",
@@ -132,8 +131,7 @@ check_umode_change(void *vdata)
                }
                if (strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       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",
@@ -144,8 +142,7 @@ check_umode_change(void *vdata)
                if (source_p->localClient->mangledhost != NULL &&
                                !strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       strlcpy(source_p->host, source_p->orighost, HOSTLEN);
-                       distribute_hostchange(source_p);
+                       distribute_hostchange(source_p, source_p->orighost);
                }
        }
 }
@@ -160,7 +157,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
                return;
        }
-       source_p->localClient->mangledhost = MyMalloc(HOSTLEN);
+       source_p->localClient->mangledhost = rb_malloc(HOSTLEN);
        if (!irccmp(source_p->orighost, source_p->sockhost))
                do_host_cloak(source_p->orighost, source_p->localClient->mangledhost, 1);
        else
@@ -169,7 +166,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
        if (source_p->umodes & user_modes['h'])
        {
-               strlcpy(source_p->host, source_p->localClient->mangledhost, sizeof(source_p->host));
+               rb_strlcpy(source_p->host, source_p->localClient->mangledhost, sizeof(source_p->host));
                if (irccmp(source_p->host, source_p->orighost))
                        SetDynSpoof(source_p);
        }