GermanAirlines/GermanAirlinesVA-GAConnector
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjust protocoll

Browse Source
This commit is contained in:
Kilian Hofmann 2022-09-05 17:45:18 +02:00
parent ff179ee3a4
commit 0612afb37b
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format.sh
View File

@ -2,7 +2,7 @@
shopt -s globstar shopt -s globstar
GLOBIGNORE='**/XPLM/**:XPLM/**:**/XPLM:**/ixwebsocket/**:ixwebsocket/**:**/ixwebsocket:**/nlohmann/**:nlohmann/**:**/nlohmann:**/XPSDK/**:XPSDK/**:**/XPSDK:**/build*/**:build*/**:**/build*' GLOBIGNORE='**/XPLM/**:XPLM/**:**/XPLM:**/ixwebsocket/**:ixwebsocket/**:**/ixwebsocket:**/nlohmann/**:nlohmann/**:**/nlohmann:**/XPSDK/**:XPSDK/**:**/XPSDK:**/build*/**:build*/**:**/build*:**/openSSL/**:openSSL/**:**/openSSL'
clang-format -verbose -i **/*.cpp clang-format -verbose -i **/*.cpp
clang-format -verbose -i **/*.h clang-format -verbose -i **/*.h

3
websocket/include/websocket.h
View File

@ -25,7 +25,6 @@ class Websocket
char lastPath[513] = ""; char lastPath[513] = "";
char lastHash[2 * MD5LEN + 1] = ""; char lastHash[2 * MD5LEN + 1] = "";
ix::WebSocket *webSocket = nullptr; ix::WebSocket *webSocket = nullptr;
std::mutex wsLock;
std::string host; std::string host;
std::string user; std::string user;
std::function<void(std::string)> toLog; std::function<void(std::string)> toLog;
@ -36,7 +35,7 @@ class Websocket
std::function<void(const std::string)> toLog); std::function<void(const std::string)> toLog);
~Websocket(); ~Websocket();
void onClientMessageCallback(const ix::WebSocketMessagePtr &msg); void onClientMessageCallback(const ix::WebSocketMessagePtr &msg);
void sendData(data d); void sendData(data &d);
}; };
#endif #endif

27
websocket/websocket.cpp
View File

@ -43,17 +43,23 @@ void Websocket::onClientMessageCallback(const ix::WebSocketMessagePtr &msg)
toLog(debug_msg.str()); toLog(debug_msg.str());
webSocket->send("LOGIN:" + user); webSocket->send("MASTER:" + user);
toLog("Connecting as " + user); toLog("Connecting as " + user);
} else if (msg->type == ix::WebSocketMessageType::Close) { } else if (msg->type == ix::WebSocketMessageType::Close) {
std::stringstream debug_msg; if (msg->closeInfo.reason.compare("DUPLICATE")) {
webSocket->disableAutomaticReconnection();
debug_msg << "Connection closed" << std::endl; toLog("Disconnected due to beeing a duplicate simualtor");
debug_msg << "Code: " << msg->closeInfo.code << std::endl; } else {
debug_msg << "Reason: " << msg->closeInfo.reason << std::endl; std::stringstream debug_msg;
debug_msg << "Remote: " << msg->closeInfo.remote << std::endl;
toLog(debug_msg.str()); debug_msg << "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;
toLog(debug_msg.str());
}
} else if (msg->type == ix::WebSocketMessageType::Error) { } else if (msg->type == ix::WebSocketMessageType::Error) {
std::stringstream debug_msg; std::stringstream debug_msg;
@ -73,7 +79,7 @@ void Websocket::onClientMessageCallback(const ix::WebSocketMessagePtr &msg)
} }
} }
void Websocket::sendData(data d) void Websocket::sendData(data &d)
{ {
if (strcmp(d.path, lastPath) != 0) { if (strcmp(d.path, lastPath) != 0) {
strcpy(lastPath, d.path); strcpy(lastPath, d.path);
@ -94,11 +100,8 @@ void Websocket::sendData(data d)
}; };
{ {
std::lock_guard<std::mutex> lock(wsLock);
if (webSocket != nullptr) { if (webSocket != nullptr) {
std::ostringstream msg; webSocket->send(json.dump(), false);
msg << "SEND:" << user << ":" << json.dump();
webSocket->send(msg.str(), false);
} }
} }
} }