Make CTcpConnection work in serveronly mode.

Constructor for CTcpConnection made polymorphic for client and server.

Author: softins

src/client.cpp

@@ -284,7 +284,6 @@ void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecM
             // connection succeeded, give it to a CTcpConnection
             CTcpConnection* pTcpConnection = new CTcpConnection ( pSocket,
                                                                   InetAddr,
-                                                                  nullptr,
                                                                   this,
                                                                   &Channel,
                                                                   eProtoMode == PROTO_TCP_LONG ); // client connection, will self-delete on disconnect

src/tcpconnection.cpp

@@ -24,19 +24,17 @@
 
 #include "protocol.h"
 #include "server.h"
-#include "client.h"
+#ifndef SERVER_ONLY
+#    include "client.h"
+#endif
 #include "channel.h"
 
-CTcpConnection::CTcpConnection ( QTcpSocket*         pTcpSocket,
-                                 const CHostAddress& tcpAddress,
-                                 CServer*            pServer,
-                                 CClient*            pClient,
-                                 CChannel*           pChannel,
-                                 bool                bIsSession ) :
+#ifndef SERVER_ONLY
+// TCP connection used by client
+CTcpConnection::CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CClient* pClient, CChannel* pChannel, bool bIsSession ) :
     pTcpSocket ( pTcpSocket ),
     tcpAddress ( tcpAddress ),
-    pServer ( pServer ),
-    pClient ( pClient ),
+    pServer ( nullptr ),
     pChannel ( pChannel ),
     bIsSession ( bIsSession )
 {
@@ -47,24 +45,35 @@ CTcpConnection::CTcpConnection ( QTcpSocket*         pTcpSocket,
     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 );
-    }
+    connect ( this, &CTcpConnection::ProtocolCLMessageReceived, pChannel, &CChannel::OnProtocolCLMessageReceived );
 
-    if ( pClient && bIsSession )
+    if ( bIsSession )
     {
         // set up keepalive CLM_EMPTY_MESSAGE over TCP session connection
         connect ( this, &CTcpConnection::CLSendEmptyMes, pClient, &CClient::OnCLSendEmptyMes );
         connect ( &TimerKeepalive, &QTimer::timeout, this, &CTcpConnection::OnTimerKeepalive );
         TimerKeepalive.start ( TCP_KEEPALIVE_INTERVAL_MS );
     }
 }
+#endif
+
+// TCP connection used by server
+CTcpConnection::CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer ) :
+    pTcpSocket ( pTcpSocket ),
+    tcpAddress ( tcpAddress ),
+    pServer ( pServer ),
+    pChannel ( nullptr ),
+    bIsSession ( false )
+{
+    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 );
+
+    connect ( this, &CTcpConnection::ProtocolCLMessageReceived, pServer, &CServer::OnProtocolCLMessageReceived );
+}
 
 void CTcpConnection::OnDisconnected()
 {

src/tcpconnection.h

@@ -48,12 +48,10 @@ class CTcpConnection : public QObject
     Q_OBJECT
 
 public:
-    CTcpConnection ( QTcpSocket*         pTcpSocket,
-                     const CHostAddress& tcpAddress,
-                     CServer*            pServer,
-                     CClient*            pClient,
-                     CChannel*           pChannel,
-                     bool                bIsSession );
+#ifndef SERVER_ONLY
+    CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CClient* pClient, CChannel* pChannel, bool bIsSession );
+#endif
+    CTcpConnection ( QTcpSocket* pTcpSocket, const CHostAddress& tcpAddress, CServer* pServer );
     ~CTcpConnection() {}
 
     void      SetChannel ( CChannel* pChan ) { pChannel = pChan; }
@@ -67,10 +65,8 @@ class CTcpConnection : public QObject
 private:
     QTcpSocket*  pTcpSocket;
     CHostAddress tcpAddress;
-    CHostAddress udpAddress;
 
     CServer*  pServer;
-    CClient*  pClient;
     CChannel* pChannel;
 
     const bool bIsSession;

src/tcpserver.cpp

@@ -97,5 +97,5 @@ void CTcpServer::OnNewConnection()
 
     qDebug() << "- Jamulus-TCP: received connection from:" << peerAddress.toString();
 
-    new CTcpConnection ( pSocket, peerAddress, pServer, nullptr, nullptr, false ); // will auto-delete on disconnect
+    new CTcpConnection ( pSocket, peerAddress, pServer ); // will auto-delete on disconnect
 }