Request server list via TCP if required

Author: softins

src/client.cpp

@@ -276,12 +276,15 @@ void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecM
 
         connect ( pSocket, &QTcpSocket::connected, this, [this, pSocket, InetAddr, vecMessage]() {
             // connection succeeded, give it to a CTcpConnection
-            CTcpConnection* pTcpConnection = new CTcpConnection ( pSocket, InetAddr, nullptr ); // client connection, will self-delete on disconnect
+            CTcpConnection* pTcpConnection =
+                new CTcpConnection ( pSocket, InetAddr, nullptr, &Channel ); // client connection, will self-delete on disconnect
 
             pTcpConnection->write ( (const char*) &( (CVector<uint8_t>) vecMessage )[0], vecMessage.Size() );
 
-            // the CTcpConnection object will pass the reply back up to CProtocol
+            // the CTcpConnection object will pass the reply back up to CClient::Channel
         } );
+
+        pSocket->connectToHost ( InetAddr.InetAddr, InetAddr.iPort );
     }
     else
     {

src/connectdlg.cpp

@@ -544,7 +544,18 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr, const CVector<CS
     TimerPing.start ( PING_UPDATE_TIME_SERVER_LIST_MS );
 }
 
-void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr ) { Q_UNUSED ( InetAddr ); }
+void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr )
+{
+    qDebug() << "- TCP supported at server" << InetAddr.toString();
+
+    // if we haven't received the serverlist, it must have got lost due to fragmentation
+    // retry using TCP instead
+    if ( !bServerListReceived )
+    {
+        // send the request for the server list
+        emit ReqServerListQuery ( InetAddr, true ); // TCP
+    }
+}
 
 void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr, const CVector<CChannelInfo>& vecChanInfo )
 {

src/tcpconnection.cpp

@@ -28,28 +28,35 @@
 #include "server.h"
 #include "channel.h"
 
-CTcpConnection::CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer ) :
+CTcpConnection::CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer, CChannel* pChannel ) :
     pTcpSocket ( pTcpSocket ),
     tcpAddress ( tcpAddress ),
-    pServer ( pServer )
+    pServer ( pServer ),
+    pChannel ( pChannel )
 {
     vecbyRecBuf.Init ( MAX_SIZE_BYTES_NETW_BUF );
     iPos           = 0;
     iPayloadRemain = 0;
 
     connect ( pTcpSocket, &QTcpSocket::disconnected, this, &CTcpConnection::OnDisconnected );
     connect ( pTcpSocket, &QTcpSocket::readyRead, this, &CTcpConnection::OnReadyRead );
+
     if ( pServer )
     {
         connect ( this, &CTcpConnection::ProtocolCLMessageReceived, pServer, &CServer::OnProtocolCLMessageReceived );
     }
+
+    if ( pChannel )
+    {
+        connect ( this, &CTcpConnection::ProtocolCLMessageReceived, pChannel, &CChannel::OnProtocolCLMessageReceived );
+    }
 }
 
 void CTcpConnection::OnDisconnected()
 {
-    qDebug() << "- Jamulus-TCP: disconnected from:" << tcpAddress.InetAddr.toString();
+    qDebug() << "- Jamulus-TCP: disconnected from:" << tcpAddress.toString();
     pTcpSocket->deleteLater();
-    delete this;
+    deleteLater(); // delete this object in the next event loop
 }
 
 void CTcpConnection::OnReadyRead()
@@ -124,7 +131,7 @@ void CTcpConnection::OnReadyRead()
                         //### TODO: END ###//
 
                         // disconnect if we are a client
-                        if ( !pServer )
+                        if ( pChannel )
                         {
                             pTcpSocket->disconnectFromHost();
                         }

src/tcpconnection.h

@@ -35,18 +35,18 @@
 #include "util.h"
 
 // The header files channel.h and server.h require to include this header file
-// so we get a cyclic dependency. To solve this issue, a prototype of the
-// channel class and server class is defined here.
-class CServer; // forward declaration of CServer
-// class CChannel;       // forward declaration of CChannel
+// so we get a cyclic dependency. To solve this issue, prototypes of the
+// channel class and server class are defined here.
+class CServer;  // forward declaration of CServer
+class CChannel; // forward declaration of CChannel
 
 /* Classes ********************************************************************/
 class CTcpConnection : public QObject
 {
     Q_OBJECT
 
 public:
-    CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer = nullptr );
+    CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer, CChannel* pChannel );
     ~CTcpConnection() {}
 
     qint64 write ( const char* data, qint64 maxSize );
@@ -56,15 +56,17 @@ class CTcpConnection : public QObject
     CHostAddress tcpAddress;
     CHostAddress udpAddress;
 
-    CServer*         pServer;
+    CServer*  pServer;
+    CChannel* pChannel;
+
     int              iPos;
     int              iPayloadRemain;
     CVector<uint8_t> vecbyRecBuf;
 
 signals:
     void ProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress HostAdr, CTcpConnection* pTcpConnection );
 
-protected slots:
+private slots:
     void OnDisconnected();
     void OnReadyRead();
 };

src/tcpserver.cpp

@@ -23,11 +23,8 @@
  \******************************************************************************/
 
 #include "tcpserver.h"
-//#include "tcpconnection.h"
 
-#include "protocol.h"
 #include "server.h"
-//#include "channel.h"
 
 CTcpServer::CTcpServer ( CServer* pNServP, const QString& strServerBindIP, int iPort, bool bEnableIPv6 ) :
     pServer ( pNServP ),
@@ -98,7 +95,7 @@ void CTcpServer::OnNewConnection()
         }
     }
 
-    qDebug() << "- Jamulus-TCP: received connection from:" << peerAddress.InetAddr.toString();
+    qDebug() << "- Jamulus-TCP: received connection from:" << peerAddress.toString();
 
-    new CTcpConnection ( pSocket, peerAddress, pServer ); // will auto-delete on disconnect
+    new CTcpConnection ( pSocket, peerAddress, pServer, nullptr ); // will auto-delete on disconnect
 }

src/tcpserver.h

@@ -36,12 +36,10 @@
 #include "global.h"
 #include "util.h"
 
-// The header files channel.h and server.h require to include this header file
+// The header file server.h requires to include this header file
 // so we get a cyclic dependency. To solve this issue, a prototype of the
-// channel class and server class is defined here.
+// server class is defined here.
 class CServer; // forward declaration of CServer
-// class CChannel;       // forward declaration of CChannel
-// class CTcpConnection; // forward declaration of CTcpConnection
 
 /* Classes ********************************************************************/
 class CTcpServer : public QObject
@@ -50,7 +48,7 @@ class CTcpServer : public QObject
 
 public:
     CTcpServer ( CServer* pNServP, const QString& strServerBindIP, int iPort, bool bEnableIPv6 );
-    virtual ~CTcpServer();
+    ~CTcpServer();
 
     bool Start();
 
@@ -61,9 +59,6 @@ class CTcpServer : public QObject
     const bool    bEnableIPv6;
     QTcpServer*   pTcpServer;
 
-    // signals:
-    //     void ProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress HostAdr, CTcpConnection* pTcpConnection );
-
-protected slots:
+private slots:
     void OnNewConnection();
 };