Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 15:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

send port along with domain hostname lookup

Browse source
This commit is contained in:
Stephen Birarda 2014-12-18 16:03:13 -08:00
parent 45881da555
commit 087ac1db90
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/networking/src/AddressManager.cpp
View file

@ -107,7 +107,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl) {
if (!handleUsername(lookupUrl.authority())) {
// we're assuming this is either a network address or global place name
// check if it is a network address first
if (!handleNetworkAddress(lookupUrl.host())) {
if (!handleNetworkAddress(lookupUrl.host()
+ (lookupUrl.port() == -1 ? "" : ":" + QString::number(lookupUrl.port())))) {
// wasn't an address - lookup the place name
attemptPlaceNameLookup(lookupUrl.host());
}
@ -246,17 +247,6 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString) {
const QString HOSTNAME_REGEX_STRING = "^((?:[A-Z0-9]|[A-Z0-9][A-Z0-9\\-]{0,61}[A-Z0-9])"
"(?:\\.(?:[A-Z0-9]|[A-Z0-9][A-Z0-9\\-]{0,61}[A-Z0-9]))+|localhost)(:{1}\\d{1,5})?$";
QRegExp hostnameRegex(HOSTNAME_REGEX_STRING, Qt::CaseInsensitive);
if (hostnameRegex.indexIn(lookupString) != -1) {
QString domainHostname = hostnameRegex.cap(0);
emit lookupResultsFinished();
setDomainHostnameAndName(domainHostname);
return true;
}
QRegExp ipAddressRegex(IP_ADDRESS_REGEX_STRING);
if (ipAddressRegex.indexIn(lookupString) != -1) {
@ -268,6 +258,17 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString) {
return true;
}
QRegExp hostnameRegex(HOSTNAME_REGEX_STRING, Qt::CaseInsensitive);
if (hostnameRegex.indexIn(lookupString) != -1) {
QString domainHostname = hostnameRegex.cap(0);
emit lookupResultsFinished();
setDomainHostnameAndName(domainHostname);
return true;
}
return false;
}