From c2c4de7267db9835e36132364f422ba7d93f25d6 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 7 Feb 2019 15:34:41 +0000
Subject: Fix linking servers with UNIX sockets.

- Remove the address/port overloads of BeginConnect.
- Change DoConnect to take a sockaddrs instead of an address/port.
---
 src/modules/m_spanningtree/resolvers.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_spanningtree/resolvers.cpp')

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index ded0573af..b20b100dd 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -49,6 +49,14 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 		return;
 	}
 
+	irc::sockets::sockaddrs sa;
+	if (!irc::sockets::aptosa(ans_record->rdata, MyLink->Port, sa))
+	{
+		// We had a result but it wasn't a valid IPv4/IPv6.
+		OnError(r);
+		return;
+	}
+
 	/* Initiate the connection, now that we have an IP to use.
 	 * Passing a hostname directly to BufferedSocket causes it to
 	 * just bail and set its FD to -1.
@@ -56,7 +64,7 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 	TreeServer* CheckDupe = Utils->FindServer(MyLink->Name);
 	if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */
 	{
-		TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, ans_record->rdata);
+		TreeSocket* newsocket = new TreeSocket(MyLink, myautoconnect, sa);
 		if (newsocket->GetFd() > -1)
 		{
 			/* We're all OK */
-- 
cgit v1.3.1-10-gc9f91