set terminate = false

This reverts commit 3be1262b07.

include/Network/network.h

@@ -13,6 +13,8 @@ void NetReset();
 extern bool Dev;
 extern int ping;
 
+extern bool ModWarningConfirmed;
+
 [[noreturn]] void CoreNetwork();
 extern int ProxyPort;
 extern int ClientID;
@@ -46,3 +48,4 @@ void TCPClientMain(const std::string& IP,int Port);
 void UDPClientMain(const std::string& IP,int Port);
 void TCPGameServer(const std::string& IP, int Port);
 
+

src/Network/Core.cpp

@@ -58,6 +58,8 @@ bool IsAllowedLink(const std::string& Link) {
     return std::regex_search(Link,link_match, link_pattern) && link_match.position() == 0;
 }
 
+bool ModWarningConfirmed = false;
+
 void Parse(std::string Data,SOCKET CSocket){
     char Code = Data.at(0), SubCode = 0;
     if(Data.length() > 1)SubCode = Data.at(1);
@@ -87,6 +89,17 @@ void Parse(std::string Data,SOCKET CSocket){
             }
             Data.clear();
             break;
+        // response to "WMODS_FOUND" message, either Y (yes ok) or N (no)
+        case 'W': {
+            if (SubCode == 'Y') {
+                ModWarningConfirmed = true;
+            } else if (SubCode == 'N') {
+                ModWarningConfirmed = false;
+                NetReset();
+                Terminate = true;
+                TCPTerminate = true;
+            }
+        }
         case 'P':
             Data = Code + std::to_string(ProxyPort);
             break;
@@ -138,7 +151,7 @@ void Parse(std::string Data,SOCKET CSocket){
                 if (!UserRole.empty()) {
                     Auth["role"] = UserRole;
                 }
-                Data = Auth.dump();
+                Data = "N" + Auth.dump();
             }else{
                 Data = "N" + Login(Data.substr(Data.find(':') + 1));
             }
@@ -205,6 +218,10 @@ void localRes(){
     }
     ConfList = new std::set<std::string>;
 }
+
+
+uint64_t TheClientSocket;
+
 void CoreMain() {
     debug("Core Network on start!");
     WSADATA wsaData;
@@ -253,6 +270,7 @@ void CoreMain() {
             error("(Core) accept failed with error: " + std::to_string(WSAGetLastError()));
             continue;
         }
+        TheClientSocket = CSocket;
         localRes();
         info("Game Connected!");
         GameHandler(CSocket);

src/Network/Resources.cpp

@@ -21,6 +21,8 @@
 #include <future>
 #include <cmath>
 
+extern SOCKET TheClientSocket;
+
 namespace fs = std::filesystem;
 std::string ListOfMods;
 std::vector<std::string> Split(const std::string& String,const std::string& delimiter){
@@ -221,6 +223,23 @@ void SyncResources(SOCKET Sock){
     std::string Ret = Auth(Sock);
     if(Ret.empty())return;
 
+    ModWarningConfirmed = false;
+    Terminate = false;
+
+    std::string Data = "WMODS_FOUND";
+    send(TheClientSocket, (Data + "\n").c_str(), int(Data.size())+1, 0);
+    
+    while (!Terminate && !ModWarningConfirmed) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+
+    if (!ModWarningConfirmed) {
+        UlStatus = "UlMods rejected!";
+        info("Mods rejected by user!");
+        // game has already cancelled by now
+        return;
+    }
+
     info("Checking Resources...");
     CheckForDir();
 
@@ -322,4 +341,4 @@ void SyncResources(SOCKET Sock){
         UlStatus = "Ulstart";
         info("Connection Terminated!");
     }
-}
+}