address issues causing network connectivity failures on macOS (#4473)

Author: notimaginative

code/inetfile/cftp.cpp

@@ -372,7 +372,7 @@ bool CFtpGet::IssuePasv()
 		return false;
 	}
 
-	if ( connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&dataaddr), sizeof(dataaddr)) == SOCKET_ERROR ) {
+	if ( connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&dataaddr), psnet_get_sockaddr_len(&dataaddr)) == SOCKET_ERROR ) {
 		return false;
 	}
 
@@ -392,7 +392,7 @@ int CFtpGet::ConnectControlSocket()
 	}
 
 	// Now we will connect to the host
-	if ( connect(m_ControlSock, reinterpret_cast<LPSOCKADDR>(&m_ServerAddr), sizeof(m_ServerAddr)) ) {
+	if ( connect(m_ControlSock, reinterpret_cast<LPSOCKADDR>(&m_ServerAddr), psnet_get_sockaddr_len(&m_ServerAddr)) ) {
 		m_State = FTP_STATE_CANT_CONNECT;
 		return 0;
 	}

code/inetfile/chttpget.cpp

@@ -331,7 +331,7 @@ int ChttpGet::ConnectSocket()
 	timeout.tv_sec = 0;
 	timeout.tv_usec = 0;
 
-	int serr = connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&hostaddr), sizeof(hostaddr));
+	int serr = connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&hostaddr), psnet_get_sockaddr_len(&hostaddr));
 	int cerr = WSAGetLastError();
 	if (serr) {
 		// fail after 20 seconds
@@ -360,7 +360,7 @@ int ChttpGet::ConnectSocket()
 			if (m_Aborting)
 				return 0;
 
-			serr = connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&hostaddr), sizeof(hostaddr));
+			serr = connect(m_DataSock, reinterpret_cast<LPSOCKADDR>(&hostaddr), psnet_get_sockaddr_len(&hostaddr));
 
 			if (serr == 0)
 				break;

code/network/chat_api.cpp

@@ -152,7 +152,7 @@ int ConnectToChatServer(char *serveraddr, char *nickname, char *trackerid)
 			return -1;
 		}
 
-		if (SOCKET_ERROR==bind(Chatsock, reinterpret_cast<LPSOCKADDR>(&Chataddr), sizeof(Chataddr)))
+		if (SOCKET_ERROR==bind(Chatsock, reinterpret_cast<LPSOCKADDR>(&Chataddr), psnet_get_sockaddr_len(&Chataddr)))
 		{
 			return -1;
 		}
@@ -164,7 +164,7 @@ int ConnectToChatServer(char *serveraddr, char *nickname, char *trackerid)
 			return -2;
 		}
 
-		if(SOCKET_ERROR == connect(Chatsock, reinterpret_cast<LPSOCKADDR>(&Chataddr), sizeof(Chataddr)))
+		if(SOCKET_ERROR == connect(Chatsock, reinterpret_cast<LPSOCKADDR>(&Chataddr), psnet_get_sockaddr_len(&Chataddr)))
 		{
 			if(WSAEWOULDBLOCK == WSAGetLastError())
 			{

code/network/psnet2.cpp

@@ -332,8 +332,14 @@ int SENDTO(SOCKET s, char * buf, int len, int flags, SOCKADDR *to, int tolen, in
 	outbuf[0] = static_cast<char>(psnet_type);
 	memcpy(&outbuf[1], buf, static_cast<size_t>(len));
 
+	SOCKLEN_T addrlen = tolen;
+
+	if (addrlen == sizeof(SOCKADDR_STORAGE)) {
+		addrlen = psnet_get_sockaddr_len(reinterpret_cast<SOCKADDR_STORAGE*>(to));
+	}
+
 	// send it
-	return static_cast<int>( sendto(s, outbuf, len + 1, flags, reinterpret_cast<LPSOCKADDR>(to), tolen) );
+	return static_cast<int>( sendto(s, outbuf, len + 1, flags, reinterpret_cast<LPSOCKADDR>(to), addrlen) );
 }
 
 /**
@@ -547,7 +553,7 @@ bool psnet_init_my_addr()
 				continue;
 			}
 
-			rval = connect(tsock, reinterpret_cast<LPSOCKADDR>(&remote_addr), sizeof(remote_addr));
+			rval = connect(tsock, reinterpret_cast<LPSOCKADDR>(&remote_addr), psnet_get_sockaddr_len(&remote_addr));
 
 			if (rval) {
 				continue;
@@ -586,7 +592,7 @@ bool psnet_init_my_addr()
 				continue;
 			}
 
-			rval = connect(tsock, reinterpret_cast<LPSOCKADDR>(&remote_addr), sizeof(remote_addr));
+			rval = connect(tsock, reinterpret_cast<LPSOCKADDR>(&remote_addr), psnet_get_sockaddr_len(&remote_addr));
 
 			if (rval) {
 				continue;
@@ -919,6 +925,25 @@ static void psnet_sockaddr_storage_to_in6(const SOCKADDR_STORAGE *addr, SOCKADDR
 	}
 }
 
+/**
+ * @brief Helper to get the exact length of a specific protocol struct from
+ *        a generic storage struct
+ *
+ * @param addr
+ * @return SOCKLEN_T
+ */
+SOCKLEN_T psnet_get_sockaddr_len(const SOCKADDR_STORAGE *addr)
+{
+	// internally we should always use IPv6, but cover the bases
+	if (addr->ss_family == AF_INET6) {
+		return static_cast<SOCKLEN_T>(sizeof(SOCKADDR_IN6));
+	} else if (addr->ss_family == AF_INET) {
+		return static_cast<SOCKLEN_T>(sizeof(SOCKADDR_IN));
+	} else {
+		return static_cast<SOCKLEN_T>(sizeof(SOCKADDR_STORAGE));
+	}
+}
+
 /**
  * Helper to map IPv4 to IPv6
  */
@@ -1126,6 +1151,7 @@ bool psnet_get_addr(const char *host, const char *port, SOCKADDR_STORAGE *addr,
 	SOCKADDR_IN6 si4to6;
 	int rval;
 
+	memset(addr, 0, sizeof(*addr));
 	memset(&si4to6, 0, sizeof(si4to6));
 
 	memset(&hints, 0, sizeof(hints));
@@ -2317,9 +2343,12 @@ bool psnet_init_socket()
 	psnet_set_socket_options();
 
 	// bind the socket
-	psnet_get_addr(nullptr, Psnet_default_port, &sockaddr);
+	if ( !psnet_get_addr(nullptr, Psnet_default_port, &sockaddr) ) {
+		ml_printf("Failed to get bind addr!");
+		return false;
+	}
 
-	if ( bind(Psnet_socket, reinterpret_cast<LPSOCKADDR>(&sockaddr), sizeof(sockaddr)) == SOCKET_ERROR) {
+	if ( bind(Psnet_socket, reinterpret_cast<LPSOCKADDR>(&sockaddr), psnet_get_sockaddr_len(&sockaddr)) == SOCKET_ERROR) {
 		Psnet_failure_code = WSAGetLastError();
 
 		if (Psnet_failure_code == WSAEADDRINUSE) {

code/network/psnet2.h

@@ -178,6 +178,9 @@ bool psnet_get_addr(const char *host, uint16_t port, SOCKADDR_STORAGE *addr, int
 #define ADDR_FLAG_NUMERIC_SERVICE	(1<<0)
 #define ADDR_FLAG_PREFER_IPV4		(1<<1)
 
+// get protocol struct length from generic storage struct
+SOCKLEN_T psnet_get_sockaddr_len(const SOCKADDR_STORAGE *addr);
+
 // map an IPv4 address to IPv6
 void psnet_map4to6(const in_addr *in4, in6_addr *in6);