From fc4bc14ce56729956f95deb7bb19c0f57099f4bb Mon Sep 17 00:00:00 2001
From: Anonymous275 <theanonymous275@gmail.com>
Date: Thu, 7 Jan 2021 15:29:06 +0200
Subject: [PATCH] Potential auth fix

---
 src/Init/Heartbeat.cpp      |  9 ++++-----
 src/Network/Http.cpp        | 31 +++++++++++++++++++++++--------
 src/Network/VehicleData.cpp |  3 ++-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/Init/Heartbeat.cpp b/src/Init/Heartbeat.cpp
index 0786c31..7fba6d8 100644
--- a/src/Init/Heartbeat.cpp
+++ b/src/Init/Heartbeat.cpp
@@ -69,15 +69,14 @@ std::string RunPromise(const std::string& IP, const std::string& R) {
             }
         }
         //Server Authenticated
-        if (T.length() == 4)
-            info(("Server authenticated"));
-        R.clear();
-        T.clear();
+        info(T);
         if (!isAuth) {
             WebsocketInit();
+            if (T.length() == 4)info(("Authenticated!"));
+            else info(("Resumed authenticated session!"));
             isAuth = true;
         }
-        std::this_thread::sleep_for(std::chrono::seconds(5));
+        //std::this_thread::sleep_for(std::chrono::seconds(5));
     }
 }
 void HBInit() {
diff --git a/src/Network/Http.cpp b/src/Network/Http.cpp
index 3733d07..7a605f9 100644
--- a/src/Network/Http.cpp
+++ b/src/Network/Http.cpp
@@ -9,15 +9,31 @@
 #include "CustomAssert.h"
 #include <curl/curl.h>
 #include <iostream>
+
+class CurlManager{
+public:
+    CurlManager(){
+        curl = curl_easy_init();
+    }
+    ~CurlManager(){
+        curl_easy_cleanup(curl);
+    }
+    inline CURL* Get(){
+        return curl;
+    }
+private:
+    CURL *curl;
+};
+
 static size_t WriteCallback(void* contents, size_t size, size_t nmemb, void* userp) {
     ((std::string*)userp)->append((char*)contents, size * nmemb);
     return size * nmemb;
 }
 std::string HttpRequest(const std::string& IP, int port) {
-    CURL* curl;
-    CURLcode res;
+    static thread_local CurlManager M;
     std::string readBuffer;
-    curl = curl_easy_init();
+    CURL* curl = M.Get();
+    CURLcode res;
     Assert(curl);
     if (curl) {
         curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
@@ -25,7 +41,6 @@ std::string HttpRequest(const std::string& IP, int port) {
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
         res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
         if (res != CURLE_OK)
             return "-1";
     }
@@ -33,13 +48,14 @@ std::string HttpRequest(const std::string& IP, int port) {
 }
 
 std::string PostHTTP(const std::string& IP, const std::string& Fields, bool json) {
-    static auto* header = new curl_slist { (char*)"Content-Type: application/json" };
+    auto header = curl_slist { (char*)"Content-Type: application/json" };
+    static thread_local CurlManager M;
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
-    CURL* curl;
+    CURL* curl = M.Get();
     CURLcode res;
     std::string readBuffer;
-    curl = curl_easy_init();
+
     Assert(curl);
     if (curl) {
         curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
@@ -52,7 +68,6 @@ std::string PostHTTP(const std::string& IP, const std::string& Fields, bool json
         curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
         curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5);
         res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
         if (res != CURLE_OK)
             return "-1";
     }
diff --git a/src/Network/VehicleData.cpp b/src/Network/VehicleData.cpp
index 3fb30ac..1834d9b 100644
--- a/src/Network/VehicleData.cpp
+++ b/src/Network/VehicleData.cpp
@@ -18,6 +18,7 @@
 #include <sstream>
 #include <thread>
 #include <vector>
+#include <array>
 
 SOCKET UDPSock;
 void UDPSend(Client* c, std::string Data) {
@@ -73,7 +74,7 @@ void SendLarge(Client* c, std::string Data) {
 
 std::string UDPRcvFromClient(sockaddr_in& client) {
     size_t clientLength = sizeof(client);
-    std::array<char, 1024> Ret;
+    std::array<char, 1024> Ret{};
     int64_t Rcv = recvfrom(UDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (socklen_t*)&clientLength);
     if (Rcv == -1) {
 #ifdef WIN32