X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/02369fa767e87c36fe98d15e1c4aae4172508644..81e41406f4027dfef50dcd5ef33403661bea5995:/extensions/m_webirc.c?ds=inline

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index fe0a4ae2..499c4059 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -53,7 +53,9 @@
 #include "s_conf.h"
 #include "reject.h"
 
-static int mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
+static const char webirc_desc[] = "Adds support for the WebIRC system";
+
+static void mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
 
 struct Message webirc_msgtab = {
 	"WEBIRC", 0, 0, 0, 0,
@@ -62,8 +64,6 @@ struct Message webirc_msgtab = {
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
 
-static const char webirc_desc[] = "Adds support for the WebIRC system";
-
 DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
 
 /*
@@ -73,38 +73,30 @@ DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, web
  *	parv[3] = fake hostname
  *	parv[4] = fake ip
  */
-static int
+static void
 mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct ConfItem *aconf;
 	const char *encr;
 	struct rb_sockaddr_storage addr;
 
-	if ((!strchr(parv[4], '.') && !strchr(parv[4], ':')) ||
-			strlen(parv[4]) + (*parv[4] == ':') >=
-			sizeof(source_p->sockhost))
-	{
-		sendto_one(source_p, "NOTICE * :Invalid IP");
-		return 0;
-	}
-
 	aconf = find_address_conf(client_p->host, client_p->sockhost,
 				IsGotId(client_p) ? client_p->username : "webirc",
 				IsGotId(client_p) ? client_p->username : "webirc",
 				(struct sockaddr *) &client_p->localClient->ip,
-				client_p->localClient->ip.ss_family, NULL);
+				GET_SS_FAMILY(&client_p->localClient->ip), NULL);
 	if (aconf == NULL || !(aconf->status & CONF_CLIENT))
-		return 0;
+		return;
 	if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
 	{
 		/* XXX */
 		sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
-		return 0;
+		return;
 	}
 	if (EmptyString(aconf->passwd))
 	{
 		sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
-		return 0;
+		return;
 	}
 
 	if (EmptyString(parv[1]))
@@ -117,43 +109,34 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 	if (encr == NULL || strcmp(encr, aconf->passwd))
 	{
 		sendto_one(source_p, "NOTICE * :CGI:IRC password incorrect");
-		return 0;
+		return;
 	}
 
-	if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
+	if (rb_inet_pton_sock(parv[4], &addr) <= 0)
 	{
 		sendto_one(source_p, "NOTICE * :Invalid IP");
-		return 0;
+		return;
 	}
 
-	if (*parv[4] == ':')
-	{
-		source_p->sockhost[0] = '0';
-		rb_strlcpy(source_p->sockhost + 1, parv[4],
-				sizeof(source_p->sockhost) - 1);
-	}
-	else
-		rb_strlcpy(source_p->sockhost, parv[4],
-				sizeof(source_p->sockhost));
+	source_p->localClient->ip = addr;
+
+	rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
 
 	if(strlen(parv[3]) <= HOSTLEN)
 		rb_strlcpy(source_p->host, parv[3], sizeof(source_p->host));
 	else
 		rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
 
-	source_p->localClient->ip = addr;
-
 	/* Check dlines now, klines will be checked on registration */
 	if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
-			       source_p->localClient->ip.ss_family)))
+			       GET_SS_FAMILY(&source_p->localClient->ip))))
 	{
 		if(!(aconf->status & CONF_EXEMPTDLINE))
 		{
 			exit_client(client_p, source_p, &me, "D-lined");
-			return 0;
+			return;
 		}
 	}
 
 	sendto_one(source_p, "NOTICE * :CGI:IRC host/IP set to %s %s", parv[3], parv[4]);
-	return 0;
 }