Replace boolean TCP flag with multimode enum

softins · softins · commit 23e9c3670e46 · 2026-04-05T22:52:55.000+01:00
To provide three modes: UDP, TCP once or TCP long connection.
diff --git a/src/client.cpp b/src/client.cpp
@@ -251,7 +251,7 @@ void CClient::OnSendProtMessage ( CVector<uint8_t> vecMessage )
     Socket.SendPacket ( vecMessage, Channel.GetAddress() );
 }
 
-void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient )
+void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode )
 {
     if ( pTcpConnection )
     {
@@ -261,7 +261,7 @@ void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecM
 
     // the protocol queries me to call the function to send the message
     // send it through the network
-    if ( bUseTcpClient )
+    if ( eProtoMode != PROTO_UDP )
     {
         // create a TCP client connection and send message
         QTcpSocket* pSocket = new QTcpSocket ( this );
@@ -279,11 +279,13 @@ void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecM
             pSocket->deleteLater();
         } );
 
-        connect ( pSocket, &QTcpSocket::connected, this, [this, pSocket, InetAddr, vecMessage]() {
+        connect ( pSocket, &QTcpSocket::connected, this, [this, pSocket, InetAddr, vecMessage, eProtoMode]() {
             // connection succeeded, give it to a CTcpConnection
-            CTcpConnection* pTcpConnection =
-                new CTcpConnection ( pSocket, InetAddr, nullptr, &Channel, true ); // client connection, auto-disconn, will self-delete on disconnect
-            // TODO: do not set bDisconAfterRecv when sending CLM_CLIENT_ID for long-term connection
+            CTcpConnection* pTcpConnection = new CTcpConnection ( pSocket,
+                                                                  InetAddr,
+                                                                  nullptr,
+                                                                  &Channel,
+                                                                  eProtoMode == PROTO_TCP_ONCE ); // client connection, will self-delete on disconnect
 
             pTcpConnection->write ( (const char*) &( (CVector<uint8_t>) vecMessage )[0], vecMessage.Size() );
 
diff --git a/src/client.h b/src/client.h
@@ -278,14 +278,14 @@ class CClient : public QObject
 
     void CreateCLServerListReqVerAndOSMes ( const CHostAddress& InetAddr ) { ConnLessProtocol.CreateCLReqVersionAndOSMes ( InetAddr ); }
 
-    void CreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )
+    void CreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )
     {
-        ConnLessProtocol.CreateCLReqConnClientsListMes ( InetAddr, bUseTcpClient );
+        ConnLessProtocol.CreateCLReqConnClientsListMes ( InetAddr, eProtoMode );
     }
 
-    void CreateCLReqServerListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )
+    void CreateCLReqServerListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )
     {
-        ConnLessProtocol.CreateCLReqServerListMes ( InetAddr, bUseTcpClient );
+        ConnLessProtocol.CreateCLReqServerListMes ( InetAddr, eProtoMode );
     }
 
     int EstimatedOverallDelay ( const int iPingTimeMs );
@@ -453,7 +453,7 @@ protected slots:
     void OnCLPingReceived ( CHostAddress InetAddr, int iMs );
     void OnCLTcpSupported ( CHostAddress InetAddr, int iID );
 
-    void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient );
+    void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode );
 
     void OnCLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients );
 
diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -202,15 +202,15 @@ public slots:
 
     void OnNewLocalInputText ( QString strChatText ) { pClient->CreateChatTextMes ( strChatText ); }
 
-    void OnReqServerListQuery ( CHostAddress InetAddr, bool bUseTcpClient ) { pClient->CreateCLReqServerListMes ( InetAddr, bUseTcpClient ); }
+    void OnReqServerListQuery ( CHostAddress InetAddr, enum EProtoMode eProtoMode ) { pClient->CreateCLReqServerListMes ( InetAddr, eProtoMode ); }
 
     void OnCreateCLServerListPingMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListPingMes ( InetAddr ); }
 
     void OnCreateCLServerListReqVerAndOSMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListReqVerAndOSMes ( InetAddr ); }
 
-    void OnCreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, bool bUseTcpClient )
+    void OnCreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, enum EProtoMode eProtoMode )
     {
-        pClient->CreateCLServerListReqConnClientsListMes ( InetAddr, bUseTcpClient );
+        pClient->CreateCLServerListReqConnClientsListMes ( InetAddr, eProtoMode );
     }
 
     void OnCLServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo )
diff --git a/src/clientrpc.cpp b/src/clientrpc.cpp
@@ -171,7 +171,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CClientSettings* pSettings, CRpcServe
         if ( NetworkUtil::ParseNetworkAddress ( jsonDirectoryIp.toString(), haDirectoryAddress, false ) )
         {
             // send the request for the server list
-            pClient->CreateCLReqServerListMes ( haDirectoryAddress, false ); // UDP
+            pClient->CreateCLReqServerListMes ( haDirectoryAddress, PROTO_UDP );
             response["result"] = "ok";
         }
         else
diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
@@ -336,7 +336,7 @@ void CConnectDlg::RequestServerList()
              false ) )
     {
         // send the request for the server list
-        emit ReqServerListQuery ( haDirectoryAddress, false ); // UDP
+        emit ReqServerListQuery ( haDirectoryAddress, PROTO_UDP );
 
         // start timer, if this message did not get any respond to retransmit
         // the server list request message
@@ -379,7 +379,7 @@ void CConnectDlg::OnTimerReRequestServList()
     {
         // note that this is a connection less message which may get lost
         // and therefore it makes sense to re-transmit it
-        emit ReqServerListQuery ( haDirectoryAddress, false ); // UDP
+        emit ReqServerListQuery ( haDirectoryAddress, PROTO_UDP );
     }
 }
 
@@ -557,7 +557,7 @@ void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr, int iID )
         if ( !bServerListReceived )
         {
             // send the request for the server list
-            emit ReqServerListQuery ( InetAddr, true ); // TCP
+            emit ReqServerListQuery ( InetAddr, PROTO_TCP_ONCE ); // Close TCP connection after receiving reply
         }
         break;
 
@@ -578,7 +578,7 @@ void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr, int iID )
                     eFetchMode = CFM_TCP;
                     pCurListViewItem->setData ( LVC_CLIENTS, Qt::UserRole, eFetchMode ); // remember for future fetches
 
-                    emit CreateCLServerListReqConnClientsListMes ( InetAddr, true ); // TCP
+                    emit CreateCLServerListReqConnClientsListMes ( InetAddr, PROTO_TCP_ONCE ); // Close TCP connection after receiving reply
                 }
             }
         }
@@ -1045,7 +1045,7 @@ void CConnectDlg::SetPingTimeAndNumClientsResult ( const CHostAddress& InetAddr,
                 eFetchMode = CFM_UDP_REQUEST;
                 pCurListViewItem->setData ( LVC_CLIENTS, Qt::UserRole, eFetchMode );
             }
-            emit CreateCLServerListReqConnClientsListMes ( InetAddr, eFetchMode == CFM_TCP ); // UDP or TCP
+            emit CreateCLServerListReqConnClientsListMes ( InetAddr, eFetchMode == CFM_TCP ? PROTO_TCP_ONCE : PROTO_UDP );
         }
 
         // this is the first time a ping time was received, set item to visible
diff --git a/src/connectdlg.h b/src/connectdlg.h
@@ -146,8 +146,8 @@ public slots:
     void OnCurrentServerItemChanged ( QTreeWidgetItem* current, QTreeWidgetItem* previous );
 
 signals:
-    void ReqServerListQuery ( CHostAddress InetAddr, bool bUseTcpClient );
+    void ReqServerListQuery ( CHostAddress InetAddr, enum EProtoMode eProtoMode );
     void CreateCLServerListPingMes ( CHostAddress InetAddr );
     void CreateCLServerListReqVerAndOSMes ( CHostAddress InetAddr );
-    void CreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, bool bUseTcpClient );
+    void CreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, enum EProtoMode eProtoMode );
 };
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -636,7 +636,7 @@ void CProtocol::CreateAndImmSendConLessMessage ( const int               iID,
                                                  const CVector<uint8_t>& vecData,
                                                  const CHostAddress&     InetAddr,
                                                  CTcpConnection*         pTcpConnection,
-                                                 bool                    bUseTcpClient )
+                                                 enum EProtoMode         eProtoMode )
 {
     CVector<uint8_t> vecNewMessage;
 
@@ -645,7 +645,7 @@ void CProtocol::CreateAndImmSendConLessMessage ( const int               iID,
     GenMessageFrame ( vecNewMessage, 0, iID, vecData );
 
     // immediately send message
-    emit CLMessReadyForSending ( InetAddr, vecNewMessage, pTcpConnection, bUseTcpClient );
+    emit CLMessReadyForSending ( InetAddr, vecNewMessage, pTcpConnection, eProtoMode );
 }
 
 void CProtocol::ParseMessageBody ( const CVector<uint8_t>& vecbyMesBodyData, const int iRecCounter, const int iRecID )
@@ -2262,9 +2262,9 @@ bool CProtocol::EvaluateCLRedServerListMes ( const CHostAddress& InetAddr, const
     return false; // no error
 }
 
-void CProtocol::CreateCLReqServerListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )
+void CProtocol::CreateCLReqServerListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )
 {
-    CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_SERVER_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, bUseTcpClient );
+    CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_SERVER_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, eProtoMode );
 }
 
 bool CProtocol::EvaluateCLReqServerListMes ( const CHostAddress& InetAddr, CTcpConnection* pTcpConnection )
@@ -2515,9 +2515,9 @@ bool CProtocol::EvaluateCLConnClientsListMes ( const CHostAddress& InetAddr, con
     return false; // no error
 }
 
-void CProtocol::CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )
+void CProtocol::CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )
 {
-    CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_CONN_CLIENTS_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, bUseTcpClient );
+    CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_CONN_CLIENTS_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, eProtoMode );
 }
 
 bool CProtocol::EvaluateCLReqConnClientsListMes ( const CHostAddress& InetAddr, CTcpConnection* pTcpConnection )
diff --git a/src/protocol.h b/src/protocol.h
@@ -101,6 +101,14 @@
 #define MESS_SPLIT_PART_SIZE_BYTES 550
 #define MAX_NUM_MESS_SPLIT_PARTS   ( MAX_SIZE_BYTES_NETW_BUF / MESS_SPLIT_PART_SIZE_BYTES )
 
+/* Enum for protocol mode *****************************************************/
+enum EProtoMode
+{
+    PROTO_UDP,
+    PROTO_TCP_ONCE,
+    PROTO_TCP_LONG,
+};
+
 /* Classes ********************************************************************/
 class CProtocol : public QObject
 {
@@ -146,14 +154,14 @@ class CProtocol : public QObject
     void CreateCLUnregisterServerMes ( const CHostAddress& InetAddr );
     void CreateCLServerListMes ( const CHostAddress& InetAddr, const CVector<CServerInfo> vecServerInfo, CTcpConnection* pTcpConnection );
     void CreateCLRedServerListMes ( const CHostAddress& InetAddr, const CVector<CServerInfo> vecServerInfo );
-    void CreateCLReqServerListMes ( const CHostAddress& InetAddr, bool bUseTcpClient );
+    void CreateCLReqServerListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode );
     void CreateCLSendEmptyMesMes ( const CHostAddress& InetAddr, const CHostAddress& TargetInetAddr );
     void CreateCLEmptyMes ( const CHostAddress& InetAddr );
     void CreateCLDisconnection ( const CHostAddress& InetAddr );
     void CreateCLVersionAndOSMes ( const CHostAddress& InetAddr );
     void CreateCLReqVersionAndOSMes ( const CHostAddress& InetAddr );
     void CreateCLConnClientsListMes ( const CHostAddress& InetAddr, const CVector<CChannelInfo>& vecChanInfo, CTcpConnection* pTcpConnection );
-    void CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, bool bUseTcpClient );
+    void CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode );
     void CreateCLChannelLevelListMes ( const CHostAddress& InetAddr, const CVector<uint16_t>& vecLevelList, const int iNumClients );
     void CreateCLRegisterServerResp ( const CHostAddress& InetAddr, const ESvrRegResult eResult );
     void CreateCLTcpSupportedMes ( const CHostAddress& InetAddr, const int iID );
@@ -255,7 +263,7 @@ class CProtocol : public QObject
                                           const CVector<uint8_t>& vecData,
                                           const CHostAddress&     InetAddr,
                                           CTcpConnection*         pTcpConnection = nullptr,
-                                          bool                    bUseTcpClient  = false );
+                                          enum EProtoMode         eProtoMode     = PROTO_UDP );
 
     bool EvaluateJitBufMes ( const CVector<uint8_t>& vecData );
     bool EvaluateReqJitBufMes();
@@ -317,7 +325,7 @@ public slots:
 signals:
     // transmitting
     void MessReadyForSending ( CVector<uint8_t> vecMessage );
-    void CLMessReadyForSending ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient );
+    void CLMessReadyForSending ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode );
 
     // receiving
     void ChangeJittBufSize ( int iNewJitBufSize );
diff --git a/src/server.cpp b/src/server.cpp
@@ -477,9 +477,9 @@ void CServer::OnServerFull ( CHostAddress RecHostAddr )
     ConnLessProtocol.CreateCLServerFullMes ( RecHostAddr );
 }
 
-void CServer::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient )
+void CServer::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode )
 {
-    if ( bUseTcpClient )
+    if ( eProtoMode != PROTO_UDP )
     {
         qWarning() << "Server send cannot use TCP client";
         return;
diff --git a/src/server.h b/src/server.h
@@ -341,7 +341,7 @@ public slots:
 
     void OnServerFull ( CHostAddress RecHostAddr );
 
-    void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient );
+    void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode );
 
     void OnProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress RecHostAddr, CTcpConnection* pTcpConnection );
 
diff --git a/src/testbench.h b/src/testbench.h
@@ -222,7 +222,7 @@ public slots:
             break;
 
         case 20: // PROTMESSID_CLM_REQ_SERVER_LIST
-            Protocol.CreateCLReqServerListMes ( CurHostAddress, false );
+            Protocol.CreateCLReqServerListMes ( CurHostAddress, PROTO_UDP );
             break;
 
         case 21: // PROTMESSID_CLM_SEND_EMPTY_MESSAGE
@@ -265,7 +265,7 @@ public slots:
             break;
 
         case 29: // PROTMESSID_CLM_REQ_CONN_CLIENTS_LIST
-            Protocol.CreateCLReqConnClientsListMes ( CurHostAddress, false );
+            Protocol.CreateCLReqConnClientsListMes ( CurHostAddress, PROTO_UDP );
             break;
 
         case 30: // PROTMESSID_CLM_CHANNEL_LEVEL_LIST

Original file line number	Diff line number	Diff line change
`@@ -278,14 +278,14 @@ class CClient : public QObject`
`278`	`278`
`279`	`279`	`void CreateCLServerListReqVerAndOSMes ( const CHostAddress& InetAddr ) { ConnLessProtocol.CreateCLReqVersionAndOSMes ( InetAddr ); }`
`280`	`280`
`281`		`- void CreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )`
	`281`	`+ void CreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )`
`282`	`282`	`{`
`283`		`- ConnLessProtocol.CreateCLReqConnClientsListMes ( InetAddr, bUseTcpClient );`
	`283`	`+ ConnLessProtocol.CreateCLReqConnClientsListMes ( InetAddr, eProtoMode );`
`284`	`284`	`}`
`285`	`285`
`286`		`- void CreateCLReqServerListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )`
	`286`	`+ void CreateCLReqServerListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )`
`287`	`287`	`{`
`288`		`- ConnLessProtocol.CreateCLReqServerListMes ( InetAddr, bUseTcpClient );`
	`288`	`+ ConnLessProtocol.CreateCLReqServerListMes ( InetAddr, eProtoMode );`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`int EstimatedOverallDelay ( const int iPingTimeMs );`
`@@ -453,7 +453,7 @@ protected slots:`
`453`	`453`	`void OnCLPingReceived ( CHostAddress InetAddr, int iMs );`
`454`	`454`	`void OnCLTcpSupported ( CHostAddress InetAddr, int iID );`
`455`	`455`
`456`		`- void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient );`
	`456`	`+ void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode );`
`457`	`457`
`458`	`458`	`void OnCLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients );`
`459`	`459`
Original file line number	Diff line number	Diff line change
`@@ -202,15 +202,15 @@ public slots:`
`202`	`202`
`203`	`203`	`void OnNewLocalInputText ( QString strChatText ) { pClient->CreateChatTextMes ( strChatText ); }`
`204`	`204`
`205`		`- void OnReqServerListQuery ( CHostAddress InetAddr, bool bUseTcpClient ) { pClient->CreateCLReqServerListMes ( InetAddr, bUseTcpClient ); }`
	`205`	`+ void OnReqServerListQuery ( CHostAddress InetAddr, enum EProtoMode eProtoMode ) { pClient->CreateCLReqServerListMes ( InetAddr, eProtoMode ); }`
`206`	`206`
`207`	`207`	`void OnCreateCLServerListPingMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListPingMes ( InetAddr ); }`
`208`	`208`
`209`	`209`	`void OnCreateCLServerListReqVerAndOSMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListReqVerAndOSMes ( InetAddr ); }`
`210`	`210`
`211`		`- void OnCreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, bool bUseTcpClient )`
	`211`	`+ void OnCreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr, enum EProtoMode eProtoMode )`
`212`	`212`	`{`
`213`		`- pClient->CreateCLServerListReqConnClientsListMes ( InetAddr, bUseTcpClient );`
	`213`	`+ pClient->CreateCLServerListReqConnClientsListMes ( InetAddr, eProtoMode );`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`void OnCLServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo )`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CClientSettings* pSettings, CRpcServe`
`171`	`171`	`if ( NetworkUtil::ParseNetworkAddress ( jsonDirectoryIp.toString(), haDirectoryAddress, false ) )`
`172`	`172`	`{`
`173`	`173`	`// send the request for the server list`
`174`		`- pClient->CreateCLReqServerListMes ( haDirectoryAddress, false ); // UDP`
	`174`	`+ pClient->CreateCLReqServerListMes ( haDirectoryAddress, PROTO_UDP );`
`175`	`175`	`response["result"] = "ok";`
`176`	`176`	`}`
`177`	`177`	`else`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ void CConnectDlg::RequestServerList()`
`336`	`336`	`false ) )`
`337`	`337`	`{`
`338`	`338`	`// send the request for the server list`
`339`		`- emit ReqServerListQuery ( haDirectoryAddress, false ); // UDP`
	`339`	`+ emit ReqServerListQuery ( haDirectoryAddress, PROTO_UDP );`
`340`	`340`
`341`	`341`	`// start timer, if this message did not get any respond to retransmit`
`342`	`342`	`// the server list request message`
`@@ -379,7 +379,7 @@ void CConnectDlg::OnTimerReRequestServList()`
`379`	`379`	`{`
`380`	`380`	`// note that this is a connection less message which may get lost`
`381`	`381`	`// and therefore it makes sense to re-transmit it`
`382`		`- emit ReqServerListQuery ( haDirectoryAddress, false ); // UDP`
	`382`	`+ emit ReqServerListQuery ( haDirectoryAddress, PROTO_UDP );`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
`@@ -557,7 +557,7 @@ void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr, int iID )`
`557`	`557`	`if ( !bServerListReceived )`
`558`	`558`	`{`
`559`	`559`	`// send the request for the server list`
`560`		`- emit ReqServerListQuery ( InetAddr, true ); // TCP`
	`560`	`+ emit ReqServerListQuery ( InetAddr, PROTO_TCP_ONCE ); // Close TCP connection after receiving reply`
`561`	`561`	`}`
`562`	`562`	`break;`
`563`	`563`
`@@ -578,7 +578,7 @@ void CConnectDlg::SetTcpSupported ( const CHostAddress& InetAddr, int iID )`
`578`	`578`	`eFetchMode = CFM_TCP;`
`579`	`579`	`pCurListViewItem->setData ( LVC_CLIENTS, Qt::UserRole, eFetchMode ); // remember for future fetches`
`580`	`580`
`581`		`- emit CreateCLServerListReqConnClientsListMes ( InetAddr, true ); // TCP`
	`581`	`+ emit CreateCLServerListReqConnClientsListMes ( InetAddr, PROTO_TCP_ONCE ); // Close TCP connection after receiving reply`
`582`	`582`	`}`
`583`	`583`	`}`
`584`	`584`	`}`
`@@ -1045,7 +1045,7 @@ void CConnectDlg::SetPingTimeAndNumClientsResult ( const CHostAddress& InetAddr,`
`1045`	`1045`	`eFetchMode = CFM_UDP_REQUEST;`
`1046`	`1046`	`pCurListViewItem->setData ( LVC_CLIENTS, Qt::UserRole, eFetchMode );`
`1047`	`1047`	`}`
`1048`		`- emit CreateCLServerListReqConnClientsListMes ( InetAddr, eFetchMode == CFM_TCP ); // UDP or TCP`
	`1048`	`+ emit CreateCLServerListReqConnClientsListMes ( InetAddr, eFetchMode == CFM_TCP ? PROTO_TCP_ONCE : PROTO_UDP );`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`// this is the first time a ping time was received, set item to visible`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ void CProtocol::CreateAndImmSendConLessMessage ( const int iID,`
`636`	`636`	`const CVector<uint8_t>& vecData,`
`637`	`637`	`const CHostAddress& InetAddr,`
`638`	`638`	`CTcpConnection* pTcpConnection,`
`639`		`- bool bUseTcpClient )`
	`639`	`+ enum EProtoMode eProtoMode )`
`640`	`640`	`{`
`641`	`641`	`CVector<uint8_t> vecNewMessage;`
`642`	`642`
`@@ -645,7 +645,7 @@ void CProtocol::CreateAndImmSendConLessMessage ( const int iID,`
`645`	`645`	`GenMessageFrame ( vecNewMessage, 0, iID, vecData );`
`646`	`646`
`647`	`647`	`// immediately send message`
`648`		`- emit CLMessReadyForSending ( InetAddr, vecNewMessage, pTcpConnection, bUseTcpClient );`
	`648`	`+ emit CLMessReadyForSending ( InetAddr, vecNewMessage, pTcpConnection, eProtoMode );`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`void CProtocol::ParseMessageBody ( const CVector<uint8_t>& vecbyMesBodyData, const int iRecCounter, const int iRecID )`
`@@ -2262,9 +2262,9 @@ bool CProtocol::EvaluateCLRedServerListMes ( const CHostAddress& InetAddr, const`
`2262`	`2262`	`return false; // no error`
`2263`	`2263`	`}`
`2264`	`2264`
`2265`		`-void CProtocol::CreateCLReqServerListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )`
	`2265`	`+void CProtocol::CreateCLReqServerListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )`
`2266`	`2266`	`{`
`2267`		`- CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_SERVER_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, bUseTcpClient );`
	`2267`	`+ CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_SERVER_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, eProtoMode );`
`2268`	`2268`	`}`
`2269`	`2269`
`2270`	`2270`	`bool CProtocol::EvaluateCLReqServerListMes ( const CHostAddress& InetAddr, CTcpConnection* pTcpConnection )`
`@@ -2515,9 +2515,9 @@ bool CProtocol::EvaluateCLConnClientsListMes ( const CHostAddress& InetAddr, con`
`2515`	`2515`	`return false; // no error`
`2516`	`2516`	`}`
`2517`	`2517`
`2518`		`-void CProtocol::CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, bool bUseTcpClient )`
	`2518`	`+void CProtocol::CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr, enum EProtoMode eProtoMode )`
`2519`	`2519`	`{`
`2520`		`- CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_CONN_CLIENTS_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, bUseTcpClient );`
	`2520`	`+ CreateAndImmSendConLessMessage ( PROTMESSID_CLM_REQ_CONN_CLIENTS_LIST, CVector<uint8_t> ( 0 ), InetAddr, nullptr, eProtoMode );`
`2521`	`2521`	`}`
`2522`	`2522`
`2523`	`2523`	`bool CProtocol::EvaluateCLReqConnClientsListMes ( const CHostAddress& InetAddr, CTcpConnection* pTcpConnection )`
Original file line number	Diff line number	Diff line change
`@@ -477,9 +477,9 @@ void CServer::OnServerFull ( CHostAddress RecHostAddr )`
`477`	`477`	`ConnLessProtocol.CreateCLServerFullMes ( RecHostAddr );`
`478`	`478`	`}`
`479`	`479`
`480`		`-void CServer::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, bool bUseTcpClient )`
	`480`	`+void CServer::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage, CTcpConnection* pTcpConnection, enum EProtoMode eProtoMode )`
`481`	`481`	`{`
`482`		`- if ( bUseTcpClient )`
	`482`	`+ if ( eProtoMode != PROTO_UDP )`
`483`	`483`	`{`
`484`	`484`	`qWarning() << "Server send cannot use TCP client";`
`485`	`485`	`return;`