From 1e0e2cb46ca66d930bff030e7da9d76f089137f5 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Mon, 12 Feb 2018 17:53:51 -0800
Subject: [PATCH 2/2] Correctly check size of sockaddr_in and sockaddr_in6

---
 src/network/C4NetIO.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/C4NetIO.cpp b/src/network/C4NetIO.cpp
index 0120fb38e..aaab1a78b 100644
--- a/src/network/C4NetIO.cpp
+++ b/src/network/C4NetIO.cpp
@@ -1195,7 +1195,7 @@ bool C4NetIOTCP::Connect(const C4NetIO::addr_t &addr) // (mt-safe)
 #endif
 
 	// connect (async)
-	if (::connect(nsock, &addr, sizeof addr) == SOCKET_ERROR)
+	if (::connect(nsock, &addr, addr.GetFamily() == HostAddress::IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6)) == SOCKET_ERROR)
 	{
 		if (!HaveWouldBlockError()) // expected
 		{
@@ -1368,7 +1368,7 @@ C4NetIOTCP::Peer *C4NetIOTCP::Accept(SOCKET nsock, const addr_t &ConnectAddr) //
 	addr_t caddr = ConnectAddr;
 
 	// accept incoming connection?
-	C4NetIO::addr_t addr; socklen_t iAddrSize = sizeof addr;
+	C4NetIO::addr_t addr; socklen_t iAddrSize = addr.GetFamily() == HostAddress::IPv4 ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
 	if (nsock == INVALID_SOCKET)
 	{
 		// accept from listener
-- 
2.16.1