backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add IPv6/Dual Stack

Browse source 
Also Fix SetupHeadlessServerConsole() to use an existing console if possible.
This commit is contained in:
Brendon 2026-03-07 01:56:11 -08:00
parent e754bad17e
commit 3dc133a74a
3 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
View file

@ -153,6 +153,20 @@ void WinsockNetLayer::Shutdown()
} }
} }
bool WinsockNetLayer::IsNumericAddress(const char* addr)
{
if (addr == NULL)
return false;
if (strchr(addr, ':') != NULL)
return true;// IPv6
if (inet_addr(addr) != INADDR_NONE)
return true;// IPv4
return false;// hostname
}
bool WinsockNetLayer::HostGame(int port, const char* bindIp) bool WinsockNetLayer::HostGame(int port, const char* bindIp)
{ {
if (!s_initialized && !Initialize()) return false; if (!s_initialized && !Initialize()) return false;
@ -171,18 +185,23 @@ bool WinsockNetLayer::HostGame(int port, const char* bindIp)
s_smallIdToSocket[i] = INVALID_SOCKET; s_smallIdToSocket[i] = INVALID_SOCKET;
LeaveCriticalSection(&s_smallIdToSocketLock); LeaveCriticalSection(&s_smallIdToSocketLock);
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 = (bindIp == NULL || bindIp[0] == 0) ? AI_PASSIVE : 0;
char portStr[16]; char portStr[16];
sprintf_s(portStr, "%d", port); sprintf_s(portStr, "%d", port);
const char* resolvedBindIp = (bindIp != NULL && bindIp[0] != 0) ? bindIp : NULL; const char* resolvedBindIp = (bindIp != NULL && bindIp[0] != 0) ? bindIp : NULL;
struct addrinfo hints = {};
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
if (resolvedBindIp == NULL)
hints.ai_flags = AI_PASSIVE;
else if (IsNumericAddress(resolvedBindIp))
hints.ai_flags = AI_NUMERICHOST;
else
hints.ai_flags = 0;
struct addrinfo* result = NULL;
int iResult = getaddrinfo(resolvedBindIp, portStr, &hints, &result); int iResult = getaddrinfo(resolvedBindIp, portStr, &hints, &result);
if (iResult != 0) if (iResult != 0)
{ {
@ -201,8 +220,8 @@ bool WinsockNetLayer::HostGame(int port, const char* bindIp)
return false; return false;
} }
int opt = 1; DWORD ipv6only = 0;
setsockopt(s_listenSocket, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt)); setsockopt(s_listenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&ipv6only, sizeof(ipv6only));
iResult = ::bind(s_listenSocket, result->ai_addr, (int)result->ai_addrlen); iResult = ::bind(s_listenSocket, result->ai_addr, (int)result->ai_addrlen);
freeaddrinfo(result); freeaddrinfo(result);
@ -226,7 +245,7 @@ bool WinsockNetLayer::HostGame(int port, const char* bindIp)
s_active = true; s_active = true;
s_connected = true; s_connected = true;
s_acceptThread = CreateThread(NULL, 0, AcceptThreadProc, NULL, 0, NULL); s_acceptThread = CreateThread(NULL, 0, AcceptThreadProc, (LPVOID)s_listenSocket, 0, NULL);
app.DebugPrintf("Win64 LAN: Hosting on %s:%d\n", app.DebugPrintf("Win64 LAN: Hosting on %s:%d\n",
resolvedBindIp != NULL ? resolvedBindIp : "*", resolvedBindIp != NULL ? resolvedBindIp : "*",
@ -252,7 +271,12 @@ bool WinsockNetLayer::JoinGame(const char* ip, int port)
struct addrinfo hints = {}; struct addrinfo hints = {};
struct addrinfo* result = NULL; struct addrinfo* result = NULL;
hints.ai_family = AF_INET; if (IsNumericAddress(ip))
hints.ai_flags = AI_NUMERICHOST;
else
hints.ai_flags = 0;
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP; hints.ai_protocol = IPPROTO_TCP;
@ -468,9 +492,11 @@ void WinsockNetLayer::HandleDataReceived(BYTE fromSmallId, BYTE toSmallId, unsig
DWORD WINAPI WinsockNetLayer::AcceptThreadProc(LPVOID param) DWORD WINAPI WinsockNetLayer::AcceptThreadProc(LPVOID param)
{ {
SOCKET listenSock = (SOCKET)(uintptr_t)param;
while (s_active) while (s_active)
{ {
SOCKET clientSocket = accept(s_listenSocket, NULL, NULL); SOCKET clientSocket = accept(listenSock, NULL, NULL);
if (clientSocket == INVALID_SOCKET) if (clientSocket == INVALID_SOCKET)
{ {
if (s_active) if (s_active)

1
Minecraft.Client/Windows64/Network/WinsockNetLayer.h
View file

@ -66,6 +66,7 @@ public:
static bool Initialize(); static bool Initialize();
static void Shutdown(); static void Shutdown();
static bool IsNumericAddress(const char* addr);
static bool HostGame(int port, const char* bindIp = NULL); static bool HostGame(int port, const char* bindIp = NULL);
static bool JoinGame(const char* ip, int port); static bool JoinGame(const char* ip, int port);

16
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -288,15 +288,19 @@ static BOOL WINAPI HeadlessServerCtrlHandler(DWORD ctrlType)
static void SetupHeadlessServerConsole() static void SetupHeadlessServerConsole()
{ {
if (AllocConsole()) //use existing console if possible
if (!AttachConsole(ATTACH_PARENT_PROCESS))
{ {
FILE* stream = NULL; //https://giphy.com/gifs/17tvv5lv6KqX51mbfA
freopen_s(&stream, "CONIN$", "r", stdin); AllocConsole();
freopen_s(&stream, "CONOUT$", "w", stdout);
freopen_s(&stream, "CONOUT$", "w", stderr);
SetConsoleTitleA("Minecraft Server");
} }
FILE* stream = NULL;
freopen_s(&stream, "CONIN$", "r", stdin);
freopen_s(&stream, "CONOUT$", "w", stdout);
freopen_s(&stream, "CONOUT$", "w", stderr);
SetConsoleTitleA("Minecraft Server");
SetConsoleCtrlHandler(HeadlessServerCtrlHandler, TRUE); SetConsoleCtrlHandler(HeadlessServerCtrlHandler, TRUE);
} }