Add --enabletcp option for server

Author: softins

src/main.cpp

@@ -96,6 +96,7 @@ int main ( int argc, char** argv )
     bool         bUseTranslation             = true;
     bool         bCustomPortNumberGiven      = false;
     bool         bEnableIPv6                 = false;
+    bool         bEnableTcp                  = false;
     int          iNumServerChannels          = DEFAULT_USED_NUM_CHANNELS;
     quint16      iPortNumber                 = DEFAULT_PORT_NUMBER;
     int          iJsonRpcPortNumber          = INVALID_PORT;
@@ -251,6 +252,16 @@ int main ( int argc, char** argv )
 
         // Server only:
 
+        // Enable TCP server ---------------------------------------------------
+        if ( GetFlagArgument ( argv, i, "--enabletcp", "--enabletcp" ) )
+        {
+            bEnableTcp = true;
+            qInfo() << "- TCP server enabled";
+            CommandLineOptions << "--enabletcp";
+            ServerOnlyOptions << "--enabletcp";
+            continue;
+        }
+
         // Disconnect all clients on quit --------------------------------------
         if ( GetFlagArgument ( argv, i, "-d", "--discononquit" ) )
         {
@@ -993,6 +1004,7 @@ int main ( int argc, char** argv )
                              bDisableRecording,
                              bDelayPan,
                              bEnableIPv6,
+                             bEnableTcp,
                              eLicenceType );
 
 #ifndef NO_JSON_RPC
@@ -1117,6 +1129,7 @@ QString UsageArguments ( char** argv )
            "      --norecord          set server not to record by default when recording is configured\n"
            "  -s, --server            start Server\n"
            "      --serverbindip      IP address the Server will bind to (rather than all)\n"
+           "      --enabletcp         enable TCP server for Jamulus protocol\n"
            "  -T, --multithreading    use multithreading to make better use of\n"
            "                          multi-core CPUs and support more Clients\n"
            "  -u, --numchannels       maximum number of channels\n"

src/server.cpp

@@ -44,6 +44,7 @@ CServer::CServer ( const int          iNewMaxNumChan,
                    const bool         bDisableRecording,
                    const bool         bNDelayPan,
                    const bool         bNEnableIPv6,
+                   const bool         bNEnableTcp,
                    const ELicenceType eNLicenceType ) :
     bUseDoubleSystemFrameSize ( bNUseDoubleSystemFrameSize ),
     bUseMultithreading ( bNUseMultithreading ),
@@ -69,6 +70,7 @@ CServer::CServer ( const int          iNewMaxNumChan,
     bAutoRunMinimized ( false ),
     bDelayPan ( bNDelayPan ),
     bEnableIPv6 ( bNEnableIPv6 ),
+    bEnableTcp ( bNEnableTcp ),
     eLicenceType ( eNLicenceType ),
     bDisconnectAllClientsOnQuit ( bNDisconnectAllClientsOnQuit ),
     pSignalHandler ( CSignalHandler::getSingletonP() )

src/server.h

@@ -104,6 +104,7 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
               const bool         bDisableRecording,
               const bool         bNDelayPan,
               const bool         bNEnableIPv6,
+              const bool         bNEnableTcp,
               const ELicenceType eNLicenceType );
 
     virtual ~CServer();
@@ -299,6 +300,9 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
     // enable IPv6
     bool bEnableIPv6;
 
+    // enable TCP Server
+    bool bEnableTcp;
+
     // messaging
     QString      strWelcomeMessage;
     ELicenceType eLicenceType;