Emscripten, removed more network hacks, Emscripten bug 12996 is fixed in Emscripten 2.0.20

src/network/core/os_abstraction.h

@@ -166,29 +166,6 @@ typedef unsigned long in_addr_t;
 
 #endif /* OS/2 */
 
-#ifdef __EMSCRIPTEN__
-/**
- * Emscripten doesn't set 'addrlen' for accept(), getsockname(), getpeername()
- * and recvfrom(), which confuses other functions and causes them to crash.
- * This function needs to be called after these four functions to make sure
- * 'addrlen' is patched up.
- *
- * https://github.com/emscripten-core/emscripten/issues/12996
- *
- * @param address The address returned by those four functions.
- * @return The correct value for addrlen.
- */
-static inline socklen_t FixAddrLenForEmscripten(struct sockaddr_storage &address)
-{
-	switch (address.ss_family) {
-		case AF_INET6: return sizeof(struct sockaddr_in6);
-		case AF_INET: return sizeof(struct sockaddr_in);
-		default: NOT_REACHED();
-	}
-}
-#endif
-
-
 bool SetNonBlocking(SOCKET d);
 bool SetNoDelay(SOCKET d);
 NetworkError GetSocketError(SOCKET d);

src/network/core/tcp_listen.h

@@ -42,9 +42,6 @@ public:
 			socklen_t sin_len = sizeof(sin);
 			SOCKET s = accept(ls, (struct sockaddr*)&sin, &sin_len);
 			if (s == INVALID_SOCKET) return;
-#ifdef __EMSCRIPTEN__
-			sin_len = FixAddrLenForEmscripten(sin);
-#endif
 
 			SetNonBlocking(s); // XXX error handling?
 

src/network/core/udp.cpp

@@ -130,9 +130,6 @@ void NetworkUDPSocketHandler::ReceivePackets()
 			/* Did we get the bytes for the base header of the packet? */
 			if (nbytes <= 0) break;    // No data, i.e. no packet
 			if (nbytes <= 2) continue; // Invalid data; try next packet
-#ifdef __EMSCRIPTEN__
-			client_len = FixAddrLenForEmscripten(client_addr);
-#endif
 
 			NetworkAddress address(client_addr, client_len);
 			p.PrepareToRead();

src/network/network_gui.cpp

@@ -41,10 +41,6 @@
 
 #include "../safeguards.h"
 
-#ifdef __EMSCRIPTEN__
-#	include <emscripten.h>
-#endif
-
 static void ShowNetworkStartServerWindow();
 static void ShowNetworkLobbyWindow(NetworkGameList *ngl);