Add CLM_TCP_SUPPORTED message generation when TCP enabled

Author: softins

src/server.cpp

@@ -65,6 +65,7 @@ CServer::CServer ( const int          iNewMaxNumChan,
                         strServerListFilter,
                         iNewMaxNumChan,
                         bNEnableIPv6,
+                        bNEnableTcp,
                         &ConnLessProtocol ),
     JamController ( this ),
     bDisableRecording ( bDisableRecording ),
@@ -386,6 +387,12 @@ void CServer::OnNewConnection ( int iChID, int iTotChans, CHostAddress RecHostAd
 {
     QMutexLocker locker ( &Mutex );
 
+    // if TCP is enabled, we need to announce this first, before sending Client ID
+    if ( bEnableTcp )
+    {
+        ConnLessProtocol.CreateCLTcpSupportedMes ( vecChannels[iChID].GetAddress() );
+    }
+
     // inform the client about its own ID at the server (note that this
     // must be the first message to be sent for a new connection)
     vecChannels[iChID].CreateClientIDMes ( iChID );

src/server.h

@@ -369,6 +369,12 @@ public slots:
     void OnCLReqConnClientsList ( CHostAddress InetAddr, CTcpConnection* pTcpConnection )
     {
         ConnLessProtocol.CreateCLConnClientsListMes ( InetAddr, CreateChannelList(), pTcpConnection );
+
+        // if TCP is enabled but this request is on UDP, say TCP is supported
+        if ( bEnableTcp && !pTcpConnection )
+        {
+            ConnLessProtocol.CreateCLTcpSupportedMes ( InetAddr );
+        }
     }
 
     void OnCLRegisterServerReceived ( CHostAddress InetAddr, CHostAddress LInetAddr, CServerCoreInfo ServerInfo )

src/serverlist.cpp

@@ -128,9 +128,11 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
                                          const QString& strServerPublicIP,
                                          const int      iNumChannels,
                                          const bool     bNEnableIPv6,
+                                         const bool     bNEnableTcp,
                                          CProtocol*     pNConLProt ) :
     DirectoryType ( AT_NONE ),
     bEnableIPv6 ( bNEnableIPv6 ),
+    bEnableTcp ( bNEnableTcp ),
     ServerListFileName ( strServerListFileName ),
     strDirectoryAddress ( "" ),
     bIsDirectory ( false ),
@@ -709,7 +711,9 @@ void CServerListManager::RetrieveAll ( const CHostAddress& InetAddr, CTcpConnect
             }
 
             // do not send a "ping" to a server local to the directory (no need)
-            if ( !serverIsInternal )
+            // also only do so if processing a request over UDP, not TCP,
+            // as the client will always try UDP before TCP.
+            if ( !serverIsInternal && !pTcpConnection )
             {
                 // create "send empty message" for all other registered servers
                 // this causes the server (vecServerInfo[iIdx].HostAddr)
@@ -728,6 +732,12 @@ void CServerListManager::RetrieveAll ( const CHostAddress& InetAddr, CTcpConnect
             pConnLessProtocol->CreateCLRedServerListMes ( InetAddr, vecServerInfo );
         }
         pConnLessProtocol->CreateCLServerListMes ( InetAddr, vecServerInfo, pTcpConnection );
+
+        // if TCP is enabled but this request is on UDP, say TCP is supported
+        if ( bEnableTcp && !pTcpConnection )
+        {
+            pConnLessProtocol->CreateCLTcpSupportedMes ( InetAddr );
+        }
     }
 }
 

src/serverlist.h

@@ -141,6 +141,7 @@ class CServerListManager : public QObject
                          const QString& strServerPublicIP,
                          const int      iNumChannels,
                          const bool     bNEnableIPv6,
+                         const bool     bNEnableTcp,
                          CProtocol*     pNConLProt );
 
     void    SetServerName ( const QString& strNewName );
@@ -192,6 +193,7 @@ class CServerListManager : public QObject
     EDirectoryType DirectoryType;
 
     bool bEnableIPv6;
+    bool bEnableTcp;
 
     CHostAddress ServerPublicIP;
     CHostAddress ServerPublicIP6;