chore/fix: clean up NetworkSocketLayer, fix console compile errors

Minecraft.Client/Common/Network/SocketManagers/CPlatformSocketManagerPS3.cpp

@@ -0,0 +1,93 @@
+#include "stdafx.h"
+
+#include "NetworkSocketManager.h"
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <sys/select.h>
+#include <netex/net.h>
+#include <netex/errno.h>
+
+// PIEBOT: Adding this because Sony systems uses BSD apis
+//		   which uses socketclose instead of closesocket.
+int NetworkSocketManager::CloseSocket(SOCKET sock)
+{
+	return socketclose(sock);
+}
+
+int NetworkSocketManager::getSocketError(SOCKET socket)
+{
+	return socket;
+}
+
+bool NetworkSocketManager::IsSocketValid(SOCKET sock)
+{
+	return sock >= 0;
+}
+
+bool NetworkSocketManager::IsSentValid(int sent)
+{
+	return sent >= 0;
+}
+
+bool NetworkSocketManager::InitNetwork()
+{
+	int result = sys_net_initialize_network();
+    if (result != 0) {
+        app.DebugPrintf("sys_net_initialize_network failed: %d\n", result);
+        return false;
+    }
+
+    result = cellNetCtlInit();
+    if (result < 0) {
+        app.DebugPrintf("cellNetCtlInit failed: %d\n", result);
+        sys_net_finalize_network();
+        return false;
+    }
+}
+
+SOCKET NetworkSocketManager::MakeHostSocket(int port)
+{
+	SOCKET s_listenSocket;
+
+	struct sockaddr_in addr = {};
+
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	addr.sin_port = htons((uint16_t)port);
+
+	s_listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (s_listenSocket < 0)
+	{
+		app.DebugPrintf("socket() failed: %d\n", s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	// PIEBOT: time for part 2, binding and listening.
+	int opt = 1;
+	setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
+
+	int iResult = ::bind(s_listenSocket, (struct sockaddr*)&addr, sizeof(addr));
+
+	if (iResult < 0)
+	{
+		app.DebugPrintf("bind() failed: %d\n", iResult);
+		CloseSocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	iResult = listen(s_listenSocket, 5);
+	if (iResult < 0)
+	{
+		app.DebugPrintf("listen() failed: %d\n", iResult);
+		CloseSocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	return s_listenSocket;
+}

Minecraft.Client/Common/Network/SocketManagers/CPlatformSocketManagerPS4.cpp

@@ -0,0 +1,86 @@
+#include "stdafx.h"
+
+#include "NetworkSocketManager.h"
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <sys/select.h>
+
+// PIEBOT: Adding this because Sony systems uses BSD apis
+//		   which uses socketclose instead of closesocket.
+int NetworkSocketManager::CloseSocket(SOCKET sock)
+{
+	return socketclose(sock);
+}
+
+int NetworkSocketManager::getSocketError(SOCKET socket)
+{
+	return socket;
+}
+
+bool NetworkSocketManager::IsSocketValid(SOCKET sock)
+{
+	return sock >= 0;
+}
+
+bool NetworkSocketManager::IsSentValid(int sent)
+{
+	return sent >= 0;
+}
+
+bool NetworkSocketManager::InitNetwork()
+{
+	WSADATA wsaData;
+	int result = WSAStartup(MAKEWORD(2, 2), &wsaData);
+	if (result != 0)
+	{
+		app.DebugPrintf("WSAStartup failed: %d\n", result);
+		return false;
+	}
+}
+
+SOCKET NetworkSocketManager::MakeHostSocket(int port)
+{
+	SOCKET s_listenSocket = NULL;
+
+	struct sockaddr_in addr = {};
+
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	addr.sin_port = htons((uint16_t)port);
+
+	s_listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (s_listenSocket < 0)
+	{
+		app.DebugPrintf("socket() failed: %d\n", s_listenSocket);
+		return NULL;
+	}
+
+	// PIEBOT: time for part 2, binding and listening.
+	int opt = 1;
+	setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
+
+	int iResult = ::bind(s_listenSocket, (struct sockaddr*)&addr, sizeof(addr));
+
+	if (iResult < 0)
+	{
+		app.DebugPrintf("bind() failed: %d\n", iResult);
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	iResult = listen(s_listenSocket, 5);
+	if (iResult < 0)
+	{
+		app.DebugPrintf("listen() failed: %d\n", iResult);
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	return s_listenSocket;
+}

Minecraft.Client/Common/Network/SocketManagers/CPlatformSocketManagerPSVita.cpp

@@ -0,0 +1,85 @@
+#include "stdafx.h"
+
+#include "NetworkSocketManager.h"
+
+#include <net.h>
+
+// PIEBOT: Adding this because Sony systems uses BSD apis
+//		   which uses socketclose instead of closesocket.
+int NetworkSocketManager::CloseSocket(SOCKET sock)
+{
+	return socketclose(sock);
+}
+
+int NetworkSocketManager::getSocketError(SOCKET socket)
+{
+	return socket;
+}
+
+bool NetworkSocketManager::IsSocketValid(SOCKET sock)
+{
+	return sock >= 0;
+}
+
+bool NetworkSocketManager::IsSentValid(int sent)
+{
+	return sent >= 0;
+}
+
+bool NetworkSocketManager::InitNetwork()
+{
+	SceNetInitParam param;
+	static char memory[16 * 1024];
+
+	param.memory = memory;
+	param.size = sizeof(memory);
+	param.flags = 0;
+
+	int result = sceNetInit(&param);
+	// libnet is brought up before us by the platform layer, which reports EBUSY here.
+	if (result < 0 && result != SCE_NET_ERROR_EBUSY) {
+		app.DebugPrintf("sceNetInit failed: 0x%08x\n", result);
+		return false;
+	}
+}
+
+SOCKET NetworkSocketManager::MakeHostSocket(int port)
+{
+	SOCKET s_listenSocket = NULL;
+
+	SceNetSockaddrIn addr = {};
+	addr.sin_len = sizeof(addr);
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	addr.sin_port = htons((uint16_t)port);
+
+	s_listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (s_listenSocket < 0)
+	{
+		app.DebugPrintf("socket() failed: %d\n", s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	// PIEBOT: time for part 2, binding and listening.
+	int opt = 1;
+	setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
+
+	int iResult = ::bind(s_listenSocket, (const sockaddr*)&addr, sizeof(addr));
+
+	if (iResult < 0)
+	{
+		app.DebugPrintf("bind() failed: %d\n", iResult);
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	iResult = listen(s_listenSocket, 5);
+	if (iResult < 0)
+	{
+		app.DebugPrintf("listen() failed: %d\n", iResult);
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	return s_listenSocket;
+}

Minecraft.Client/Common/Network/SocketManagers/CPlatformSocketManagerWindows64.cpp

@@ -0,0 +1,92 @@
+#include "stdafx.h"
+
+#include "NetworkSocketManager.h"
+
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+
+// PIEBOT: Adding this because Sony systems uses BSD apis
+//		   which uses socketclose instead of closesocket.
+int NetworkSocketManager::CloseSocket(SOCKET sock)
+{
+	return closesocket(sock);
+}
+
+int NetworkSocketManager::getSocketError(SOCKET socket)
+{
+	return WSAGetLastError();
+}
+
+bool NetworkSocketManager::IsSocketValid(SOCKET sock)
+{
+	return sock != INVALID_SOCKET;
+}
+
+bool NetworkSocketManager::IsSentValid(int sent)
+{
+	return sent != SOCKET_ERROR;
+}
+
+bool NetworkSocketManager::InitNetwork()
+{
+	WSADATA wsaData;
+	int result = WSAStartup(MAKEWORD(2, 2), &wsaData);
+	if (result != 0)
+	{
+		app.DebugPrintf("WSAStartup failed: %d\n", result);
+		return false;
+	}
+}
+
+SOCKET NetworkSocketManager::MakeHostSocket(int port)
+{
+	SOCKET s_listenSocket = NULL;
+	struct addrinfo hints = {};
+	struct addrinfo *result = NULL;
+
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	hints.ai_flags = AI_PASSIVE;
+
+	char portStr[16];
+	sprintf_s(portStr, "%d", port);
+
+	int iResult = getaddrinfo(NULL, portStr, &hints, &result);
+	if (iResult != 0)
+	{
+		app.DebugPrintf("getaddrinfo failed: %d\n", iResult);
+		return INVALID_SOCKET;
+	}
+
+	s_listenSocket = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+	if (s_listenSocket == INVALID_SOCKET)
+	{
+		app.DebugPrintf("socket() failed: %d\n", WSAGetLastError());
+		freeaddrinfo(result);
+		return INVALID_SOCKET;
+	}
+
+	// PIEBOT: time for part 2, binding and listening.
+	int opt = 1;
+	setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
+
+	iResult = ::bind(s_listenSocket, result->ai_addr, (int)result->ai_addrlen);
+	freeaddrinfo(result);
+	if (iResult == SOCKET_ERROR)
+	{
+		app.DebugPrintf("bind() failed: %d\n", WSAGetLastError());
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	iResult = listen(s_listenSocket, SOMAXCONN);
+	if (iResult == SOCKET_ERROR)
+	{
+		app.DebugPrintf("listen() failed: %d\n", WSAGetLastError());
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	return s_listenSocket;
+}

Minecraft.Client/Common/Network/SocketManagers/CPlatformSocketManagerXbox.cpp

@@ -0,0 +1,78 @@
+#include "stdafx.h"
+
+#include "NetworkSocketManager.h"
+
+#include <stdint.h>
+#include <winsockx.h>
+#include <xtl.h>
+
+// PIEBOT: Adding this because Sony systems uses BSD apis
+//		   which uses socketclose instead of closesocket.
+int NetworkSocketManager::CloseSocket(SOCKET sock)
+{
+	return closesocket(sock);
+}
+
+int NetworkSocketManager::getSocketError(SOCKET socket)
+{
+	return WSAGetLastError();
+}
+
+bool NetworkSocketManager::IsSocketValid(SOCKET sock)
+{
+	return sock != INVALID_SOCKET;
+}
+
+bool NetworkSocketManager::IsSentValid(int sent)
+{
+	return sent != SOCKET_ERROR;
+}
+
+bool NetworkSocketManager::InitNetwork()
+{
+	WSADATA wsaData;
+	int result = WSAStartup(MAKEWORD(2, 2), &wsaData);
+	if (result != 0)
+	{
+		app.DebugPrintf("WSAStartup failed: %d\n", result);
+		return false;
+	}
+}
+
+SOCKET NetworkSocketManager::MakeListenSocket(int port)
+{
+	SOCKET s_listenSocket = NULL;
+	struct sockaddr_in addr = {};
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	addr.sin_port = htons((WORD)port);
+
+	s_listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (s_listenSocket == INVALID_SOCKET)
+	{
+		app.DebugPrintf("socket() failed: %d\n", WSAGetLastError());
+		return INVALID_SOCKET;
+	}
+
+	// PIEBOT: time for part 2, binding and listening.
+	int opt = 1;
+	setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof(opt));
+
+	iResult = ::bind(s_listenSocket, (struct sockaddr*)&addr, sizeof(addr));
+	if (iResult == SOCKET_ERROR)
+	{
+		app.DebugPrintf("bind() failed: %d\n", WSAGetLastError());
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	iResult = listen(s_listenSocket, SOMAXCONN);
+	if (iResult == SOCKET_ERROR)
+	{
+		app.DebugPrintf("listen() failed: %d\n", WSAGetLastError());
+		closesocket(s_listenSocket);
+		return INVALID_SOCKET;
+	}
+
+	return s_listenSocket;
+}

Minecraft.Client/Common/Network/SocketManagers/NetworkSocketManager.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "stdafx.h"
+
+#ifdef _WINDOWS64
+#include <WinSock2.h>
+#elif defined _XBOX
+#include <winsockx.h>
+#else
+typedef int SOCKET;
+#define INVALID_SOCKET -1
+#endif
+
+class NetworkSocketManager {
+public:
+	bool IsSocketValid(SOCKET sock);
+	bool IsSentValid(int sent);
+	int getSocketError(SOCKET sock);
+	int CloseSocket(SOCKET sock);
+	int TCPaddrinfo(PCSTR ip, int port);
+	bool InitNetwork();
+	SOCKET MakeHostSocket(int port);
+};