Format

websocket/include/types.h

@@ -3,8 +3,9 @@
 
 #include <cstdint>
 
-
-namespace germanairlinesva_websocket
+namespace germanairlinesva
+{
+namespace websocket
 {
 #pragma pack(push) /* push current alignment to stack */
 #pragma pack(1)    /* set alignment to 1 byte boundary */
@@ -44,6 +45,7 @@ namespace germanairlinesva_websocket
   };
 
 #pragma pack(pop) /* restore original alignment from stack */
-} // namespace germanairlinesva_websocket
+} // namespace websocket
+} // namespace germanairlinesva
 
 #endif

websocket/include/websocket.h

@@ -18,7 +18,9 @@
 #include <string>
 #include <utility>
 
-namespace germanairlinesva_websocket
+namespace germanairlinesva
+{
+namespace websocket
 {
   class Websocket
   {
@@ -38,6 +40,7 @@ namespace germanairlinesva_websocket
       void onClientMessageCallback(const ix::WebSocketMessagePtr &msg);
       void sendData(data &d);
   };
-} // namespace germanairlinesva_websocket
+} // namespace websocket
+} // namespace germanairlinesva
 
 #endif

websocket/websocket.cpp

@@ -1,113 +1,114 @@
 #include "include/websocket.h"
 
-namespace germanairlinesva_websocket
+namespace germanairlinesva
 {
-Websocket::Websocket(std::string host,
-                     std::string user,
-                     std::function<void(const std::string)> toLog)
-    : host(host), user(user), toLog(std::move(toLog))
+namespace websocket
 {
+  Websocket::Websocket(std::string host,
+                       std::string user,
+                       std::function<void(const std::string)> toLog)
+      : host(host), user(user), toLog(std::move(toLog))
+  {
 #ifdef IBM
-  // Required on Windows
-  ix::initNetSystem();
+    // Required on Windows
+    ix::initNetSystem();
 #endif
 
-  this->webSocket = new ix::WebSocket();
-  this->webSocket->enableAutomaticReconnection();
-  this->webSocket->setUrl(host);
-  this->webSocket->setOnMessageCallback(
-      [this](const ix::WebSocketMessagePtr &msg) {
-        this->onClientMessageCallback(msg);
-      });
-  this->webSocket->start();
-}
+    this->webSocket = new ix::WebSocket();
+    this->webSocket->enableAutomaticReconnection();
+    this->webSocket->setUrl(host);
+    this->webSocket->setOnMessageCallback(
+        [this](const ix::WebSocketMessagePtr &msg) {
+          this->onClientMessageCallback(msg);
+        });
+    this->webSocket->start();
+  }
 
-Websocket::~Websocket()
-{
-  this->webSocket->stop();
-  this->toLog("WebSocket stopped");
+  Websocket::~Websocket()
+  {
+    this->webSocket->stop();
+    this->toLog("WebSocket stopped");
 #ifdef IBM
-  // Required on Windows
-  ix::uninitNetSystem();
+    // Required on Windows
+    ix::uninitNetSystem();
 #endif
-}
+  }
 
-void Websocket::onClientMessageCallback(const ix::WebSocketMessagePtr &msg)
-{
-  if (msg->type == ix::WebSocketMessageType::Open) {
-    std::stringstream debug_msg;
-
-    debug_msg << std::endl << "New connection" << std::endl;
-    debug_msg << "Uri: " << msg->openInfo.uri << std::endl;
-    debug_msg << "Headers:" << std::endl;
-    for (const auto &it : msg->openInfo.headers) {
-      debug_msg << it.first << ": " << it.second << std::endl;
-    }
-
-    this->toLog(debug_msg.str());
-
-    this->webSocket->send("MASTER:" + user);
-    this->toLog("Connecting as " + user);
-  } else if (msg->type == ix::WebSocketMessageType::Close) {
-    if (msg->closeInfo.reason.compare("DUPLICATE") == 0) {
-      this->webSocket->disableAutomaticReconnection();
-
-      this->toLog("Disconnected due to beeing a duplicate simualtor");
-    } else {
+  void Websocket::onClientMessageCallback(const ix::WebSocketMessagePtr &msg)
+  {
+    if (msg->type == ix::WebSocketMessageType::Open) {
       std::stringstream debug_msg;
 
-      debug_msg << std::endl << "Connection closed" << std::endl;
-      debug_msg << "Code: " << msg->closeInfo.code << std::endl;
-      debug_msg << "Reason: " << msg->closeInfo.reason << std::endl;
-      debug_msg << "Remote: " << msg->closeInfo.remote << std::endl;
+      debug_msg << std::endl << "New connection" << std::endl;
+      debug_msg << "Uri: " << msg->openInfo.uri << std::endl;
+      debug_msg << "Headers:" << std::endl;
+      for (const auto &it : msg->openInfo.headers) {
+        debug_msg << it.first << ": " << it.second << std::endl;
+      }
 
       this->toLog(debug_msg.str());
-    }
-  } else if (msg->type == ix::WebSocketMessageType::Error) {
-    std::stringstream debug_msg;
 
-    debug_msg << std::endl << "Connection error" << std::endl;
-    debug_msg << "Decompression: " << msg->errorInfo.decompressionError
-              << std::endl;
-    debug_msg << "HTTP status: " << msg->errorInfo.http_status << std::endl;
-    debug_msg << "Reason: " << msg->errorInfo.reason << std::endl;
-    debug_msg << "Retries: " << msg->errorInfo.retries << std::endl;
-    debug_msg << "Wait time: " << msg->errorInfo.wait_time << std::endl;
+      this->webSocket->send("MASTER:" + user);
+      this->toLog("Connecting as " + user);
+    } else if (msg->type == ix::WebSocketMessageType::Close) {
+      if (msg->closeInfo.reason.compare("DUPLICATE") == 0) {
+        this->webSocket->disableAutomaticReconnection();
 
-    this->toLog(debug_msg.str());
-  } else if (msg->type == ix::WebSocketMessageType::Message) {
-    if (!msg->str.empty()) {
-      this->toLog(msg->str);
-    }
-  }
-}
+        this->toLog("Disconnected due to beeing a duplicate simualtor");
+      } else {
+        std::stringstream debug_msg;
 
-void Websocket::sendData(data &d)
-{
-  if (strcmp(d.path, this->lastPath) != 0) {
-    strcpy(this->lastPath, d.path);
-    if (germanairlinesva::util::generateMD5(d.path,
-                                            this->lastHash,
-                                            this->toLog)) {
-      strcpy(this->lastHash, "NOT SET");
+        debug_msg << std::endl << "Connection closed" << std::endl;
+        debug_msg << "Code: " << msg->closeInfo.code << std::endl;
+        debug_msg << "Reason: " << msg->closeInfo.reason << std::endl;
+        debug_msg << "Remote: " << msg->closeInfo.remote << std::endl;
+
+        this->toLog(debug_msg.str());
+      }
+    } else if (msg->type == ix::WebSocketMessageType::Error) {
+      std::stringstream debug_msg;
+
+      debug_msg << std::endl << "Connection error" << std::endl;
+      debug_msg << "Decompression: " << msg->errorInfo.decompressionError
+                << std::endl;
+      debug_msg << "HTTP status: " << msg->errorInfo.http_status << std::endl;
+      debug_msg << "Reason: " << msg->errorInfo.reason << std::endl;
+      debug_msg << "Retries: " << msg->errorInfo.retries << std::endl;
+      debug_msg << "Wait time: " << msg->errorInfo.wait_time << std::endl;
+
+      this->toLog(debug_msg.str());
+    } else if (msg->type == ix::WebSocketMessageType::Message) {
+      if (!msg->str.empty()) {
+        this->toLog(msg->str);
+      }
     }
   }
 
-  nlohmann::json json = {
-      {"altitude", d.alt},
-      {"vs", d.vs},
-      {"ias", d.ias},
-      {"magHdg", d.magHeading},
-      {"truHdg", d.truHdg},
-      {"totFuel", d.totFuelKg},
-      {"fuelFlow", d.ff},
-      {"hash", this->lastHash},
-  };
+  void Websocket::sendData(data &d)
+  {
+    if (strcmp(d.path, this->lastPath) != 0) {
+      strcpy(this->lastPath, d.path);
+      if (util::generateMD5(d.path, this->lastHash, this->toLog)) {
+        strcpy(this->lastHash, "NOT SET");
+      }
+    }
 
-  if (this->webSocket != nullptr) {
-    std::ostringstream msg;
-    msg << "SEND:" << user << ":" << json.dump();
-    this->webSocket->send(msg.str(), false);
+    nlohmann::json json = {
+        {"altitude", d.alt},
+        {"vs", d.vs},
+        {"ias", d.ias},
+        {"magHdg", d.magHeading},
+        {"truHdg", d.truHdg},
+        {"totFuel", d.totFuelKg},
+        {"fuelFlow", d.ff},
+        {"hash", this->lastHash},
+    };
+
+    if (this->webSocket != nullptr) {
+      std::ostringstream msg;
+      msg << "SEND:" << user << ":" << json.dump();
+      this->webSocket->send(msg.str(), false);
+    }
   }
-}
-} // namespace germanairlinesva_websocket
+} // namespace websocket
+} // namespace germanairlinesva