Add network typedefs to start cross-platform support (#6)

rm5248 · web-flow · commit 4d8990cb4dd3 · 2025-08-17T18:00:07.000-04:00
* Add network typedefs to start cross-platform support

* use winsock2
diff --git a/Code/BandTest/BandTest.cpp b/Code/BandTest/BandTest.cpp
@@ -204,7 +204,7 @@ static int Ping_Host(unsigned long host_ip, unsigned long my_ip, int times, int
 static float Average_Ping(int num_pings, unsigned long *ping_times, bool ignore_low_high);
 static float Lowest_Ping(int num_pings, unsigned long *ping_times);
 static int Get_Path_To_Server(unsigned long *path, unsigned long my_ip, unsigned long server_ip);
-static void Ping_Profile(SOCKADDR_IN *router_addr, unsigned long my_ip);
+static void Ping_Profile(struct sockaddr_in *router_addr, unsigned long my_ip);
 
 static bool Set_Registry_Int(const char *name, int value);
 static int Get_Registry_Int(const char *name, int def_value);
@@ -1072,7 +1072,7 @@ unsigned long Upstream_Detect(unsigned long server_ip, unsigned long my_ip, int
 
 
 
-void Ping_Profile(SOCKADDR_IN *router_addr, unsigned long my_ip)
+void Ping_Profile(struct sockaddr_in *router_addr, unsigned long my_ip)
 {
 	float ping_averages[1000];
 	unsigned long ping_times[100];
diff --git a/Code/Commando/bioevent.cpp b/Code/Commando/bioevent.cpp
@@ -137,7 +137,7 @@ cBioEvent::Act(void)
 			// Record his IP address for diagnostic purposes
 			//
 			WWASSERT(cNetwork::Get_Server_Rhost(SenderId) != NULL);
-			SOCKADDR_IN & address = cNetwork::Get_Server_Rhost(SenderId)->Get_Address();
+			struct sockaddr_in & address = cNetwork::Get_Server_Rhost(SenderId)->Get_Address();
 			p_player->Set_Ip_Address(address.sin_addr.s_addr);
 
 			//
diff --git a/Code/Commando/gamedata.cpp b/Code/Commando/gamedata.cpp
@@ -478,7 +478,7 @@ void cGameData::Rebalance_Team_Sides(void)
 void cGameData::Set_Ip_And_Port(void)
 {
 	/*
-	SOCKADDR_IN local_address;
+	struct sockaddr_in local_address;
    bool retcode = cNetUtil::Get_Local_Address(&local_address);
 	WWASSERT(retcode == true);
 
diff --git a/Code/Commando/lanchat.h b/Code/Commando/lanchat.h
@@ -32,7 +32,7 @@
 #define LANCHAT_H
 
 #include "win.h"
-#include <winsock.h>
+#include "network-typedefs.h"
 
 #include "chatshre.h"
 
@@ -72,7 +72,7 @@ class cLanChat
       void						Process_Position_Broadcast(cPacket & packet);
 
       SOCKET					Socket;
-		SOCKADDR_IN				LocalAddress;
+		struct sockaddr_in				LocalAddress;
       DWORD						LastPositionBroadcastTimeMs;
       int						PositionBroadcastNumber;
 		ChatLocationEnum		CurrentLocation;
diff --git a/Code/Commando/natsock.h b/Code/Commando/natsock.h
@@ -43,7 +43,7 @@
 #include	"assert.h"
 #include	"vector.h"
 
-#include	<winsock.h>
+#include	"network-typedefs.h"
 
 #ifndef DebugString
 #include	"wwdebug.h"
@@ -231,4 +231,4 @@ class SocketHandlerClass
 };
 
 
-#endif //NATSOCK_H
+#endif //NATSOCK_H
diff --git a/Code/Commando/natter.cpp b/Code/Commando/natter.cpp
@@ -1274,7 +1274,7 @@ bool WOLNATInterfaceClass::Send_Game_Format_Packet_To(IPAddressClass *address, c
 
 #if (0)
 		WWDEBUG_SAY(("WOLNATInterface - sendto %s\n", address->As_String()));
-		int result = sendto(socket_handler->Get_Socket(), full_packet.Get_Data(), full_packet.Get_Compressed_Size_Bytes(), 0, (LPSOCKADDR) &sock_address, sizeof(SOCKADDR_IN));
+		int result = sendto(socket_handler->Get_Socket(), full_packet.Get_Data(), full_packet.Get_Compressed_Size_Bytes(), 0, (LPSOCKADDR) &sock_address, sizeof(struct sockaddr_in));
 		if (result == SOCKET_ERROR){
 			if (LAST_ERROR != WSAEWOULDBLOCK) {
 				WWDEBUG_SAY(("WOLNATInterface - sendto returned error code %d\n", LAST_ERROR));
@@ -1379,7 +1379,7 @@ void WOLNATInterfaceClass::Service_Receive_Queue(SocketHandlerClass *socket)
 		unsigned short port;
 		int bytes = PacketManager.Get_Packet(socket->Get_Socket(), (unsigned char *)full_packet.Get_Data(), full_packet.Get_Max_Size(), ip_address, port);
 		if (bytes > 0) {
-			sockaddr_in *addr_ptr = (LPSOCKADDR_IN) &full_packet.Get_From_Address_Wrapper()->FromAddress;
+			sockaddr_in *addr_ptr = (struct sockaddr_in*) &full_packet.Get_From_Address_Wrapper()->FromAddress;
 			memcpy(&addr_ptr->sin_addr.s_addr, ip_address, 4);
 			addr_ptr->sin_port = port;
 		}
diff --git a/Code/Commando/nicenum.cpp b/Code/Commando/nicenum.cpp
@@ -25,7 +25,7 @@
 
 #include "nicenum.h"
 
-#include <winsock.h>
+#include "network-typedefs.h"
 #include <stdio.h>
 
 #include "wwdebug.h"
diff --git a/Code/Commando/pkthandlers.cpp b/Code/Commando/pkthandlers.cpp
@@ -131,7 +131,7 @@ void cNetwork::Server_Packet_Handler(cPacket & packet, int rhost_id)
 		if (object != NULL)
 		{
 #ifdef WWDEBUG
-			//sockaddr_in *actual_from_addr_ptr = (LPSOCKADDR_IN) &packet.Get_From_Address_Wrapper()->FromAddress;
+			//sockaddr_in *actual_from_addr_ptr = (struct sockaddr_in*) &packet.Get_From_Address_Wrapper()->FromAddress;
 			//sockaddr_in rhost_addr = PServerConnection->Get_Remote_Host(rhost_id)->Get_Address();
 #endif //WWDEBUG
 
diff --git a/Code/SControl/servercontrolsocket.h b/Code/SControl/servercontrolsocket.h
@@ -42,7 +42,7 @@
 #include	"assert.h"
 #include	"vector.h"
 
-#include	<winsock.h>
+#include	"network-typedefs.h"
 
 #ifndef DebugString
 #include	"wwdebug.h"
@@ -209,4 +209,4 @@ class ServerControlSocketClass
 };
 
 
-#endif //SERVERCONTROLSOCKET_H
+#endif //SERVERCONTROLSOCKET_H
diff --git a/Code/Tests/Bandy/bandy.cpp b/Code/Tests/Bandy/bandy.cpp
@@ -39,7 +39,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include <winsock.h>
+#include <winsock2.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Code/Tests/LocalHost/main.cpp b/Code/Tests/LocalHost/main.cpp
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <conio.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <assert.h>
 
 //---------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void main(void)
    int rc_ioctl = ::ioctlsocket(sock, FIONBIO, &is_nonblocking);
    assert(rc_ioctl == 0);
 	
-	SOCKADDR_IN local_address;
+	struct sockaddr_in local_address;
 	local_address.sin_family			= AF_INET;
 	local_address.sin_addr.s_addr		= ::inet_addr("127.0.0.1");	// localhost
 	local_address.sin_port				= ::htons(5555);					// arbitrary
@@ -92,7 +92,7 @@ void main(void)
 		{
 			char recv_data[200];
 			::memset(recv_data, 0, sizeof(recv_data));
-			SOCKADDR_IN from_address;
+			struct sockaddr_in from_address;
 			int from_len = sizeof(from_address);
 			rc_recv = ::recvfrom(sock, recv_data, sizeof(recv_data), 0,
 				(LPSOCKADDR) &from_address, &from_len);
diff --git a/Code/Tools/RenRem/RenRem.cpp b/Code/Tools/RenRem/RenRem.cpp
@@ -39,7 +39,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include <winsock.h>
+#include "network-typedefs.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -287,4 +287,4 @@ int main(int argc, char **argv)
 
 	WSACleanup();
 	return(0);
-}
+}
diff --git a/Code/Tools/RenegadeGR/field.cpp b/Code/Tools/RenegadeGR/field.cpp
@@ -34,7 +34,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include <string.h>
 #include <sys/types.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include "field.h"
 
 
diff --git a/Code/Tools/RenegadeGR/packet.cpp b/Code/Tools/RenegadeGR/packet.cpp
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <winsock.h>
+#include <winsock2.h>
 
 #include "packet.h"
 
diff --git a/Code/Tools/RenegadeGR/tcpmgr.h b/Code/Tools/RenegadeGR/tcpmgr.h
@@ -32,7 +32,7 @@
 
 #ifdef _WINDOWS
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <io.h>
 
 #else  //UNIX
diff --git a/Code/Tools/RenegadeGR/wtime.h b/Code/Tools/RenegadeGR/wtime.h
@@ -35,7 +35,7 @@ wtime                      Neal Kettler
 #include <sys/time.h>
 #else
 #include <sys/timeb.h>
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #include <time.h>
diff --git a/Code/Tools/wlib/wtime.h b/Code/Tools/wlib/wtime.h
@@ -35,7 +35,7 @@ wtime                      Neal Kettler
 #include <sys/time.h>
 #else
 #include <sys/timeb.h>
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #include <time.h>
diff --git a/Code/Tools/wlib/xtime.h b/Code/Tools/wlib/xtime.h
@@ -44,7 +44,7 @@ function :-)
 #include <sys/time.h>
 #else
 #include <sys/timeb.h>
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #include <time.h>
diff --git a/Code/Tools/wnet/tcp.h b/Code/Tools/wnet/tcp.h
@@ -33,7 +33,7 @@ TCP                   Neal Kettler        neal@westwood.com
 
 #ifdef _WINDOWS
 
-#include <winsock.h>
+#include <winsock2.h>
 #include <io.h>
 #define close _close
 #define read  _read
diff --git a/Code/Tools/wnet/udp.h b/Code/Tools/wnet/udp.h
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #ifdef _WINDOWS
-#include <winsock.h>
+#include <winsock2.h>
 #include <io.h>
 #define close _close
 #define read  _read
diff --git a/Code/WWOnline/GameResField.cpp b/Code/WWOnline/GameResField.cpp
@@ -41,7 +41,7 @@
 
 // Get rid of the nameless struct/union warning
 #pragma warning(disable: 4201)
-#include <winsock.h>
+#include <winsock2.h>
 #pragma warning(default: 4201)
 
 namespace WWOnline {
diff --git a/Code/WWOnline/GameResPacket.cpp b/Code/WWOnline/GameResPacket.cpp
@@ -35,7 +35,7 @@
 #include "GameResPacket.h"
 #include <assert.h>
 #include <string.h>
-#include <winsock.h>
+#include "network-typedefs.h"
 #include <algorithm>
 
 namespace WWOnline {
diff --git a/Code/wwnet/CMakeLists.txt b/Code/wwnet/CMakeLists.txt
@@ -31,6 +31,7 @@ set(WWNET_SRC
     singlepl.h
     wwpacket.cpp
     wwpacket.h
+    network-typedefs.h
 )
 
 # Targets to build.
diff --git a/Code/wwnet/connect.cpp b/Code/wwnet/connect.cpp
diff --git a/Code/wwnet/connect.h b/Code/wwnet/connect.h
diff --git a/Code/wwnet/fromaddress.h b/Code/wwnet/fromaddress.h
diff --git a/Code/wwnet/netutil.cpp b/Code/wwnet/netutil.cpp
diff --git a/Code/wwnet/netutil.h b/Code/wwnet/netutil.h
diff --git a/Code/wwnet/network-typedefs.h b/Code/wwnet/network-typedefs.h
diff --git a/Code/wwnet/packetmgr.cpp b/Code/wwnet/packetmgr.cpp
diff --git a/Code/wwnet/packetmgr.h b/Code/wwnet/packetmgr.h
diff --git a/Code/wwnet/rhost.cpp b/Code/wwnet/rhost.cpp
diff --git a/Code/wwnet/rhost.h b/Code/wwnet/rhost.h
diff --git a/cmake/gamespy.cmake b/cmake/gamespy.cmake

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ void cGameData::Rebalance_Team_Sides(void)`
`478`	`478`	`void cGameData::Set_Ip_And_Port(void)`
`479`	`479`	`{`
`480`	`480`	`/*`
`481`		`- SOCKADDR_IN local_address;`
	`481`	`+ struct sockaddr_in local_address;`
`482`	`482`	`bool retcode = cNetUtil::Get_Local_Address(&local_address);`
`483`	`483`	`WWASSERT(retcode == true);`
`484`	`484`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void cNetwork::Server_Packet_Handler(cPacket & packet, int rhost_id)`
`131`	`131`	`if (object != NULL)`
`132`	`132`	`{`
`133`	`133`	`#ifdef WWDEBUG`
`134`		`- //sockaddr_in *actual_from_addr_ptr = (LPSOCKADDR_IN) &packet.Get_From_Address_Wrapper()->FromAddress;`
	`134`	`+ //sockaddr_in actual_from_addr_ptr = (struct sockaddr_in) &packet.Get_From_Address_Wrapper()->FromAddress;`
`135`	`135`	`//sockaddr_in rhost_addr = PServerConnection->Get_Remote_Host(rhost_id)->Get_Address();`
`136`	`136`	`#endif //WWDEBUG`
`137`	`137`