Skip to content

Commit

Permalink
Client: Add SRV-based virtual hosting support
Browse files Browse the repository at this point in the history
When connecting to host names without port (e.g. example.org), the
client will now perform an SRV lookup to _jamulus._udp.example.org.
If this lookup returns exactly one result, the result is used to select
the actual target address/port.

If the lookup does not return a usable result, the regular connect logic
kicks in (A lookup, default port).

Related: https://github.com/orgs/jamulussoftware/discussions/1772
  • Loading branch information
hoffie committed Oct 30, 2022
1 parent 24adc20 commit 4ccd0b4
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,11 @@ void CClient::StartDelayTimer()
bool CClient::SetServerAddr ( QString strNAddr )
{
CHostAddress HostAddress;
#ifdef CLIENT_NO_SRV_CONNECT
if ( NetworkUtil().ParseNetworkAddress ( strNAddr, HostAddress, bEnableIPv6 ) )
#else
if ( NetworkUtil().ParseNetworkAddressWithSrvDiscovery ( strNAddr, HostAddress, bEnableIPv6 ) )
#endif
{
// apply address to the channel
Channel.SetAddress ( HostAddress );
Expand Down
68 changes: 68 additions & 0 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,74 @@ bool NetworkUtil::ParseNetworkAddressString ( QString strAddress, QHostAddress&
return false;
}

#ifndef CLIENT_NO_SRV_CONNECT
bool NetworkUtil::ParseNetworkAddressSrv ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 )
{
// init requested host address with invalid address first
HostAddress = CHostAddress();

QRegularExpression plainHostRegex ( "^([^\\[:0-9.][^:]*)$" );
if ( plainHostRegex.match ( strAddress ).capturedStart() != 0 )
{
// not a plain hostname? then don't attempt SRV lookup and fail
// immediately.
return false;
}

QDnsLookup* dns = new QDnsLookup();
dns->setType ( QDnsLookup::SRV );
dns->setName ( QString ( "_jamulus._udp.%1" ).arg ( strAddress ) );
dns->lookup();
// QDnsLookup::lookup() works asynchronously. Therefore, wait for
// it to complete here by resuming the main loop here.
// This is not nice and blocks the UI, but is similar to what
// the regular resolve function does as well.
QTime dieTime = QTime::currentTime().addMSecs ( DNS_SRV_RESOLVE_TIMEOUT_MS );
while ( QTime::currentTime() < dieTime && !dns->isFinished() )
{
QCoreApplication::processEvents ( QEventLoop::ExcludeUserInputEvents, 100 );
}
QList<QDnsServiceRecord> records = dns->serviceRecords();
dns->deleteLater();
if ( records.length() != 1 )
{
return false;
}
QDnsServiceRecord record = records.first();
if ( record.target() == "." || record.target() == "" )
{
// RFC2782 says that "." indicates that the service is not available.
// (Qt strips the trailing dot, which is why we check for empty string
// as well)
// Therefore, end processing here (= return true), but pass back an
// invalid HostAddress to let the connect logic fail properly.
HostAddress = CHostAddress ( QHostAddress ( "." ), 0 );
return true;
}
qDebug() << qUtf8Printable (
QString ( "resolved %1 to a single SRV record: %2:%3" ).arg ( strAddress ).arg ( record.target() ).arg ( record.port() ) );

QHostAddress InetAddr;
if ( ParseNetworkAddressString ( record.target(), InetAddr, bEnableIPv6 ) )
{
HostAddress = CHostAddress ( InetAddr, record.port() );
return true;
}
return false;
}

bool NetworkUtil::ParseNetworkAddressWithSrvDiscovery ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 )
{
// Try SRV-based discovery first:
if ( ParseNetworkAddressSrv ( strAddress, HostAddress, bEnableIPv6 ) )
{
return true;
}
// Try regular connect via plain IP or host name lookup (A/AAAA):
return ParseNetworkAddress ( strAddress, HostAddress, bEnableIPv6 );
}
#endif

bool NetworkUtil::ParseNetworkAddress ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 )
{
QHostAddress InetAddr;
Expand Down
13 changes: 11 additions & 2 deletions src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
#include <QElapsedTimer>
#include <QTextBoundaryFinder>
#include <QTimer>
#ifndef CLIENT_NO_SRV_CONNECT
# include <QDnsLookup>
#endif
#ifndef _WIN32
# include <QThread>
#endif
Expand All @@ -79,8 +82,9 @@ class CClient; // forward declaration of CClient
#endif

/* Definitions ****************************************************************/
#define METER_FLY_BACK 2
#define INVALID_MIDI_CH -1 // invalid MIDI channel definition
#define METER_FLY_BACK 2
#define INVALID_MIDI_CH -1 // invalid MIDI channel definition
#define DNS_SRV_RESOLVE_TIMEOUT_MS 500

/* Global functions ***********************************************************/
// converting float to short
Expand Down Expand Up @@ -1039,6 +1043,11 @@ class NetworkUtil
{
public:
static bool ParseNetworkAddressString ( QString strAddress, QHostAddress& InetAddr, bool bEnableIPv6 );

#ifndef CLIENT_NO_SRV_CONNECT
static bool ParseNetworkAddressSrv ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 );
static bool ParseNetworkAddressWithSrvDiscovery ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 );
#endif
static bool ParseNetworkAddress ( QString strAddress, CHostAddress& HostAddress, bool bEnableIPv6 );

static QString FixAddress ( const QString& strAddress );
Expand Down

0 comments on commit 4ccd0b4

Please sign in to comment.