From 4065a471b77452bbd4b9fef54134eff6e7de7354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Sun, 6 Jun 2021 14:20:36 +0200
Subject: [PATCH] Fix host lookup after successfull ping

---
 libnymea/network/networkdevice.cpp          | 6 +++---
 libnymea/network/networkdevicediscovery.cpp | 2 +-
 libnymea/network/networkdevicediscovery.h   | 2 +-
 libnymea/network/ping.cpp                   | 2 +-
 libnymea/network/ping.h                     | 3 ---
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libnymea/network/networkdevice.cpp b/libnymea/network/networkdevice.cpp
index 4e516dc6..465dc5e3 100644
--- a/libnymea/network/networkdevice.cpp
+++ b/libnymea/network/networkdevice.cpp
@@ -100,13 +100,13 @@ QDebug operator<<(QDebug dbg, const NetworkDevice &networkDevice)
 {
     dbg.nospace() << "NetworkDevice(";
     dbg.nospace() << networkDevice.address().toString() << ", ";
+    if (!networkDevice.hostName().isEmpty())
+        dbg.nospace() << ", " << networkDevice.hostName();
+
     dbg.nospace() << networkDevice.macAddress();
     if (!networkDevice.macAddressManufacturer().isEmpty())
         dbg.nospace() << "(" << networkDevice.macAddressManufacturer() << ")";
 
-    if (!networkDevice.hostName().isEmpty())
-        dbg.nospace() << ", " << networkDevice.hostName();
-
     if (networkDevice.networkInterface().isValid())
         dbg.nospace() << ", " << networkDevice.networkInterface().name();
 
diff --git a/libnymea/network/networkdevicediscovery.cpp b/libnymea/network/networkdevicediscovery.cpp
index 31f9c8f9..f68749a5 100644
--- a/libnymea/network/networkdevicediscovery.cpp
+++ b/libnymea/network/networkdevicediscovery.cpp
@@ -32,6 +32,7 @@
 #include "loggingcategories.h"
 #include "networkutils.h"
 #include "macaddressdatabase.h"
+#include "arpsocket.h"
 
 #include <QDateTime>
 
@@ -79,7 +80,6 @@ NetworkDeviceDiscoveryReply *NetworkDeviceDiscovery::discover()
     }
 
     qCDebug(dcNetworkDeviceDiscovery()) << "Starting network device discovery ...";
-
     NetworkDeviceDiscoveryReply *reply = new NetworkDeviceDiscoveryReply(this);
     m_currentReply = reply;
     m_currentReply->m_startTimestamp = QDateTime::currentMSecsSinceEpoch();
diff --git a/libnymea/network/networkdevicediscovery.h b/libnymea/network/networkdevicediscovery.h
index f1a9ca71..712ead8c 100644
--- a/libnymea/network/networkdevicediscovery.h
+++ b/libnymea/network/networkdevicediscovery.h
@@ -37,9 +37,9 @@
 
 #include "ping.h"
 #include "libnymea.h"
-#include "arpsocket.h"
 #include "networkdevicediscoveryreply.h"
 
+class ArpSocket;
 class MacAddressDatabase;
 class MacAddressDatabaseReply;
 
diff --git a/libnymea/network/ping.cpp b/libnymea/network/ping.cpp
index e7b51f1a..d921bd23 100644
--- a/libnymea/network/ping.cpp
+++ b/libnymea/network/ping.cpp
@@ -350,7 +350,7 @@ void Ping::onSocketReadyRead(int socketDescriptor)
             reply->m_duration = qRound((receiveTimeValue.tv_sec * 1000 + (double)receiveTimeValue.tv_usec / 1000) * 100) / 100.0;
 
             // Note: due to a Qt bug < 5.9 we need to use old SLOT style and cannot make use of lambda here
-            int lookupId = QHostInfo::lookupHost(senderAddress.toString(), this, SLOT(onHostLookupFinished(const QHostInfo &info)));
+            int lookupId = QHostInfo::lookupHost(senderAddress.toString(), this, SLOT(onHostLookupFinished(QHostInfo)));
             m_pendingHostLookups.insert(lookupId, reply);
 
             qCDebug(dcPingTraffic()) << "Received ICMP response" << reply->targetHostAddress().toString() << ICMP_PACKET_SIZE << "[Bytes]"
diff --git a/libnymea/network/ping.h b/libnymea/network/ping.h
index 065b002d..3ef536e2 100644
--- a/libnymea/network/ping.h
+++ b/libnymea/network/ping.h
@@ -40,10 +40,7 @@
 #include <QSocketNotifier>
 #include <QLoggingCategory>
 
-#include <netinet/ip_icmp.h>
-
 #include "libnymea.h"
-
 #include "pingreply.h"
 
 #include <netinet/ip_icmp.h>