From cfcabf31a4c838b2fdc24ba214ff441d961acfe7 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 4 Jun 2024 18:42:38 +0200 Subject: [PATCH] fix stupid socket --- include/Network/network.h | 1 - src/Network/Core.cpp | 5 ++++- src/Network/Resources.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/Network/network.h b/include/Network/network.h index 1d53679..6c3aa7f 100755 --- a/include/Network/network.h +++ b/include/Network/network.h @@ -15,7 +15,6 @@ extern int ping; extern bool ModWarningConfirmed; - [[noreturn]] void CoreNetwork(); extern int ProxyPort; extern int ClientID; diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp index 850756d..bacc00e 100755 --- a/src/Network/Core.cpp +++ b/src/Network/Core.cpp @@ -219,11 +219,13 @@ void localRes(){ ConfList = new std::set; } -SOCKET LSocket,CSocket; + +uint64_t TheClientSocket; void CoreMain() { debug("Core Network on start!"); WSADATA wsaData; + SOCKET LSocket,CSocket; struct addrinfo *res = nullptr; struct addrinfo hints{}; int iRes = WSAStartup(514, &wsaData); //2.2 @@ -268,6 +270,7 @@ void CoreMain() { error("(Core) accept failed with error: " + std::to_string(WSAGetLastError())); continue; } + TheClientSocket = CSocket; localRes(); info("Game Connected!"); GameHandler(CSocket); diff --git a/src/Network/Resources.cpp b/src/Network/Resources.cpp index 5e7e43b..49921d1 100755 --- a/src/Network/Resources.cpp +++ b/src/Network/Resources.cpp @@ -21,7 +21,7 @@ #include #include -extern SOCKET LSocket,CSocket; +extern SOCKET TheClientSocket; namespace fs = std::filesystem; std::string ListOfMods; @@ -226,7 +226,7 @@ void SyncResources(SOCKET Sock){ ModWarningConfirmed = false; std::string Data = "WMODS_FOUND"; - send(CSocket, (Data + "\n").c_str(), int(Data.size())+1, 0); + send(TheClientSocket, (Data + "\n").c_str(), int(Data.size())+1, 0); while (!Terminate && !ModWarningConfirmed) { std::this_thread::sleep_for(std::chrono::milliseconds(10));