X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/762cc38cf9536053ea31085206508922ba524eaa..bd0d352f12ee12bbe14b43c4eed9fbc74c51ac00:/extensions/ip_cloaking_old.c

diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index 54e13c92..2bd28a4e 100644
--- 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
@@ -94,7 +93,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 +102,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,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);
 	}