Add connection-less message to query enabled server features

Author: dingodoppelt

src/protocol.cpp

@@ -437,6 +437,19 @@ CONNECTION LESS MESSAGES
           five times for one registration request at 500ms intervals.
           Beyond this, it should "ping" every 15 minutes
           (standard re-registration timeout).
+
+
+- PROTMESSID_CLM_SERVER_INFO: Bitmask of enabled server features
+
+    +------------------+
+    | 4 bytes number n |
+    +------------------+
+
+
+- PROTMESSID_CLM_REQ_SERVER_INFO: Request bitmask of enabled server features
+
+    note: does not have any data -> n = 0
+
 */
 
 #include "protocol.h"
@@ -925,6 +938,10 @@ void CProtocol::ParseConnectionLessMessageBody ( const CVector<uint8_t>& vecbyMe
     case PROTMESSID_CLM_REGISTER_SERVER_RESP:
         EvaluateCLRegisterServerResp ( InetAddr, vecbyMesBodyData );
         break;
+
+    case PROTMESSID_CLM_REQ_SERVER_INFO:
+        EvaluateCLReqServerInfoMes ( InetAddr );
+        break;
     }
 }
 
@@ -2598,6 +2615,24 @@ bool CProtocol::EvaluateCLRegisterServerResp ( const CHostAddress& InetAddr, con
     return false; // no error
 }
 
+bool CProtocol::EvaluateCLReqServerInfoMes ( const CHostAddress& InetAddr )
+{
+    // invoke message action
+    emit CLReqServerInfo ( InetAddr );
+
+    return false; // no error
+}
+
+void CProtocol::CreateCLServerInfoMes ( const CHostAddress& InetAddr, const uint32_t iFeatures )
+{
+    int              iPos = 0; // init position pointer
+    CVector<uint8_t> vecData ( 1 );
+
+    PutValOnStream ( vecData, iPos, iFeatures, 4 );
+
+    CreateAndImmSendConLessMessage ( PROTMESSID_CLM_SERVER_INFO, vecData, InetAddr );
+}
+
 /******************************************************************************\
 * Message generation and parsing                                               *
 \******************************************************************************/

src/protocol.h

@@ -84,6 +84,8 @@
 #define PROTMESSID_CLM_REGISTER_SERVER_RESP   1016 // status of server registration request
 #define PROTMESSID_CLM_REGISTER_SERVER_EX     1017 // register server with extended information
 #define PROTMESSID_CLM_RED_SERVER_LIST        1018 // reduced server list
+#define PROTMESSID_CLM_SERVER_INFO            1019 // server info message
+#define PROTMESSID_CLM_REQ_SERVER_INFO        1020 // request server info
 
 // special IDs
 #define PROTMESSID_SPECIAL_SPLIT_MESSAGE 2001 // a container for split messages
@@ -155,6 +157,7 @@ class CProtocol : public QObject
     void CreateCLReqConnClientsListMes ( const CHostAddress& InetAddr );
     void CreateCLChannelLevelListMes ( const CHostAddress& InetAddr, const CVector<uint16_t>& vecLevelList, const int iNumClients );
     void CreateCLRegisterServerResp ( const CHostAddress& InetAddr, const ESvrRegResult eResult );
+    void CreateCLServerInfoMes ( const CHostAddress& InetAddr, const uint32_t iResult );
 
     static bool ParseMessageFrame ( const CVector<uint8_t>& vecbyData,
                                     const int               iNumBytesIn,
@@ -282,6 +285,7 @@ class CProtocol : public QObject
     bool EvaluateCLReqConnClientsListMes ( const CHostAddress& InetAddr );
     bool EvaluateCLChannelLevelListMes ( const CHostAddress& InetAddr, const CVector<uint8_t>& vecData );
     bool EvaluateCLRegisterServerResp ( const CHostAddress& InetAddr, const CVector<uint8_t>& vecData );
+    bool EvaluateCLReqServerInfoMes ( const CHostAddress& InetAddr );
 
     int iOldRecID;
     int iOldRecCnt;
@@ -349,4 +353,5 @@ public slots:
     void CLReqConnClientsList ( CHostAddress InetAddr );
     void CLChannelLevelListReceived ( CHostAddress InetAddr, CVector<uint16_t> vecLevelList );
     void CLRegisterServerResp ( CHostAddress InetAddr, ESvrRegResult eStatus );
+    void CLReqServerInfo ( CHostAddress InetAddr );
 };

src/server.cpp

@@ -23,6 +23,7 @@
 \******************************************************************************/
 
 #include "server.h"
+#include "util.h"
 
 // CServer implementation ******************************************************
 CServer::CServer ( const int          iNewMaxNumChan,
@@ -269,6 +270,8 @@ CServer::CServer ( const int          iNewMaxNumChan,
 
     QObject::connect ( &ConnLessProtocol, &CProtocol::CLReqConnClientsList, this, &CServer::OnCLReqConnClientsList );
 
+    QObject::connect ( &ConnLessProtocol, &CProtocol::CLReqServerInfo, this, &CServer::OnCLReqServerInfo );
+
     QObject::connect ( &ServerListManager, &CServerListManager::SvrRegStatusChanged, this, &CServer::SvrRegStatusChanged );
 
     QObject::connect ( &JamController, &recorder::CJamController::RestartRecorder, this, &CServer::RestartRecorder );
@@ -450,6 +453,22 @@ void CServer::OnNewConnection ( int iChID, int iTotChans, CHostAddress RecHostAd
     Logging.AddNewConnection ( RecHostAddr.InetAddr, iTotChans );
 }
 
+void CServer::OnCLReqServerInfo ( CHostAddress RecHostAddr )
+{
+    uint32_t iFeatures = 0;
+
+    iFeatures |= (bUseDoubleSystemFrameSize                             << 0);
+    iFeatures |= (bUseMultithreading                                    << 1);
+    iFeatures |= (GetRecorderInitialised()                              << 2);
+    iFeatures |= (GetDisableRecording()                                 << 3);
+    iFeatures |= ((JamController.GetRecorderState() != RS_RECORDING)    << 4);
+    iFeatures |= (bDelayPan                                             << 5);
+    iFeatures |= (bEnableIPv6                                           << 6);
+    // iFeatures |= (bDisableRaw              << 5);
+
+    ConnLessProtocol.CreateCLServerInfoMes ( RecHostAddr, iFeatures );
+}
+
 void CServer::OnServerFull ( CHostAddress RecHostAddr )
 {
     // note: no mutex required here

src/server.h

@@ -376,6 +376,8 @@ public slots:
 
     void OnCLUnregisterServerReceived ( CHostAddress InetAddr ) { ServerListManager.Remove ( InetAddr ); }
 
+    void OnCLReqServerInfo ( CHostAddress InetAddr );
+
     void OnCLDisconnection ( CHostAddress InetAddr );
 
     void OnAboutToQuit();