Merge branch 'linux'

src/Network/Core.cpp

@@ -5,13 +5,22 @@
 ///
 /// Created by Anonymous275 on 7/20/2020
 ///
-
-#include "Network/network.h"
+#include "Network/network.hpp"
 #include "Security/Init.h"
 #include <regex>
 #include "Http.h"
+#if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
+
+#elif defined(__linux__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <cstring>
+#include <errno.h>
+#endif
+
 #include "Startup.h"
 #include "Logger.h"
 #include <nlohmann/json.hpp>
@@ -207,13 +216,18 @@ void localRes(){
 }
 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
+    int iRes;
+    #ifdef _WIN32
+    WSADATA wsaData;
+    iRes = WSAStartup(514, &wsaData); //2.2
     if (iRes)debug("WSAStartup failed with error: " + std::to_string(iRes));
+    #endif
+    
     ZeroMemory(&hints, sizeof(hints));
+
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
@@ -261,6 +275,8 @@ void CoreMain() {
     KillSocket(LSocket);
     WSACleanup();
 }
+
+#if defined(_WIN32)
 int Handle(EXCEPTION_POINTERS *ep){
     char* hex = new char[100];
     sprintf_s(hex,100, "%lX", ep->ExceptionRecord->ExceptionCode);
@@ -268,17 +284,24 @@ int Handle(EXCEPTION_POINTERS *ep){
     delete [] hex;
     return 1;
 }
-
+#endif
 
 [[noreturn]] void CoreNetwork(){
     while(true) {
-#ifndef __MINGW32__
-        __try{
-#endif
-                CoreMain();
-#ifndef __MINGW32__
-        }__except(Handle(GetExceptionInformation())){}
-#endif
+        #if not defined(__MINGW32__)
+            __try{
+        #endif
+        
+        CoreMain();
+
+        #if not defined(__MINGW32__) and not defined(__linux__)
+            }__except(Handle(GetExceptionInformation())){}
+        #elif not defined(__MINGW32__) and defined(__linux__)
+            } catch(...){
+                except("(Core) Code : " + std::string(strerror(errno)));
+            }
+        #endif
+
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }
 }

src/Network/DNS.cpp

@@ -7,18 +7,29 @@
 ///
 
 #include <string>
+
+#if defined(_WIN32)
 #include <winsock2.h>
+#elif defined(__linux__)
+#include "linuxfixes.h"
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
+
 #include "Logger.h"
 
 std::string GetAddr(const std::string&IP){
     if(IP.find_first_not_of("0123456789.") == -1)return IP;
-    WSADATA wsaData;
     hostent *host;
+    #ifdef _WIN32
+    WSADATA wsaData;
     if(WSAStartup(514, &wsaData) != 0){
         error("WSA Startup Failed!");
         WSACleanup();
         return "";
     }
+    #endif
+    
     host = gethostbyname(IP.c_str());
     if(!host){
         error("DNS lookup failed! on " + IP);

src/Network/GlobalHandler.cpp

@@ -5,9 +5,20 @@
 ///
 /// Created by Anonymous275 on 7/25/2020
 ///
-#include "Network/network.h"
+#include "Network/network.hpp"
+#if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include "linuxfixes.h"
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <cstring>
+#endif
+
 #include "Logger.h"
 #include <charconv>
 #include <string>
@@ -117,12 +128,16 @@ SOCKET SetupListener(){
     if(GSocket != -1)return GSocket;
     struct addrinfo *result = nullptr;
     struct addrinfo hints{};
+    int iRes;
+    #ifdef _WIN32
     WSADATA wsaData;
-    int iRes = WSAStartup(514, &wsaData); //2.2
+    iRes = WSAStartup(514, &wsaData); //2.2
     if (iRes != 0) {
         error("(Proxy) WSAStartup failed with error: " + std::to_string(iRes));
         return -1;
     }
+    #endif
+
     ZeroMemory(&hints, sizeof(hints));
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;

src/Network/Resources.cpp

@@ -6,8 +6,19 @@
 /// Created by Anonymous275 on 4/11/2020
 ///
 
-#include "Network/network.h"
+#include "Network/network.hpp"
+
+#if defined(_WIN32)
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
+
 #include <filesystem>
 #include "Startup.h"
 #include "Logger.h"
@@ -38,7 +49,12 @@ std::vector<std::string> Split(const std::string& String,const std::string& deli
 
 void CheckForDir(){
     if(!fs::exists("Resources")){
+        // Could we just use fs::create_directory instead?
+        #if defined(_WIN32)
         _wmkdir(L"Resources");
+        #elif defined(__linux__)
+        fs::create_directory(L"Resources");
+        #endif
     }
 }
 void WaitForConfirm(){
@@ -202,10 +218,10 @@ std::string MultiDownload(SOCKET MSock,SOCKET DSock, uint64_t Size, const std::s
 
     ///omg yes very ugly my god but i was in a rush will revisit
     std::string Ret(Size,0);
-    memcpy_s(&Ret[0],MSize,MData,MSize);
+    memcpy(&Ret[0],MData,MSize);
     delete[]MData;
 
-    memcpy_s(&Ret[MSize],DSize,DData,DSize);
+    memcpy(&Ret[MSize],DData,DSize);
     delete[]DData;
 
     return Ret;
@@ -268,9 +284,21 @@ void SyncResources(SOCKET Sock){
                         fs::create_directories(GetGamePath() + "mods/multiplayer");
                     }
                     auto name = GetGamePath() + "mods/multiplayer" + a.substr(a.find_last_of('/'));
+                    #if defined(__linux__)
+                    // Linux version of the game doesnt support uppercase letters in mod names
+                    for(char &c : name){
+                        c = ::tolower(c);
+                    }
+                    #endif
                     auto tmp_name = name + ".tmp";
                     fs::copy_file(a,tmp_name,fs::copy_options::overwrite_existing);
                     fs::rename(tmp_name, name);
+                    for(char &c : FName){
+                        c = ::tolower(c);
+                    }
+                    #endif
+
+                    fs::copy_file(a, GetGamePath() + "mods/multiplayer" + FName,
                 } catch (std::exception& e) {
                     error("Failed copy to the mods folder! " + std::string(e.what()));
                     Terminate = true;
@@ -310,6 +338,14 @@ void SyncResources(SOCKET Sock){
             if(!fs::exists(GetGamePath() + "mods/multiplayer")){
                 fs::create_directories(GetGamePath() + "mods/multiplayer");
             }
+
+            // Linux version of the game doesnt support uppercase letters in mod names
+            #if defined(__linux__)
+            for(char &c : FName){
+                c = ::tolower(c);
+            }
+            #endif
+
             fs::copy_file(a,GetGamePath() + "mods/multiplayer" + FName, fs::copy_options::overwrite_existing);
         }
         WaitForConfirm();

src/Network/VehicleData.cpp

@@ -6,9 +6,20 @@
 /// Created by Anonymous275 on 5/8/2020
 ///
 #include "Zlib/Compressor.h"
-#include "Network/network.h"
+#include "Network/network.hpp"
 
+#if defined(_WIN32)
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include "linuxfixes.h"
+#endif
+
 #include "Logger.h"
 #include <string>
 #include <set>
@@ -44,7 +55,11 @@ void UDPParser(std::string Packet){
 }
 void UDPRcv(){
     sockaddr_in FromServer{};
+    #if defined(_WIN32)
     int clientLength = sizeof(FromServer);
+    #elif defined(__linux__)
+    socklen_t clientLength = sizeof(FromServer);
+    #endif
     ZeroMemory(&FromServer, clientLength);
     std::string Ret(10240,0);
     if(UDPSock == -1)return;
@@ -53,11 +68,14 @@ void UDPRcv(){
     UDPParser(Ret.substr(0,Rcv));
 }
 void UDPClientMain(const std::string& IP,int Port){
+    #ifdef _WIN32
     WSADATA data;
     if (WSAStartup(514, &data)){
         error("Can't start Winsock!");
         return;
     }
+    #endif
+    
     delete ToServer;
     ToServer = new sockaddr_in;
     ToServer->sin_family = AF_INET;

src/Network/VehicleEvent.cpp

@@ -10,11 +10,20 @@
 #include <vector>
 #include "Logger.h"
 #include <iostream>
-#include <ws2tcpip.h>
 #include <Zlib/Compressor.h>
 
-#include "Network/network.h"
+#if defined(_WIN32)
+#include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
 
+#include "Network/network.hpp"
 
 int LastPort;
 std::string LastIP;
@@ -116,10 +125,12 @@ std::string TCPRcv(SOCKET Sock){
 void TCPClientMain(const std::string& IP,int Port){
     LastIP = IP;
     LastPort = Port;
-    WSADATA wsaData;
     SOCKADDR_IN ServerAddr;
     int RetCode;
+    #ifdef _WIN32
+    WSADATA wsaData;
     WSAStartup(514, &wsaData); //2.2
+    #endif
     TCPSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
     if(TCPSock == -1){
@@ -127,6 +138,7 @@ void TCPClientMain(const std::string& IP,int Port){
         WSACleanup();
         return;
     }
+
     ServerAddr.sin_family = AF_INET;
     ServerAddr.sin_port = htons(Port);
     inet_pton(AF_INET, IP.c_str(), &ServerAddr.sin_addr);
@@ -152,6 +164,9 @@ void TCPClientMain(const std::string& IP,int Port){
     if(KillSocket(TCPSock) != 0)
         debug("(TCP) Cannot close socket. Error code: " + std::to_string(WSAGetLastError()));
 
+    #ifdef _WIN32
     if(WSACleanup() != 0)
         debug("(TCP) Client: WSACleanup() failed!...");
+    #endif
+
 }