X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/9d99a3096c2802ac2c8a3b8af9b79399b41d7606..78825899cd6b68037fd1b3c6c77afb7d10c4774e:/extensions/ip_cloaking.c

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index f4fb75e3..cf2796c6 100644
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,4 +1,9 @@
-/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
+/*
+ * Solanum: a slightly advanced ircd
+ * ip_cloaking.c: provide user hostname cloaking
+ *
+ * Written originally by nenolod, altered to use FNV by Elizabeth in 2008
+ */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -12,8 +17,7 @@
 #include "s_serv.h"
 #include "numeric.h"
 
-/* if you're modifying this module, you'll probably to change this */
-#define KEY 0x13748cfa
+static const char ip_cloaking_desc[] = "IP cloaking module that uses user mode +h";
 
 static int
 _modinit(void)
@@ -36,34 +40,37 @@ _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)
+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);
 }
 
 static void
@@ -83,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.
@@ -92,18 +99,13 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 		 * the actual cloaking would get ugly
 		 */
 		for (tptr = outbuf; *tptr != '\0'; tptr++)
-		{
-			if (*tptr == ':') {
+			if (*tptr == ':')
 				totalcount++;
-			}
-		}
 	}
 	else if (!strchr(outbuf, '.'))
-	{
 		return;
-	}
 
-	for (tptr = outbuf; *tptr != '\0'; tptr++) 
+	for (tptr = outbuf; *tptr != '\0'; tptr++)
 	{
 		if (*tptr == ':' || *tptr == '.')
 		{
@@ -111,19 +113,13 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 			continue;
 		}
 
-		switch (ipv6)
-		{
-		case 1:
-			if (sepcount < totalcount / 2)
-				break;
-		case 0:
-			if (sepcount < 2)
-				break;
-		default:
-			*tptr = chartable[(*tptr + accum) % 20];
+		if (ipv6 && sepcount < totalcount / 2)
+			continue;
 
-		}
+		if (!ipv6 && sepcount < 2)
+			continue;
 
+		*tptr = chartable[(*tptr + accum) % 20];
 		accum = (accum << 1) | (accum >> 31);
 	}
 }
@@ -137,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.
@@ -147,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];
@@ -159,13 +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
@@ -190,8 +184,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 + 1);
-			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",
@@ -202,8 +195,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 + 1);
-			distribute_hostchange(source_p);
+			distribute_hostchange(source_p, source_p->orighost);
 		}
 	}
 }