Skip to content

Auto-enable IPv6 by default, unless disabled #3720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softins merged 6 commits into from
Jun 6, 2026
+182 −135
Merged

Auto-enable IPv6 by default, unless disabled #3720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cffbe23
Auto-enable IPv6 by default, unless disabled
softins May 30, 2026
10967ea
Issue warning if --serverbindip given for a dual-protocol socket
softins May 31, 2026
05ce429
Add some clarifications to usage message
softins May 31, 2026
74584ee
Fix for re-calling Init() in iOS
softins Jun 1, 2026
a65ecf3
Terminology: change dual-protocol to dual-stack
softins Jun 2, 2026
16c242b
Accept deprecated -6 and --enableipv6 with warning and no action
softins Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ CClient::CClient ( const quint16 iPortNumber,
const QString& strConnOnStartupAddress,
const bool bNoAutoJackConnect,
const QString& strNClientName,
const bool bNEnableIPv6,
const bool bNDisableIPv6,
const bool bNMuteMeInPersonalMix ) :
ChannelInfo(),
strClientName ( strNClientName ),
Expand All @@ -72,7 +72,8 @@ CClient::CClient ( const quint16 iPortNumber,
bIsInitializationPhase ( true ),
bMuteOutStream ( false ),
fMuteOutStreamGain ( 1.0f ),
Socket ( &Channel, iPortNumber, iQosNumber, "", bNEnableIPv6 ),
bIPv6Available ( false ),
Comment thread
ann0see marked this conversation as resolved.
Socket ( &Channel, iPortNumber, iQosNumber, "", bNDisableIPv6, bIPv6Available ),
Sound ( AudioCallback, this, bNoAutoJackConnect, strNClientName ),
iAudioInFader ( AUD_FADER_IN_MIDDLE ),
bReverbOnLeftChan ( false ),
Expand All @@ -90,7 +91,6 @@ CClient::CClient ( const quint16 iPortNumber,
bEnableAudioAlerts ( false ),
bEnableOPUS64 ( false ),
bJitterBufferOK ( true ),
bEnableIPv6 ( bNEnableIPv6 ),
bMuteMeInPersonalMix ( bNMuteMeInPersonalMix ),
iServerSockBufNumFrames ( DEF_NET_BUF_SIZE_NUM_BL ),
bRawAudioIsSupported ( false )
Expand Down Expand Up @@ -621,7 +621,7 @@ void CClient::SetRemoteChanPan ( const int iId, const float fPan )
bool CClient::SetServerAddr ( QString strNAddr )
{
CHostAddress HostAddress;
if ( NetworkUtil::ParseNetworkAddress ( strNAddr, HostAddress, bEnableIPv6 ) )
if ( NetworkUtil::ParseNetworkAddress ( strNAddr, HostAddress, bIPv6Available ) )
{
// apply address to the channel
Channel.SetAddress ( HostAddress );
Expand Down
10 changes: 7 additions & 3 deletions src/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class CClient : public QObject
const QString& strConnOnStartupAddress,
const bool bNoAutoJackConnect,
const QString& strNClientName,
const bool bNEnableIPv6,
const bool bNDisableIPv6,
const bool bNMuteMeInPersonalMix );

virtual ~CClient();
Expand All @@ -164,6 +164,9 @@ class CClient : public QObject
bool IsCallbackEntered() const { return Sound.IsCallbackEntered(); }
bool SetServerAddr ( QString strNAddr );

// IPv6 Available
bool IsIPv6Available() { return bIPv6Available; }

double GetLevelForMeterdBLeft() { return SignalLevelMeter.GetLevelForMeterdBLeftOrMono(); }
double GetLevelForMeterdBRight() { return SignalLevelMeter.GetLevelForMeterdBRight(); }

Expand Down Expand Up @@ -391,7 +394,9 @@ class CClient : public QObject
float fMuteOutStreamGain;
CVector<unsigned char> vecCeltData;

CHighPrioSocket Socket;
bool bIPv6Available; // must be before Socket - passed by reference to Socket
CHighPrioSocket Socket;

CSound Sound;
CStereoSignalLevelMeter SignalLevelMeter;

Expand Down Expand Up @@ -427,7 +432,6 @@ class CClient : public QObject
bool bEnableOPUS64;

bool bJitterBufferOK;
bool bEnableIPv6;
bool bMuteMeInPersonalMix;
QMutex MutexDriverReinit;

Expand Down
8 changes: 3 additions & 5 deletions src/clientdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,17 @@ 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 ),
bDetectFeedback ( false ),
bEnableIPv6 ( bNEnableIPv6 ),
eLastRecorderState ( RS_UNDEFINED ), // for SetMixerBoardDeco
eLastDesign ( GD_DEFAULT ), // "
ClientSettingsDlg ( pNCliP, pNSetP, parent ),
ChatDlg ( parent ),
ConnectDlg ( pNSetP, bNewShowComplRegConnList, bNEnableIPv6, parent ),
ConnectDlg ( pNCliP, pNSetP, bNewShowComplRegConnList, parent ),
AnalyzerConsole ( pNCliP, parent )
{
setupUi ( this );
Expand Down Expand Up @@ -619,12 +617,12 @@ CClientDlg::CClientDlg ( CClient* pNCliP,

// Don't use SRV resolution when resolving update servers.

if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, bEnableIPv6 ) )
if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, pClient->IsIPv6Available() ) )
{
pClient->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
}

if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, bEnableIPv6 ) )
if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, pClient->IsIPv6Available() ) )
{
pClient->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
}
Expand Down
2 changes: 0 additions & 2 deletions src/clientdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
const bool bNewShowComplRegConnList,
const bool bShowAnalyzerConsole,
const bool bMuteStream,
const bool bNEnableIPv6,
QWidget* parent = nullptr );

protected:
Expand All @@ -130,7 +129,6 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
bool bConnected;
bool bConnectDlgWasShown;
bool bDetectFeedback;
bool bEnableIPv6;
ERecorderState eLastRecorderState;
EGUIDesign eLastDesign;
QTimer TimerSigMet;
Expand Down
10 changes: 6 additions & 4 deletions src/connectdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,9 @@ bool CMappedTreeWidgetItem::operator<( const QTreeWidgetItem& other ) const
return lhs.toString() < rhs.toString();
}

CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, const bool bNEnableIPv6, QWidget* parent ) :
CConnectDlg::CConnectDlg ( CClient* pNCliP, CClientSettings* pNSetP, const bool bNewShowCompleteRegList, QWidget* parent ) :
CBaseDlg ( parent, Qt::Dialog ),
pClient ( pNCliP ),
pSettings ( pNSetP ),
strSelectedAddress ( "" ),
strSelectedServerName ( "" ),
Expand All @@ -132,8 +133,7 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteR
bReducedServerListReceived ( false ),
bServerListItemWasChosen ( false ),
bListFilterWasActive ( false ),
bShowAllMusicians ( true ),
bEnableIPv6 ( bNEnableIPv6 )
bShowAllMusicians ( true )
{
setupUi ( this );

Expand Down Expand Up @@ -892,7 +892,9 @@ void CConnectDlg::OnTimerPing()
// try to parse host address string which is stored as user data
// in the server list item GUI control element
// the data to be parsed is just IP:port, so no SRV discovery is needed
if ( NetworkUtil::ParseNetworkAddressBare ( pCurListViewItem->data ( LVC_NAME, Qt::UserRole ).toString(), haServerAddress, bEnableIPv6 ) )
if ( NetworkUtil::ParseNetworkAddressBare ( pCurListViewItem->data ( LVC_NAME, Qt::UserRole ).toString(),
haServerAddress,
pClient->IsIPv6Available() ) )
{
// if address is valid, send ping message using a new thread
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
Expand Down
4 changes: 2 additions & 2 deletions src/connectdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class CConnectDlg : public CBaseDlg, private Ui_CConnectDlgBase
Q_OBJECT

public:
CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteRegList, const bool bNEnableIPv6, QWidget* parent = nullptr );
CConnectDlg ( CClient* pNCliP, CClientSettings* pNSetP, const bool bNewShowCompleteRegList, QWidget* parent = nullptr );

void SetShowAllMusicians ( const bool bState ) { ShowAllMusicians ( bState ); }
bool GetShowAllMusicians() { return bShowAllMusicians; }
Expand Down Expand Up @@ -127,6 +127,7 @@ class CConnectDlg : public CBaseDlg, private Ui_CConnectDlgBase
void EmitCLServerListPingMes ( const CHostAddress& haServerAddress, const bool bNeedVersion );
void UpdateDirectoryComboBox();

CClient* pClient;
CClientSettings* pSettings;

QTimer TimerPing;
Expand All @@ -141,7 +142,6 @@ class CConnectDlg : public CBaseDlg, private Ui_CConnectDlgBase
bool bServerListItemWasChosen;
bool bListFilterWasActive;
bool bShowAllMusicians;
bool bEnableIPv6;

public slots:
void OnServerListItemDoubleClicked ( QTreeWidgetItem* Item, int );
Expand Down
35 changes: 20 additions & 15 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ int main ( int argc, char** argv )
bool bNoAutoJackConnect = false;
bool bUseTranslation = true;
bool bCustomPortNumberGiven = false;
bool bEnableIPv6 = false;
bool bDisableIPv6 = false;
int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS;
quint16 iPortNumber = DEFAULT_PORT_NUMBER;
int iJsonRpcPortNumber = INVALID_PORT;
Expand Down Expand Up @@ -262,11 +262,19 @@ int main ( int argc, char** argv )
continue;
}

// Disable IPv6 ---------------------------------------------------------
if ( GetFlagArgument ( argv, i, "--noipv6", "--noipv6" ) )
Comment thread
ann0see marked this conversation as resolved.
{
bDisableIPv6 = true;
qInfo() << "- IPv6 disabled";
Comment thread
ann0see marked this conversation as resolved.
CommandLineOptions << "--noipv6";
continue;
}

// Enable IPv6 ---------------------------------------------------------
if ( GetFlagArgument ( argv, i, "-6", "--enableipv6" ) )
Copy link
Copy Markdown
Collaborator

@pljones pljones Jun 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I think we should leave --enableipv6 available initially -- with a warning that it's deprecated (and non-functional) now that it's the default.

This will ease transition -- i.e. server operators taking the latest version will not have to rewrite their start up files just because of this.

Copy link
Copy Markdown
Member Author

@softins softins Jun 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll add an update

Copy link
Copy Markdown
Member Author

@softins softins Jun 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

 $ ./Jamulus -s -n -6
- server mode chosen
- no GUI mode chosen
IPv6 is now enabled by default: -6 and --enableipv6 are ignored and deprecated
IPv6/IPv4 dual-stack socket created
...

Copy link
Copy Markdown
Member Author

@softins softins Jun 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, they are not ignored - they make it output that message! I'll change it to say

IPv6 is now enabled by default: -6 and --enableipv6 have no effect and are deprecated

{
bEnableIPv6 = true;
qInfo() << "- IPv6 enabled";
qWarning() << "IPv6 is now enabled by default: -6 and --enableipv6 have no effect and are deprecated";
CommandLineOptions << "--enableipv6";
continue;
}
Expand Down Expand Up @@ -943,7 +951,8 @@ int main ( int argc, char** argv )
#ifndef SERVER_ONLY
if ( bIsClient )
{
CClient Client ( iPortNumber, iQosNumber, strConnOnStartupAddress, bNoAutoJackConnect, strClientName, bEnableIPv6, bMuteMeInPersonalMix );
CClient
Client ( iPortNumber, iQosNumber, strConnOnStartupAddress, bNoAutoJackConnect, strClientName, bDisableIPv6, bMuteMeInPersonalMix );

// Create Settings with the client pointer
CClientSettings Settings ( &Client, strIniFileName );
Expand All @@ -968,14 +977,8 @@ int main ( int argc, char** argv )
}

// GUI object
CClientDlg ClientDlg ( &Client,
&Settings,
strConnOnStartupAddress,
bShowComplRegConnList,
bShowAnalyzerConsole,
bMuteStream,
bEnableIPv6,
nullptr );
CClientDlg
ClientDlg ( &Client, &Settings, strConnOnStartupAddress, bShowComplRegConnList, bShowAnalyzerConsole, bMuteStream, nullptr );

// show dialog
ClientDlg.show();
Expand Down Expand Up @@ -1014,7 +1017,7 @@ int main ( int argc, char** argv )
bUseMultithreading,
bDisableRecording,
bDelayPan,
bEnableIPv6,
bDisableIPv6,
eLicenceType );

#ifndef NO_JSON_RPC
Expand Down Expand Up @@ -1116,7 +1119,8 @@ 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"
" --noipv6 disable IPv6 addressing (IPv4 is always enabled)\n"
Comment thread
ann0see marked this conversation as resolved.
" (recommended to leave IPv6 enabled by default)\n"
"\n"
"Server only:\n"
" -d, --discononquit disconnect all Clients on quit\n"
Expand All @@ -1138,7 +1142,8 @@ QString UsageArguments ( char** argv )
" --norecord set server not to record by default when recording is configured\n"
" --noraw disable raw audio\n"
" -s, --server start Server\n"
" --serverbindip IP address the Server will bind to (rather than all)\n"
" --serverbindip IPv4 address the Server will bind to (rather than all)\n"
" (only works if IPv6 is unavailable or disabled with --noipv6)\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"
Expand Down
10 changes: 5 additions & 5 deletions src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,31 +65,31 @@ CServer::CServer ( const int iNewMaxNumChan,
const bool bNUseMultithreading,
const bool bDisableRecording,
const bool bNDelayPan,
const bool bNEnableIPv6,
const bool bNDisableIPv6,
const ELicenceType eNLicenceType ) :
bUseDoubleSystemFrameSize ( bNUseDoubleSystemFrameSize ),
bUseMultithreading ( bNUseMultithreading ),
iMaxNumChannels ( iNewMaxNumChan ),
iCurNumChannels ( 0 ),
bDisableRaw ( bNDisableRaw ),
Socket ( this, iPortNumber, iQosNumber, strServerBindIP, bNEnableIPv6 ),
bIPv6Available ( false ),
Socket ( this, iPortNumber, iQosNumber, strServerBindIP, bNDisableIPv6, bIPv6Available ),
Logging(),
iFrameCount ( 0 ),
HighPrecisionTimer ( bNUseDoubleSystemFrameSize ),
ServerListManager ( iPortNumber,
ServerListManager ( this,
iPortNumber,
strDirectoryAddress,
strServerListFileName,
strServerInfo,
strServerPublicIP,
strServerListFilter,
iNewMaxNumChan,
bNEnableIPv6,
&ConnLessProtocol ),
JamController ( this ),
bDisableRecording ( bDisableRecording ),
bAutoRunMinimized ( false ),
bDelayPan ( bNDelayPan ),
bEnableIPv6 ( bNEnableIPv6 ),
eLicenceType ( eNLicenceType ),
bDisconnectAllClientsOnQuit ( bNDisconnectAllClientsOnQuit ),
pSignalHandler ( CSignalHandler::getSingletonP() )
Expand Down
10 changes: 4 additions & 6 deletions src/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
const bool bNUseMultithreading,
const bool bDisableRecording,
const bool bNDelayPan,
const bool bNEnableIPv6,
const bool bNDisableIPv6,
const ELicenceType eNLicenceType );

virtual ~CServer();
Expand All @@ -146,8 +146,8 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>

void CreateCLServerListReqVerAndOSMes ( const CHostAddress& InetAddr ) { ConnLessProtocol.CreateCLReqVersionAndOSMes ( InetAddr ); }

// IPv6 Enabled
bool IsIPv6Enabled() { return bEnableIPv6; }
// IPv6 Available
bool IsIPv6Available() { return bIPv6Available; }

// GUI settings ------------------------------------------------------------
int GetClientNumAudioChannels ( const int iChanNum ) { return vecChannels[iChanNum].GetNumAudioChannels(); }
Expand Down Expand Up @@ -291,6 +291,7 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
CVector<uint16_t> vecChannelLevels;

// actual working objects
bool bIPv6Available; // must be before Socket - passed by reference to Socket
CHighPrioSocket Socket;

// logging
Expand All @@ -314,9 +315,6 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
// for delay panning
bool bDelayPan;

// enable IPv6
bool bEnableIPv6;

// messaging
QString strWelcomeMessage;
ELicenceType eLicenceType;
Expand Down
4 changes: 2 additions & 2 deletions src/serverdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,12 +506,12 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b

// Don't use SRV resolution when resolving update servers.

if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Enabled() ) )
if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK1_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Available() ) )
{
pServer->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
}

if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Enabled() ) )
if ( NetworkUtil::ParseNetworkAddressBare ( UPDATECHECK2_ADDRESS, UpdateServerHostAddress, pServer->IsIPv6Available() ) )
{
pServer->CreateCLServerListReqVerAndOSMes ( UpdateServerHostAddress );
}
Expand Down
Loading
Loading