extensions/extb_extgecos: support CIDR masks in $x extbans (#414)

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

diff --git a/extensions/ip_cloaking_4.0.c b/extensions/ip_cloaking_4.0.c
index e0ce6d55fa8a9647f09ef270542fb7200bd1da2a..d7313af6bffcf7d8d1729666bc698104d56fc9ed 100644 (file)
--- a/extensions/ip_cloaking_4.0.c
+++ b/extensions/ip_cloaking_4.0.c
@@ -1,5 +1,5 @@
-/* 
- * Charybdis: an advanced ircd
+/*
+ * Solanum: a slightly advanced ircd
  * ip_cloaking.c: provide user hostname cloaking
  *
  * Written originally by nenolod, altered to use FNV by Elizabeth in 2008
@@ -17,6 +17,8 @@
 #include "s_serv.h"
 #include "numeric.h"
 
+static const char ip_cloaking_desc[] = "New IP cloaking module that uses user mode +x instead of +h";
+
 static int
 _modinit(void)
 {
@@ -38,30 +40,30 @@ _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: 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_p, char *newhost)
 {
        if (newhost != client_p->orighost)
                sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
-                       client_p->host);
+                       newhost);
        else
                sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :hostname reset",
-                       client_p->host);
+                       newhost);
 
        sendto_server(NULL, NULL,
                CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
-               use_id(&me), use_id(client_p), client_p->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_p), client_p->host);
+               use_id(&me), use_id(client_p), newhost);
 
        change_nick_user_host(client_p, client_p->name, client_p->username, newhost, 0, "Changing host");
 
@@ -88,7 +90,7 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
        {
                ipv6 = 1;
 
-               /* Damn you IPv6... 
+               /* Damn you IPv6...
                 * We count the number of colons so we can calculate how much
                 * of the host to cloak. This is because some hostmasks may not
                 * have as many octets as we'd like.
@@ -103,7 +105,7 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
        else if (!strchr(outbuf, '.'))
                return;
 
-       for (tptr = outbuf; *tptr != '\0'; tptr++) 
+       for (tptr = outbuf; *tptr != '\0'; tptr++)
        {
                if (*tptr == ':' || *tptr == '.')
                {
@@ -131,7 +133,7 @@ do_host_cloak_host(const char *inbuf, char *outbuf)
 
        rb_strlcpy(outbuf, inbuf, HOSTLEN + 1);
 
-       /* pass 1: scramble first section of hostname using base26 
+       /* pass 1: scramble first section of hostname using base26
         * alphabet toasted against the FNV hash of the string.
         *
         * numbers are not changed at this time, only letters.
@@ -141,7 +143,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];
@@ -153,11 +155,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 = '0' + (*tptr + accum) % 10;
 
                accum = (accum << 1) | (accum >> 31);
-       }       
+       }
 }
 
 static void