Don't suggest putting values in an enum that are not in the enum.

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

diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index 54e13c926b1f190a80e3c09fc9270079595e6e94..16406536e70547cda8aed33b04817eb8a530b26b 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 */
@@ -60,9 +59,6 @@ distribute_hostchange(struct Client *client)
        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);
        else
@@ -94,7 +90,7 @@ do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
 
        if (ipmask == 0)
        {
-               ircsnprintf(outbuf, HOSTLEN, "%s-%X%X",
+               rb_snprintf(outbuf, HOSTLEN, "%s-%X%X",
                        ServerInfo.network_name, hosthash2, hosthash);
                len1 = strlen(outbuf);
                rest = strchr(inbuf, '.');
@@ -103,10 +99,10 @@ 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
-               ircsnprintf(outbuf, HOSTLEN, "%X%X.%s",
+               rb_snprintf(outbuf, HOSTLEN, "%X%X.%s",
                        hosthash2, hosthash, ServerInfo.network_name);
 }
 
@@ -132,7 +128,7 @@ check_umode_change(void *vdata)
                }
                if (strcmp(source_p->host, source_p->localClient->mangledhost))
                {
-                       strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN);
+                       rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN);
                        distribute_hostchange(source_p);
                }
                else /* not really nice, but we need to send this numeric here */
@@ -144,7 +140,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);
+                       rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN);
                        distribute_hostchange(source_p);
                }
        }
@@ -160,7 +156,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 +165,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);
        }