github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate out the reply systems within the websocket.[cpp/h] files, and ensure that we close the TCP socket after sending back a reply.

Browse Source
This commit is contained in:
Ken Moore
2016-01-05 13:46:55 -05:00
parent ad8d88fc7c
commit a5fcddcbbe
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/WebSocket.cpp
View File

@@ -65,6 +65,15 @@ void WebSocket::setLastDispatch(QString msg){
//=======================
// PRIVATE
//=======================
void WebSocket::sendReply(QString msg){
if(SOCKET!=0){ SOCKET->sendTextMessage(msg); } //Websocket connection
else if(TSOCKET!=0){
//TCP Socket connection
TSOCKET->write(msg.toUtf8().data());
TSOCKET->close(); //TCP/REST connections are 1 connection per message.
}
}
void WebSocket::EvaluateREST(QString msg){
//Parse the message into it's elements and proceed to the main data evaluation
RestInputStruct IN(msg);
@@ -94,8 +103,9 @@ void WebSocket::EvaluateREST(QString msg){
}
out.Header << "Accept: text/json";
out.Header << "Content-Type: text/json; charset=utf-8";
if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }
this->sendReply(out.assembleMessage());
/* if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }*/
}else{
EvaluateRequest(IN);
}
@@ -203,8 +213,9 @@ void WebSocket::EvaluateRequest(const RestInputStruct &REQ){
}
}
//Return any information
if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }
this->sendReply(out.assembleMessage());
/*if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }*/
}
// === GENERAL PURPOSE UTILITY FUNCTIONS ===
@@ -312,6 +323,7 @@ void WebSocket::AppCafeStatusUpdate(QString msg){
//Assemble the output JSON document/text
out.Header << "Content-Type: text/json; charset=utf-8"; //REST header info
//Now send the message back through the socket
if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }
this->sendReply(out.assembleMessage());
/* if(SOCKET!=0){ SOCKET->sendTextMessage(out.assembleMessage()); }
else if(TSOCKET!=0){ TSOCKET->write(out.assembleMessage().toUtf8().data()); }*/
}

2
src/server/WebSocket.h
View File

@@ -38,6 +38,8 @@ private:
AuthorizationManager *AUTHSYSTEM;
bool SendAppCafeEvents;
void sendReply(QString msg);
//Main connection comminucations procedure
void EvaluateREST(QString); //Text -> Rest/JSON struct
void EvaluateRequest(const RestInputStruct&); // Parse Rest/JSON (does auth/events)