From 46a0607b551b9eeaccb44f56e1797e494f651323 Mon Sep 17 00:00:00 2001
From: Kilian Hofmann <llego03@yahoo.com>
Date: Sun, 11 Sep 2022 21:45:09 +0200
Subject: [PATCH] Fix Linux

---
 file/include/simdata/simDatabase.h | 10 ++++++----
 file/include/simdata/simdataXP.h   | 10 +++++-----
 file/simDatabase.cpp               |  6 +++---
 file/simdataXP.cpp                 | 24 +++++++++++-------------
 xplugin/main.cpp                   | 15 +++++----------
 5 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/file/include/simdata/simDatabase.h b/file/include/simdata/simDatabase.h
index 78e2e3d..09a52e7 100644
--- a/file/include/simdata/simDatabase.h
+++ b/file/include/simdata/simDatabase.h
@@ -44,8 +44,8 @@ namespace file
       private:
         std::map<
             std::string,
-            std::pair<std::vector<const germanairlinesva::file::simdata::Gate>,
-                      std::vector<const germanairlinesva::file::simdata::Runway>>>
+            std::pair<std::vector<germanairlinesva::file::simdata::Gate>,
+                      std::vector<germanairlinesva::file::simdata::Runway>>>
             airports;
 
         void fromFile();
@@ -60,13 +60,15 @@ namespace file
         void toFile() const;
 
         inline std::size_t getCount() const { return this->airports.size(); }
-        inline const std::pair<const std::vector<const Gate>, const std::vector<const Runway>>
+        inline const std::pair<const std::vector<Gate>,
+                               const std::vector<Runway>>
             operator[](std::string key)
         {
           try {
             return this->airports.at(key);
           } catch (std::out_of_range &ex) {
-            return std::pair<const std::vector<const Gate>, const std::vector<const Runway>>();
+            return std::pair<const std::vector<Gate>,
+                             const std::vector<Runway>>();
           }
         }
     };
diff --git a/file/include/simdata/simdataXP.h b/file/include/simdata/simdataXP.h
index 9df3bf8..4690f24 100644
--- a/file/include/simdata/simdataXP.h
+++ b/file/include/simdata/simdataXP.h
@@ -21,21 +21,21 @@ namespace file
         const std::string sceneryPack,
         const std::string logFile,
         std::map<std::string,
-                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+                 std::pair<std::vector<Gate>, std::vector<Runway>>>
             &airports);
 
     void makeAirport(
         const std::string &kind,
         std::ifstream &infile,
         std::map<std::string,
-                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+                 std::pair<std::vector<Gate>, std::vector<Runway>>>
             &airports,
         std::ofstream &logfile);
-    void makeGate15(std::vector<const Gate> &gates,
+    void makeGate15(std::vector<Gate> &gates,
                     const std::vector<std::string> &fields);
-    void makeRunway(std::vector<const Runway> &runways,
+    void makeRunway(std::vector<Runway> &runways,
                     const std::vector<std::string> &fields);
-    void makeGate1300(std::vector<const Gate> &gates,
+    void makeGate1300(std::vector<Gate> &gates,
                       const std::vector<std::string> &fields);
   } // namespace simdata
 } // namespace file
diff --git a/file/simDatabase.cpp b/file/simDatabase.cpp
index a3bf95a..e87b781 100644
--- a/file/simDatabase.cpp
+++ b/file/simDatabase.cpp
@@ -96,11 +96,11 @@ namespace file
       write<std::uint16_t>(out, airports.size());
       // Airport
       for (const std::pair<const std::string,
-                           std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+                           std::pair<std::vector<Gate>, std::vector<Runway>>>
                &airport : airports) {
         std::string icao = airport.first;
-        const std::vector<const Gate> gates = airport.second.first;
-        const std::vector<const Runway> runways = airport.second.second;
+        const std::vector<Gate> gates = airport.second.first;
+        const std::vector<Runway> runways = airport.second.second;
         // ICAO
         writeString(out, icao);
         // Gates
diff --git a/file/simdataXP.cpp b/file/simdataXP.cpp
index 561eb7c..dfdd8d4 100644
--- a/file/simdataXP.cpp
+++ b/file/simdataXP.cpp
@@ -10,8 +10,7 @@ namespace file
         const std::string defaultFile,
         const std::string sceneryPack,
         const std::string logFile,
-        std::map<std::string,
-                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+        std::map<std::string, std::pair<std::vector<Gate>, std::vector<Runway>>>
             &airports)
     {
       std::ifstream base(defaultFile);
@@ -72,15 +71,14 @@ namespace file
     void makeAirport(
         const std::string &kind,
         std::ifstream &infile,
-        std::map<std::string,
-                 std::pair<std::vector<const Gate>, std::vector<const Runway>>>
+        std::map<std::string, std::pair<std::vector<Gate>, std::vector<Runway>>>
             &airports,
         std::ofstream &logfile)
     {
       std::string line;
       std::string *currentIcao = nullptr;
-      std::vector<const Gate> tmpGates;
-      std::vector<const Runway> tmpRunways;
+      std::vector<Gate> tmpGates;
+      std::vector<Runway> tmpRunways;
 
       int apCount = 0;
       int validCount = 0;
@@ -106,8 +104,8 @@ namespace file
             logfile << "\t<STATUS> " << *currentIcao
                     << " had no gates or runways" << std::endl;
           }
-          tmpGates = std::vector<const Gate>();
-          tmpRunways = std::vector<const Runway>();
+          tmpGates = std::vector<Gate>();
+          tmpRunways = std::vector<Runway>();
           currentIcao = new std::string(fields[4]);
           apCount += 1;
           logfile << "\t<" << kind << "> " << line << std::endl;
@@ -126,8 +124,8 @@ namespace file
             logfile << "\t<STATUS> " << *currentIcao
                     << " had no gates or runways" << std::endl;
           }
-          tmpGates = std::vector<const Gate>();
-          tmpRunways = std::vector<const Runway>();
+          tmpGates = std::vector<Gate>();
+          tmpRunways = std::vector<Runway>();
           currentIcao = nullptr;
           logfile << "\t<" << kind << " SKIPPED> " << line << std::endl;
         } else if (currentIcao != nullptr && fields[0] == "100") {
@@ -148,7 +146,7 @@ namespace file
               << validCount << " are valid" << std::endl;
     }
 
-    void makeGate15(std::vector<const Gate> &gates,
+    void makeGate15(std::vector<Gate> &gates,
                     const std::vector<std::string> &fields)
     {
       std::string gateName;
@@ -163,7 +161,7 @@ namespace file
       gates.emplace_back(gateName, pt, 40);
     }
 
-    void makeRunway(std::vector<const Runway> &runways,
+    void makeRunway(std::vector<Runway> &runways,
                     const std::vector<std::string> &fields)
     {
       runways.emplace_back(fields[8],
@@ -180,7 +178,7 @@ namespace file
                            std::stod(fields[1]));
     }
 
-    void makeGate1300(std::vector<const Gate> &gates,
+    void makeGate1300(std::vector<Gate> &gates,
                       const std::vector<std::string> &fields)
     {
       std::string gateName;
diff --git a/xplugin/main.cpp b/xplugin/main.cpp
index d3b8398..0a4e58c 100644
--- a/xplugin/main.cpp
+++ b/xplugin/main.cpp
@@ -114,17 +114,12 @@ PLUGIN_API int XPluginStart(char *outName, char *outSig, char *outDesc)
   configuration = std::make_unique<germanairlinesva::file::config::Config>();
   toLog("Config loaded");
 
-  try {
-    connector = std::make_unique<germanairlinesva_websocket::Websocket>(
-        "ss://ws.hofmannnet.myhome-server.de:8000",
-        configuration->getUser(),
-        toLog);
-  } catch (const std::invalid_argument &e) {
-    toLog("SOCK");
-    toLog(e.what());
-    return 0;
-  }
+  connector = std::make_unique<germanairlinesva_websocket::Websocket>(
+      "wss://ws.hofmannnet.myhome-server.de:8000",
+      configuration->getUser(),
+      toLog);
   toLog("WebSocket started");
+
   char hash[2 * MD5LEN + 1] = "";
   if (germanairlinesva::util::generateMD5(XPLANE_CUSTOM_SCENERY, hash, toLog) ==
       0) {