From fabc3aea5709960744a72f187c86573bb5351302 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Nov 2014 12:54:28 -0800
Subject: [PATCH] Revert "don't allow a HifiSockAddr lookup to block
 application"

---
 libraries/networking/src/HifiSockAddr.cpp    | 39 ++++++--------------
 libraries/networking/src/HifiSockAddr.h      |  7 +---
 libraries/networking/src/LimitedNodeList.cpp |  6 ++-
 libraries/networking/src/LimitedNodeList.h   |  1 -
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/libraries/networking/src/HifiSockAddr.cpp b/libraries/networking/src/HifiSockAddr.cpp
index 3a200fd392..97e9721356 100644
--- a/libraries/networking/src/HifiSockAddr.cpp
+++ b/libraries/networking/src/HifiSockAddr.cpp
@@ -9,9 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <qdatastream.h>
-#include <qhostinfo.h>
-#include <qnetworkinterface.h>
+#include <QtCore/QDataStream>
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QNetworkInterface>
 
 #include "HifiSockAddr.h"
 
@@ -36,15 +36,14 @@ HifiSockAddr::HifiSockAddr(const HifiSockAddr& otherSockAddr) {
     _port = otherSockAddr._port;
 }
 
-HifiSockAddr::HifiSockAddr(const QString& hostname, quint16 hostOrderPort) :
-    _address(hostname),
-    _port(hostOrderPort)
-{
-    // if we parsed an IPv4 address out of the hostname, don't look it up
-    if (_address.protocol() != QAbstractSocket::IPv4Protocol) {
-        // sync lookup the IP by the hostname
-        int lookupID = QHostInfo::lookupHost(hostname, this, SLOT(handleLookupResult(QHostInfo)));
-        qDebug() << "Looking up IP address for hostname" << hostname << "- lookup ID is" << lookupID;
+HifiSockAddr::HifiSockAddr(const QString& hostname, quint16 hostOrderPort) {
+    // lookup the IP by the hostname
+    QHostInfo hostInfo = QHostInfo::fromName(hostname);
+    foreach(const QHostAddress& address, hostInfo.addresses()) {
+        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
+            _address = address;
+            _port = hostOrderPort;
+        }
     }
 }
 
@@ -76,22 +75,6 @@ bool HifiSockAddr::operator==(const HifiSockAddr& rhsSockAddr) const {
     return _address == rhsSockAddr._address && _port == rhsSockAddr._port;
 }
 
-void HifiSockAddr::handleLookupResult(const QHostInfo& hostInfo) {
-    if (hostInfo.error() != QHostInfo::NoError) {
-        qDebug() << "Lookup failed for" << hostInfo.lookupId() << ":" << hostInfo.errorString();
-    }
-    
-    foreach(const QHostAddress& address, hostInfo.addresses()) {
-        // just take the first IPv4 address
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            _address = address;
-            qDebug() << "QHostInfo lookup result for"
-                << hostInfo.hostName() << "with lookup ID" << hostInfo.lookupId() << "is" << address.toString();
-            break;
-        }
-    }
-}
-
 QDebug operator<<(QDebug debug, const HifiSockAddr& sockAddr) {
     debug.nospace() << sockAddr._address.toString().toLocal8Bit().constData() << ":" << sockAddr._port;
     return debug.space();
diff --git a/libraries/networking/src/HifiSockAddr.h b/libraries/networking/src/HifiSockAddr.h
index 5bbd27437b..42f815390a 100644
--- a/libraries/networking/src/HifiSockAddr.h
+++ b/libraries/networking/src/HifiSockAddr.h
@@ -19,10 +19,9 @@
 #include <netinet/in.h>
 #endif
 
-#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QHostAddress>
 
-class HifiSockAddr : public QObject {
-    Q_OBJECT
+class HifiSockAddr {
 public:
     HifiSockAddr();
     HifiSockAddr(const QHostAddress& address, quint16 port);
@@ -52,8 +51,6 @@ public:
     friend QDebug operator<<(QDebug debug, const HifiSockAddr& sockAddr);
     friend QDataStream& operator<<(QDataStream& dataStream, const HifiSockAddr& sockAddr);
     friend QDataStream& operator>>(QDataStream& dataStream, HifiSockAddr& sockAddr);
-private slots:
-    void handleLookupResult(const QHostInfo& hostInfo);
 private:
     QHostAddress _address;
     quint16 _port;
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 043f0621bb..5c4dc6cea2 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -73,7 +73,6 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     _dtlsSocket(NULL),
     _localSockAddr(),
     _publicSockAddr(),
-    _stunSockAddr(STUN_SERVER_HOSTNAME, STUN_SERVER_PORT),
     _numCollectedPackets(0),
     _numCollectedBytes(0),
     _packetStatTimer()
@@ -584,8 +583,11 @@ void LimitedNodeList::sendSTUNRequest() {
     QUuid randomUUID = QUuid::createUuid();
     memcpy(stunRequestPacket + packetIndex, randomUUID.toRfc4122().data(), NUM_TRANSACTION_ID_BYTES);
     
+    // lookup the IP for the STUN server
+    HifiSockAddr stunSockAddr(STUN_SERVER_HOSTNAME, STUN_SERVER_PORT);
+    
     _nodeSocket.writeDatagram((char*) stunRequestPacket, sizeof(stunRequestPacket),
-                              _stunSockAddr.getAddress(), _stunSockAddr.getPort());
+                              stunSockAddr.getAddress(), stunSockAddr.getPort());
 }
 
 void LimitedNodeList::rebindNodeSocket() {
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 64495fbd34..73381d01a5 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -163,7 +163,6 @@ protected:
     QUdpSocket* _dtlsSocket;
     HifiSockAddr _localSockAddr;
     HifiSockAddr _publicSockAddr;
-    HifiSockAddr _stunSockAddr;
     int _numCollectedPackets;
     int _numCollectedBytes;
     QElapsedTimer _packetStatTimer;