From f88fbaa2fe91c22f1c7280ecd96c2bcf92f73a4d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 11 Aug 2022 14:20:18 +0100
Subject: Move aptosa/untosa into the sockaddrs union and add from/from_ip.

The struct will also now always be zero-initialized by default which
removes the footgun which has happened previously where the union has
been accessed before being initialized leading to it containing weird
values.
---
 src/cidr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cidr.cpp')

diff --git a/src/cidr.cpp b/src/cidr.cpp
index f45c63b98..f7401fe92 100644
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -76,8 +76,8 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
 		return false;
 	}
 
-	irc::sockets::sockaddrs addr;
-	if (!irc::sockets::aptosa(address_copy, 0, addr))
+	irc::sockets::sockaddrs addr(false);
+	if (!addr.from_ip(address_copy))
 	{
 		// The address could not be parsed.
 		return false;
-- 
cgit v1.3.1-10-gc9f91