Skip to content

Provides SRV support for -e|--directoryaddress option #3556

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

Open
rdica wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Provides SRV support for -e|--directoryaddress option #3556

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de32e73
Provides SRV support for --directoryaddress
Nov 5, 2025
21024b4
Update comment for clarity
Nov 6, 2025
d2c6b0b
Unlock mutex before resolving SRV
softins Jan 13, 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
18 changes: 16 additions & 2 deletions src/serverlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,13 +969,27 @@ void CServerListManager::SetRegistered ( const bool bIsRegister )
return;
}

// It is very important to unlock the Mutex before doing address resolution,
// so that the event loop can run and any other timers that need the mutex
// can obtain it. Otherwise there is the possibility of deadlock when doing
// the SRV lookup, if another timer fires that needs the same mutex.
locker.unlock();

// get the correct directory address
// Note that we always have to parse the server address again since if
// it is an URL of a dynamic IP address, the IP address might have
// changed in the meanwhile.
// Allow IPv4 only for communicating with Directories
const QString strNetworkAddress = NetworkUtil::GetDirectoryAddress ( DirectoryType, strDirectoryAddress );
const bool bDirectoryAddressValid = NetworkUtil().ParseNetworkAddress ( strNetworkAddress, DirectoryAddress, false );
// Use SRV DNS discovery for directory connections, fallback to A/AAAA if none.
const QString strNetworkAddress = NetworkUtil::GetDirectoryAddress ( DirectoryType, strDirectoryAddress );
#ifndef CLIENT_NO_SRV_CONNECT
const bool bDirectoryAddressValid = NetworkUtil().ParseNetworkAddressWithSrvDiscovery ( strNetworkAddress, DirectoryAddress, false );
#else
const bool bDirectoryAddressValid = NetworkUtil().ParseNetworkAddress ( strNetworkAddress, DirectoryAddress, false );
#endif

// lock the mutex again now that the address has been resolved.
locker.relock();

if ( bIsRegister )
{
Expand Down
Loading