m_webirc: use rb_inet_ntop_sock to populate sockhost

charybdis-ircd · Jun 27, 2017 · eb5b343 · eb5b343
1 parent d58d978
commit eb5b343
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/extensions/m_webirc.cc b/extensions/m_webirc.cc
@@ -83,8 +83,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 	struct rb_sockaddr_storage addr;
 
 	if ((!strchr(parv[4], '.') && !strchr(parv[4], ':')) ||
-			strlen(parv[4]) + (*parv[4] == ':') >=
-			sizeof(source_p->sockhost))
+			strlen(parv[4]) >= sizeof(source_p->sockhost))
 	{
 		sendto_one(source_p, "NOTICE * :Invalid IP");
 		return;
@@ -128,23 +127,15 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 		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));
-
 	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;
 
+	rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
+
 	/* Check dlines now, klines will be checked on registration */
 	if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
 			       GET_SS_FAMILY(&source_p->localClient->ip))))