explicitly show IP in SNO_BANNED snotes

[solanum.git] / extensions / ip_cloaking_old.c

diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index ea2c6bc2ff980a28d814b8f964c7798dd020dfc0..a4736df7dd4514668bfe2d59cb070227f69f049e 100644 (file)
--- a/extensions/ip_cloaking_old.c
+++ b/extensions/ip_cloaking_old.c
@@ -1,4 +1,3 @@
-/* $Id: ip_cloaking_old.c 3522 2007-07-06 07:48:28Z 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[] = "Very old IP cloaking mechanism";
+
+/* if you're modifying this module, you'll probably want to change this */
 #define KEY 0x13748cfa
 
 static int
@@ -35,45 +36,45 @@ _moddeinit(void)
 static void check_umode_change(void *data);
 static void check_new_user(void *data);
 mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
-       { "umode_changed", (hookfn) check_umode_change },
-       { "new_local_user", (hookfn) check_new_user },
+       { "umode_changed", check_umode_change },
+       { "new_local_user", check_new_user },
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-                       ip_cloaking_hfnlist, "$Revision: 3522 $");
+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);
-       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
 do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
 {
-       int cyc;
+       unsigned int cyc;
        unsigned int hosthash = 1, hosthash2 = 1;
-       unsigned int maxcycle = strlen(inbuf);  
+       unsigned int maxcycle = strlen(inbuf);
        int len1;
        const char *rest, *next;
 
@@ -93,7 +94,7 @@ do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
 
        if (ipmask == 0)
        {
-               rb_snprintf(outbuf, HOSTLEN, "%s-%X%X",
+               snprintf(outbuf, HOSTLEN, "%s-%X%X",
                        ServerInfo.network_name, hosthash2, hosthash);
                len1 = strlen(outbuf);
                rest = strchr(inbuf, '.');
@@ -105,7 +106,7 @@ do_host_cloak(const char *inbuf, char *outbuf, int ipmask)
                rb_strlcat(outbuf, rest, HOSTLEN);
        }
        else
-               rb_snprintf(outbuf, HOSTLEN, "%X%X.%s",
+               snprintf(outbuf, HOSTLEN, "%X%X.%s",
                        hosthash2, hosthash, ServerInfo.network_name);
 }
 
@@ -131,8 +132,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",
@@ -143,8 +143,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);
                }
        }
 }
@@ -159,7 +158,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(source_p->orighost, source_p->localClient->mangledhost, 1);
        else