X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c48eb01dbed808464cc3f702cc910f3962351825..377b98f0794834938a3fc1e5959236a7927d19d7:/src/match.c

diff --git a/src/match.c b/src/match.c
index 12e4c01..44de328 100644
--- a/src/match.c
+++ b/src/match.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Compare if a given string (name) matches the given
@@ -307,7 +307,7 @@ int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask
 		iaddr = &((struct sockaddr_in *)addr)->sin_addr;
 		idest = &((struct sockaddr_in *)dest)->sin_addr;
 	}
-#ifdef IPV6
+#ifdef RB_IPV6
 	else
 	{
 		iaddr = &((struct sockaddr_in6 *)addr)->sin6_addr;
@@ -346,7 +346,7 @@ int match_ips(const char *s1, const char *s2)
 	if (cidrlen == 0)
 		return 0;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if (strchr(mask, ':') && strchr(address, ':'))
 	{
 		aftype = AF_INET6;
@@ -364,8 +364,8 @@ int match_ips(const char *s1, const char *s2)
 	else
 		return 0;
 
-	inetpton(aftype, address, ipptr);
-	inetpton(aftype, mask, maskptr);
+	rb_inet_pton(aftype, address, ipptr);
+	rb_inet_pton(aftype, mask, maskptr);
 	if (comp_with_mask(ipptr, maskptr, cidrlen))
 		return 1;
 	else
@@ -414,7 +414,7 @@ int match_cidr(const char *s1, const char *s2)
 	if (cidrlen == 0)
 		return 0;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if (strchr(ip, ':') && strchr(ipmask, ':'))
 	{
 		aftype = AF_INET6;
@@ -432,8 +432,8 @@ int match_cidr(const char *s1, const char *s2)
 	else
 		return 0;
 
-	inetpton(aftype, ip, ipptr);
-	inetpton(aftype, ipmask, maskptr);
+	rb_inet_pton(aftype, ip, ipptr);
+	rb_inet_pton(aftype, ipmask, maskptr);
 	if (comp_with_mask(ipptr, maskptr, cidrlen) && match(mask, address))
 		return 1;
 	else