Safety improvements

src/Network/Auth.cpp

@@ -10,6 +10,7 @@
 #include <thread>
 #include <cstring>
 #include <algorithm>
+#include <string>
 #include "UnixCompat.h"
 
 
@@ -117,6 +118,7 @@ std::string GenerateM(RSA*key){
 }
 
 void Identification(SOCKET TCPSock,Hold*S,RSA*Skey){
+    DebugPrintTID();
     Assert(S);
     Assert(Skey);
     S->TCPSock = TCPSock;
@@ -171,6 +173,7 @@ void Identification(SOCKET TCPSock,Hold*S,RSA*Skey){
         closesocket(TCPSock);
         return;
     }
+    DebugPrintTIDInternal(std::string("Client(") + Name + ")");
     debug(Sec("Name -> ") + Name + Sec(", Role -> ") + Role +  Sec(", ID -> ") + DID);
     for(Client*c: CI->Clients){
         if(c != nullptr){
@@ -242,6 +245,7 @@ void TCPServerMain(){
     }
     info(Sec("Vehicle event network online"));
     do{
+        try {
         client = accept(Listener, nullptr, nullptr);
         if(client == -1){
             warn(Sec("Got an invalid client socket on connect! Skipping..."));
@@ -249,6 +253,9 @@ void TCPServerMain(){
         }
         std::thread ID(Identify,client);
         ID.detach();
+        } catch (const std::exception& e) {
+            error(Sec("fatal: ") + std::string(e));
+        }
     }while(client);
 
     closesocket(client);
@@ -276,6 +283,7 @@ void TCPServerMain(){
     }
     info(Sec("Vehicle event network online"));
     do{
+        try {
             client = accept(Listener, nullptr, nullptr);
             if(client == -1){
                 warn(Sec("Got an invalid client socket on connect! Skipping..."));
@@ -283,6 +291,9 @@ void TCPServerMain(){
             }
             std::thread ID(Identify,client);
             ID.detach();
+        } catch (const std::exception& e) {
+            error(Sec("fatal: ") + std::string(e.what()));
+        }
     }while(client);
 
     debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));

src/Network/VehicleData.cpp

@@ -301,6 +301,7 @@ void LOOP() {
 
     info(Sec("Vehicle data network online on port ") + std::to_string(Port) + Sec(" with a Max of ") + std::to_string(MaxPlayers) + Sec(" Clients"));
     while (true) {
+        try {
             sockaddr_in client {};
             std::string Data = UDPRcvFromClient(client); //Receives any data from Socket
             auto Pos = Data.find(':');
@@ -317,6 +318,9 @@ void LOOP() {
                     UDPParser(c, Data.substr(2));
                 }
             }
+        } catch (const std::exception& e) {
+            error(Sec("fatal: ") + std::string(e.what()));
+        }
     }
     /*closesocket(UDPSock);
     WSACleanup();
@@ -343,6 +347,7 @@ void LOOP() {
 
     info(Sec("Vehicle data network online on port ") + std::to_string(Port) + Sec(" with a Max of ") + std::to_string(MaxPlayers) + Sec(" Clients"));
     while (true) {
+        try {
             sockaddr_in client {};
             std::string Data = UDPRcvFromClient(client); //Receives any data from Socket
             size_t Pos = Data.find(':');
@@ -359,6 +364,9 @@ void LOOP() {
                     UDPParser(c, Data.substr(2));
                 }
             }
+        } catch (const std::exception& e) {
+            error(Sec("fatal: ") + std::string(e.what()));
+        }
     }
     /*closesocket(UDPSock); // TODO: Why not this? We did this in TCPServerMain?
     return;

src/main.cpp

@@ -14,6 +14,7 @@
 }
 
 int main(int argc, char* argv[]) {
+    try {
     DebugPrintTID();
     // curl needs to be initialized to properly deallocate its resources later
     Assert(curl_global_init(CURL_GLOBAL_DEFAULT) == CURLE_OK);
@@ -31,5 +32,9 @@ int main(int argc, char* argv[]) {
     NetMain();
     // clean up curl at the end to be sure
     curl_global_cleanup();
+    } catch (const std::exception& e) {
+        error(std::string(e.what()));
+        throw;
+    }
     return 0;
 }