Add an idle timeout on the server side

Author: softins

src/tcpconnection.cpp

@@ -73,12 +73,18 @@ CTcpConnection::CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcp
     connect ( pTcpSocket, &QTcpSocket::readyRead, this, &CTcpConnection::OnReadyRead );
 
     connect ( this, &CTcpConnection::ProtocolCLMessageReceived, pServer, &CServer::OnProtocolCLMessageReceived );
+
+    // setup an idle timer on the server side only
+    connect ( &TimerIdleTimeout, &QTimer::timeout, this, &CTcpConnection::OnTimerIdleTimeout );
+    TimerIdleTimeout.setSingleShot ( true );
+    TimerIdleTimeout.start ( TCP_IDLE_TIMEOUT_MS );
 }
 
 void CTcpConnection::OnDisconnected()
 {
     qDebug() << "- Jamulus-TCP: disconnected from:" << tcpAddress.toString();
     TimerKeepalive.stop();
+    TimerIdleTimeout.stop();
     pTcpSocket->deleteLater();
     if ( pChannel && pChannel->GetTcpConnection() == this )
     {
@@ -183,6 +189,12 @@ void CTcpConnection::OnReadyRead()
     }
 
     qDebug() << "- end of readyRead(), bytesAvailable() =" << pTcpSocket->bytesAvailable();
+
+    if ( pServer )
+    {
+        // restart server idle timer allowing for keepalive interval
+        TimerIdleTimeout.start ( TCP_KEEPALIVE_INTERVAL_MS + TCP_IDLE_TIMEOUT_MS );
+    }
 }
 
 void CTcpConnection::OnTimerKeepalive()
@@ -191,6 +203,12 @@ void CTcpConnection::OnTimerKeepalive()
     emit CLSendEmptyMes ( tcpAddress, this );
 }
 
+void CTcpConnection::OnTimerIdleTimeout()
+{
+    // qDebug() << "- ConnTimeout timer" << this << "from TCP" << tcpAddress.toString();
+    disconnectFromHost();
+}
+
 qint64 CTcpConnection::write ( const char* data, qint64 maxSize )
 {
     if ( !pTcpSocket )

src/tcpconnection.h

@@ -41,6 +41,7 @@ class CServer;  // forward declaration of CServer
 class CChannel; // forward declaration of CChannel
 
 #define TCP_CONNECT_TIMEOUT_MS    3000
+#define TCP_IDLE_TIMEOUT_MS       5000
 #define TCP_KEEPALIVE_INTERVAL_MS 15000
 
 /* Classes ********************************************************************/
@@ -77,6 +78,7 @@ class CTcpConnection : public QObject
     CVector<uint8_t> vecbyRecBuf;
 
     QTimer TimerKeepalive;
+    QTimer TimerIdleTimeout;
 
 signals:
     void ProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress HostAdr, CTcpConnection* pTcpConnection );
@@ -86,4 +88,5 @@ private slots:
     void OnDisconnected();
     void OnReadyRead();
     void OnTimerKeepalive();
+    void OnTimerIdleTimeout();
 };