Revize 04839796

Re #8906 - Server and client refactor

deltarobot/curvedataserver.cpp

@@ -124 +124 @@
 
 CurveDataServer::CurveDataServer() :
     _server(this),
-    _pingThread([this](){threadFunction();}),
     _sockets()
 {
     _server.listen(QHostAddress::Any, 4242);
@@ -139 +138 @@
         terminateConnection(client, "Server is stopping");
     }
     _sockets.clear();
-
-    _threadIsRunning = false;
 }
 
 void CurveDataServer::onNewConnection()
@@ -149 +146 @@
     connect(clientSocket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
     connect(clientSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(onSocketStateChanged(QAbstractSocket::SocketState)));
 
+    qDebug() << "Client" << clientSocket->peerAddress() << "is connecting...";
     sendPreamble(clientSocket);
     _sockets.push_back(Client(clientSocket));
 }
@@ -268 +266 @@
 void CurveDataServer::handleMessage(Client& client, uint16_t messageId, void *content, size_t contentSize) {
     switch (messageId) {
     case 0x3001:
-        qDebug() << "Magic arrived!";
         handleProtocolMagic(client, (char *) content);
         break;
     case 0x2002:
-        qDebug() << "Version arrived!";
         handleVersion(client, *((uint8_t*) content));
         break;
     case 0x3005:
-        qDebug() << "Pong " << *((uint64_t*) content) << " arrived!";
         handlePong(client, (uint64_t*) content);
         break;
     case 0xF006:
@@ -293 +288 @@
     if (strncmp(content, correct, 8) == 0) {
         client.magic = true;
     }
+    validateProtocol(client);
 }
 
 void CurveDataServer::handleVersion(Client& client, uint8_t content)
@@ -301 +297 @@
     {
         client.version = true;
     }
+    validateProtocol(client);
 }
 
 void CurveDataServer::handlePong(Client& client, uint64_t* content)
@@ -316 +313 @@
 
     client.latency = time - timeSent;
     client.lastPong = time;
-    //qDebug() << "prisel pong" << number;
 }
 
 void CurveDataServer::handleEOT(Client& client, char* content, size_t contentSize)
@@ -325 +321 @@
     std::memcpy(cstrContent, content, contentSize);
     cstrContent[contentSize] = '\0';
 
-    qDebug() << "Client" << client.socket->peerName() << "disconnected:" << cstrContent;
+    qDebug() << "Client" << client.socket->peerAddress() << "disconnected:" << cstrContent;
     terminateConnection(client, "Recieved EOT from client");
 }
 
 
+void CurveDataServer::validateProtocol(Client &client) {
+    if (!client.protocolValid && client.magic && client.version) {
+        client.protocolValid = true;
+        qDebug() << "Client" << client.socket->peerAddress() << "has successfully connected.";
+    }
+}
+
+
 void CurveDataServer::terminateConnection(Client& client, std::string&& reason)
 {
     if (client.socket->isOpen())
@@ -339 +343 @@
         client.socket->close();
     }
 
+    qDebug() << "Terminating connection to client" << client.socket->peerAddress() << "reason:" << reason.c_str();
     removeSocket(client.socket);
 }
 
@@ -450 +455 @@
     QByteArray message = message64(0x3001, *((uint64_t*) messageContent));
 
     socket->write(message);
-
-    qDebug() << "Sent Protocol Magic to" << socket->peerAddress();
 }
 
 void CurveDataServer::sendVersion(QTcpSocket *socket)
@@ -459 +462 @@
     QByteArray message = message32(0x2002, 1);
 
     socket->write(message);
-
-    qDebug() << "Sent Protocol Version to" << socket->peerAddress();
 }
 
 void CurveDataServer::sendEot(QTcpSocket *socket, std::string&& reason)
@@ -469 +470 @@
     socket->write(message);
 }
 
-
-
 void CurveDataServer::sendMessageToAllConnected(QByteArray &message)
 {
     std::lock_guard<decltype (_socketsLock)> l(_socketsLock);
     for (auto& client : _sockets) {
-        if (client.magic && client.version)
+        if (client.protocolValid)
         {
             client.socket->write(message);
         }
     }
 }
 
-void CurveDataServer::threadFunction()
-{
-    while (_threadIsRunning)
-    {
-        //processPings();
-
-        // TODO tim se zpravilo varovani se socketama
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-}
-
 void CurveDataServer::processPings()
 {
     std::lock_guard<decltype (_socketsLock)> l(_socketsLock);
     for (auto& client : _sockets) {
 
-        if (client.magic && client.version)
+        if (client.protocolValid)
         {
             if (client.lastPong  < currentTimeMillis() - 10000)
             {
@@ -539 +526 @@
 {
     uint64_t number = (((uint64_t) rand()) << 32) + (uint64_t) rand();
 
-    //qDebug() << "posilam ping" << ((qint64) number) << ".";
-
     client.ping.emplace(std::make_pair(number, currentTimeMillis()));
-    //client.ping.insert({number, currentTimeMillis()});
 
     client.socket->write(message64(0x3004, (uint64_t) number));
 }