Merge pull request #1938 from softins/ipv6

IPv6 support, phase 1 (direct connection)
jamulussoftware · Aug 10, 2021 · 694473a · 694473a
2 parents 04457ba + 576d101
commit 694473a
Show file tree

Hide file tree

Showing 17 changed files with 363 additions and 108 deletions.
diff --git a/src/client.cpp b/src/client.cpp
@@ -31,6 +31,7 @@ CClient::CClient ( const quint16  iPortNumber,
                    const QString& strMIDISetup,
                    const bool     bNoAutoJackConnect,
                    const QString& strNClientName,
+                   const bool     bNEnableIPv6,
                    const bool     bNMuteMeInPersonalMix ) :
     ChannelInfo(),
     strClientName ( strNClientName ),
@@ -46,7 +47,7 @@ CClient::CClient ( const quint16  iPortNumber,
     bIsInitializationPhase ( true ),
     bMuteOutStream ( false ),
     fMuteOutStreamGain ( 1.0f ),
-    Socket ( &Channel, iPortNumber, iQosNumber ),
+    Socket ( &Channel, iPortNumber, iQosNumber, "", bNEnableIPv6 ),
     Sound ( AudioCallback, this, strMIDISetup, bNoAutoJackConnect, strNClientName ),
     iAudioInFader ( AUD_FADER_IN_MIDDLE ),
     bReverbOnLeftChan ( false ),
@@ -62,7 +63,8 @@ CClient::CClient ( const quint16  iPortNumber,
     eGUIDesign ( GD_ORIGINAL ),
     bEnableOPUS64 ( false ),
     bJitterBufferOK ( true ),
-    bNuteMeInPersonalMix ( bNMuteMeInPersonalMix ),
+    bEnableIPv6 ( bNEnableIPv6 ),
+    bMuteMeInPersonalMix ( bNMuteMeInPersonalMix ),
     iServerSockBufNumFrames ( DEF_NET_BUF_SIZE_NUM_BL ),
     pSignalHandler ( CSignalHandler::getSingletonP() )
 {
@@ -344,7 +346,7 @@ void CClient::SetRemoteChanGain ( const int iId, const float fGain, const bool b
 bool CClient::SetServerAddr ( QString strNAddr )
 {
     CHostAddress HostAddress;
-    if ( NetworkUtil().ParseNetworkAddress ( strNAddr, HostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( strNAddr, HostAddress, bEnableIPv6 ) )
     {
         // apply address to the channel
         Channel.SetAddress ( HostAddress );
@@ -706,7 +708,7 @@ void CClient::OnClientIDReceived ( int iChanID )
     // for headless mode we support to mute our own signal in the personal mix
     // (note that the check for headless is done in the main.cpp and must not
     // be checked here)
-    if ( bNuteMeInPersonalMix )
+    if ( bMuteMeInPersonalMix )
     {
         SetRemoteChanGain ( iChanID, 0, false );
     }

diff --git a/src/client.h b/src/client.h
@@ -113,6 +113,7 @@ class CClient : public QObject
               const QString& strMIDISetup,
               const bool     bNoAutoJackConnect,
               const QString& strNClientName,
+              const bool     bNEnableIPv6,
               const bool     bNMuteMeInPersonalMix );
 
     virtual ~CClient();
@@ -347,7 +348,8 @@ class CClient : public QObject
     bool       bEnableOPUS64;
 
     bool   bJitterBufferOK;
-    bool   bNuteMeInPersonalMix;
+    bool   bEnableIPv6;
+    bool   bMuteMeInPersonalMix;
     QMutex MutexDriverReinit;
 
     // server settings

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -32,12 +32,14 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
                          const bool       bNewShowComplRegConnList,
                          const bool       bShowAnalyzerConsole,
                          const bool       bMuteStream,
+                         const bool       bNEnableIPv6,
                          QWidget*         parent ) :
     CBaseDlg ( parent, Qt::Window ), // use Qt::Window to get min/max window buttons
     pClient ( pNCliP ),
     pSettings ( pNSetP ),
     bConnectDlgWasShown ( false ),
     bMIDICtrlUsed ( !strMIDISetup.isEmpty() ),
+    bEnableIPv6 ( bNEnableIPv6 ),
     eLastRecorderState ( RS_UNDEFINED ), // for SetMixerBoardDeco
     eLastDesign ( GD_ORIGINAL ),         //          "
     ClientSettingsDlg ( pNCliP, pNSetP, parent ),
@@ -560,12 +562,12 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     // Send the request to two servers for redundancy if either or both of them
     // has a higher release version number, the reply will trigger the notification.
 
-    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, bEnableIPv6 ) )
     {
         pClient->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
     }
 
-    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, bEnableIPv6 ) )
     {
         pClient->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
     }

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -81,6 +81,7 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
                  const bool       bNewShowComplRegConnList,
                  const bool       bShowAnalyzerConsole,
                  const bool       bMuteStream,
+                 const bool       bNEnableIPv6,
                  QWidget*         parent = nullptr );
 
 protected:
@@ -104,6 +105,7 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
     bool           bConnectDlgWasShown;
     bool           bMIDICtrlUsed;
     bool           bDetectFeedback;
+    bool           bEnableIPv6;
     ERecorderState eLastRecorderState;
     EGUIDesign     eLastDesign;
     QTimer         TimerSigMet;

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
@@ -25,7 +25,7 @@
 #include "connectdlg.h"
 
 /* Implementation *************************************************************/
-CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, QWidget* parent ) :
+CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, const bool bNEnableIPv6, QWidget* parent ) :
     CBaseDlg ( parent, Qt::Dialog ),
     pSettings ( pNSetP ),
     strSelectedAddress ( "" ),
@@ -35,7 +35,8 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteR
     bReducedServerListReceived ( false ),
     bServerListItemWasChosen ( false ),
     bListFilterWasActive ( false ),
-    bShowAllMusicians ( true )
+    bShowAllMusicians ( true ),
+    bEnableIPv6 ( bNEnableIPv6 )
 {
     setupUi ( this );
 
@@ -228,10 +229,13 @@ void CConnectDlg::RequestServerList()
     // function) when the connect dialog is opened, this seems to be the correct
     // time to do it. Note that in case of custom directory server address we
     // use iCustomDirectoryIndex as an index into the vector.
+
+    // Allow IPv4 only for communicating with Directory Servers
     if ( NetworkUtil().ParseNetworkAddress (
              NetworkUtil::GetCentralServerAddress ( pSettings->eCentralServerAddressType,
                                                     pSettings->vstrCentralServerAddress[pSettings->iCustomDirectoryIndex] ),
-             CentralServerAddress ) )
+             CentralServerAddress,
+             false ) )
     {
         // send the request for the server list
         emit ReqServerListQuery ( CentralServerAddress );
@@ -730,7 +734,9 @@ void CConnectDlg::OnTimerPing()
 
         // try to parse host address string which is stored as user data
         // in the server list item GUI control element
-        if ( NetworkUtil().ParseNetworkAddress ( lvwServers->topLevelItem ( iIdx )->data ( 0, Qt::UserRole ).toString(), CurServerAddress ) )
+        if ( NetworkUtil().ParseNetworkAddress ( lvwServers->topLevelItem ( iIdx )->data ( 0, Qt::UserRole ).toString(),
+                                                 CurServerAddress,
+                                                 bEnableIPv6 ) )
         {
             // if address is valid, send ping message using a new thread
             QtConcurrent::run ( this, &CConnectDlg::EmitCLServerListPingMes, CurServerAddress );
@@ -953,4 +959,4 @@ void CConnectDlg::UpdateDirectoryServerComboBox()
             cbxDirectoryServer->addItem ( pSettings->vstrCentralServerAddress[i], i );
         }
     }
-}
+}
diff --git a/src/connectdlg.h b/src/connectdlg.h
@@ -48,7 +48,7 @@ class CConnectDlg : public CBaseDlg, private Ui_CConnectDlgBase
     Q_OBJECT
 
 public:
-    CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, QWidget* parent = nullptr );
+    CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, const bool bNEnableIPv6, QWidget* parent = nullptr );
 
     void SetShowAllMusicians ( const bool bState ) { ShowAllMusicians ( bState ); }
     bool GetShowAllMusicians() { return bShowAllMusicians; }
@@ -90,6 +90,7 @@ class CConnectDlg : public CBaseDlg, private Ui_CConnectDlgBase
     bool         bServerListItemWasChosen;
     bool         bListFilterWasActive;
     bool         bShowAllMusicians;
+    bool         bEnableIPv6;
 
 public slots:
     void OnServerListItemDoubleClicked ( QTreeWidgetItem* Item, int );

diff --git a/src/global.h b/src/global.h
@@ -119,7 +119,8 @@ LED bar:      lbr
 // We just need a valid, public Internet IP here. We will not send any
 // traffic there as we will only set up an UDP socket without sending any
 // data.
-#define WELL_KNOWN_HOST   "1.1.1.1" // CloudFlare
+#define WELL_KNOWN_HOST   "1.1.1.1"              // CloudFlare
+#define WELL_KNOWN_HOST6  "2606:4700:4700::1111" // CloudFlare
 #define WELL_KNOWN_PORT   DEFAULT_PORT_NUMBER
 #define IP_LOOKUP_TIMEOUT 500 // ms
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -81,6 +81,7 @@ int main ( int argc, char** argv )
     bool         bNoAutoJackConnect          = false;
     bool         bUseTranslation             = true;
     bool         bCustomPortNumberGiven      = false;
+    bool         bEnableIPv6                 = false;
     int          iNumServerChannels          = DEFAULT_USED_NUM_CHANNELS;
     quint16      iPortNumber                 = DEFAULT_PORT_NUMBER;
     quint16      iQosNumber                  = DEFAULT_QOS_NUMBER;
@@ -179,6 +180,15 @@ int main ( int argc, char** argv )
             continue;
         }
 
+        // Enable IPv6 ---------------------------------------------------------
+        if ( GetFlagArgument ( argv, i, "-6", "--enableipv6" ) )
+        {
+            bEnableIPv6 = true;
+            qInfo() << "- IPv6 enabled";
+            CommandLineOptions << "--enableipv6";
+            continue;
+        }
+
         // Server only:
 
         // Disconnect all clients on quit --------------------------------------
@@ -784,8 +794,14 @@ int main ( int argc, char** argv )
         {
             // Client:
             // actual client object
-            CClient
-                Client ( iPortNumber, iQosNumber, strConnOnStartupAddress, strMIDISetup, bNoAutoJackConnect, strClientName, bMuteMeInPersonalMix );
+            CClient Client ( iPortNumber,
+                             iQosNumber,
+                             strConnOnStartupAddress,
+                             strMIDISetup,
+                             bNoAutoJackConnect,
+                             strClientName,
+                             bEnableIPv6,
+                             bMuteMeInPersonalMix );
 
             // load settings from init-file (command line options override)
             CClientSettings Settings ( &Client, strIniFileName );
@@ -809,6 +825,7 @@ int main ( int argc, char** argv )
                                        bShowComplRegConnList,
                                        bShowAnalyzerConsole,
                                        bMuteStream,
+                                       bEnableIPv6,
                                        nullptr );
 
                 // show dialog
@@ -846,6 +863,7 @@ int main ( int argc, char** argv )
                              bUseMultithreading,
                              bDisableRecording,
                              bDelayPan,
+                             bEnableIPv6,
                              eLicenceType );
 
 #ifndef HEADLESS
@@ -937,6 +955,7 @@ QString UsageArguments ( char** argv )
            "  -Q, --qos             set the QoS value. Default is 128. Disable with 0\n"
            "                        (see the Jamulus website to enable QoS on Windows)\n"
            "  -t, --notranslation   disable translation (use English language)\n"
+           "  -6, --enableipv6      enable IPv6 addressing (IPv4 is always enabled)\n"
            "\n"
            "Server only:\n"
            "  -d, --discononquit    disconnect all clients on quit\n"

diff --git a/src/server.cpp b/src/server.cpp
@@ -230,11 +230,12 @@ CServer::CServer ( const int          iNewMaxNumChan,
                    const bool         bNUseMultithreading,
                    const bool         bDisableRecording,
                    const bool         bNDelayPan,
+                   const bool         bNEnableIPv6,
                    const ELicenceType eNLicenceType ) :
     bUseDoubleSystemFrameSize ( bNUseDoubleSystemFrameSize ),
     bUseMultithreading ( bNUseMultithreading ),
     iMaxNumChannels ( iNewMaxNumChan ),
-    Socket ( this, iPortNumber, iQosNumber, strServerBindIP ),
+    Socket ( this, iPortNumber, iQosNumber, strServerBindIP, bNEnableIPv6 ),
     Logging(),
     iFrameCount ( 0 ),
     bWriteStatusHTMLFile ( false ),
@@ -247,11 +248,13 @@ CServer::CServer ( const int          iNewMaxNumChan,
                         strServerPublicIP,
                         strServerListFilter,
                         iNewMaxNumChan,
+                        bNEnableIPv6,
                         &ConnLessProtocol ),
     JamController ( this ),
     bDisableRecording ( bDisableRecording ),
     bAutoRunMinimized ( false ),
     bDelayPan ( bNDelayPan ),
+    bEnableIPv6 ( bNEnableIPv6 ),
     eLicenceType ( eNLicenceType ),
     bDisconnectAllClientsOnQuit ( bNDisconnectAllClientsOnQuit ),
     pSignalHandler ( CSignalHandler::getSingletonP() )

diff --git a/src/server.h b/src/server.h
@@ -170,6 +170,7 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
               const bool         bNUseMultithreading,
               const bool         bDisableRecording,
               const bool         bNDelayPan,
+              const bool         bNEnableIPv6,
               const ELicenceType eNLicenceType );
 
     virtual ~CServer();
@@ -209,6 +210,9 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
     void SetEnableDelayPanning ( bool bDelayPanningOn ) { bDelayPan = bDelayPanningOn; }
     bool IsDelayPanningEnabled() { return bDelayPan; }
 
+    // IPv6 Enabled
+    bool IsIPv6Enabled() { return bEnableIPv6; }
+
     // Server list management --------------------------------------------------
     void UpdateServerList() { ServerListManager.Update(); }
 
@@ -368,6 +372,9 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
     // for delay panning
     bool bDelayPan;
 
+    // enable IPv6
+    bool bEnableIPv6;
+
     // messaging
     QString      strWelcomeMessage;
     ELicenceType eLicenceType;

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
@@ -433,12 +433,12 @@ lvwClients->setMinimumHeight ( 140 );
     // Send the request to two servers for redundancy if either or both of them
     // has a higher release version number, the reply will trigger the notification.
 
-    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Enabled() ) )
     {
         pServer->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
     }
 
-    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress ) )
+    if ( NetworkUtil().ParseNetworkAddress ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Enabled() ) )
     {
         pServer->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
     }