From 274c3224a24dd7c084be981e35d38ad90f24329a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 9 Mar 2018 16:58:50 -0800 Subject: [PATCH] fix going to a dns name or ip address --- libraries/networking/src/AddressManager.cpp | 6 +++--- libraries/networking/src/DomainHandler.cpp | 22 ++++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 32eb660e47..04c8f6cb10 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -574,9 +574,9 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri if (ipAddressRegex.indexIn(lookupString) != -1) { QString domainIPString = ipAddressRegex.cap(1); - qint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT; + quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT; if (!ipAddressRegex.cap(2).isEmpty()) { - domainPort = (qint16) ipAddressRegex.cap(2).toInt(); + domainPort = (quint16) ipAddressRegex.cap(2).toInt(); } emit lookupResultsFinished(); @@ -597,7 +597,7 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT; if (!hostnameRegex.cap(2).isEmpty()) { - domainPort = (qint16)hostnameRegex.cap(2).toInt(); + domainPort = (quint16)hostnameRegex.cap(2).toInt(); } emit lookupResultsFinished(); diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index e069f2cd06..410d34765c 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -156,36 +156,34 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { // re-set the domain info so that auth information is reloaded hardReset(); - QString hostname = domainURL.host(); - quint16 port = domainURL.port(); - + QString previousHost = _domainURL.host(); _domainURL = domainURL; if (domainURL.scheme() != URL_SCHEME_HIFI) { setIsConnected(true); - } else if (hostname != _domainURL.host()) { - qCDebug(networking) << "Updated domain hostname to" << hostname; + } else if (previousHost != domainURL.host()) { + qCDebug(networking) << "Updated domain hostname to" << domainURL.host(); - if (!hostname.isEmpty()) { + if (!domainURL.host().isEmpty()) { // re-set the sock addr to null and fire off a lookup of the IP address for this domain-server's hostname - qCDebug(networking, "Looking up DS hostname %s.", hostname.toLocal8Bit().constData()); - QHostInfo::lookupHost(hostname, this, SLOT(completedHostnameLookup(const QHostInfo&))); + qCDebug(networking, "Looking up DS hostname %s.", domainURL.host().toLocal8Bit().constData()); + QHostInfo::lookupHost(domainURL.host(), this, SLOT(completedHostnameLookup(const QHostInfo&))); DependencyManager::get()->flagTimeForConnectionStep( LimitedNodeList::ConnectionStep::SetDomainHostname); - UserActivityLogger::getInstance().changedDomain(hostname); + UserActivityLogger::getInstance().changedDomain(domainURL.host()); } } emit domainURLChanged(_domainURL); - if (_sockAddr.getPort() != port) { - qCDebug(networking) << "Updated domain port to" << port; + if (_sockAddr.getPort() != domainURL.port()) { + qCDebug(networking) << "Updated domain port to" << domainURL.port(); } // grab the port by reading the string after the colon - _sockAddr.setPort(port); + _sockAddr.setPort(domainURL.port()); } }