From 568bbc6972098456509a8812ade12e8045f6ca0e Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 9 Jun 2022 00:03:14 +0200
Subject: [PATCH] Smaller fixes in the NetworkDiscovery

Fixes a theoretical memory leak (m_cacheSettings wasn't delete)
which isn't really an issue in practice but valgrind complains on it.

Fixes a typo: m_reties -> m_retries
---
 .../hardware/network/networkdevicediscoveryimpl.cpp         | 2 +-
 libnymea/network/ping.cpp                                   | 6 +++---
 libnymea/network/pingreply.cpp                              | 2 +-
 libnymea/network/pingreply.h                                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp b/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp
index 9ffdb426..dc088b6b 100644
--- a/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp
+++ b/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp
@@ -93,7 +93,7 @@ NetworkDeviceDiscoveryImpl::NetworkDeviceDiscoveryImpl(QObject *parent) :
 
 NetworkDeviceDiscoveryImpl::~NetworkDeviceDiscoveryImpl()
 {
-
+    delete m_cacheSettings;
 }
 
 NetworkDeviceDiscoveryReply *NetworkDeviceDiscoveryImpl::discover()
diff --git a/libnymea/network/ping.cpp b/libnymea/network/ping.cpp
index bb1638ff..26f227dd 100644
--- a/libnymea/network/ping.cpp
+++ b/libnymea/network/ping.cpp
@@ -116,7 +116,7 @@ PingReply *Ping::ping(const QHostAddress &hostAddress, uint retries)
     PingReply *reply = new PingReply(this);
     reply->m_targetHostAddress = hostAddress;
     reply->m_networkInterface = NetworkUtils::getInterfaceForHostaddress(hostAddress);
-    reply->m_reties = retries;
+    reply->m_retries = retries;
 
     connect(reply, &PingReply::timeout, this, [=](){
         // Note: this is not the ICMP timeout, here we actually got nothing from nobody...
@@ -297,7 +297,7 @@ quint16 Ping::calculateRequestId()
 void Ping::finishReply(PingReply *reply, PingReply::Error error)
 {
     // Check if we should retry
-    if (reply->m_retryCount >= reply->m_reties ||
+    if (reply->m_retryCount >= reply->m_retries ||
             error == PingReply::ErrorNoError ||
             error == PingReply::ErrorAborted ||
             error == PingReply::ErrorInvalidHostAddress ||
@@ -314,7 +314,7 @@ void Ping::finishReply(PingReply *reply, PingReply::Error error)
         reply->m_retryCount++;
         reply->m_sequenceNumber++;
 
-        qCDebug(dcPing()) << "Ping finished with error" << error << "Retry ping" << reply->targetHostAddress().toString() << reply->m_retryCount << "/" << reply->m_reties;
+        qCDebug(dcPing()) << "Ping finished with error" << error << "Retry ping" << reply->targetHostAddress().toString() << reply->m_retryCount << "/" << reply->m_retries;
         emit reply->retry(error, reply->retryCount());
 
         // Note: will be restarted once actually sent trough the network
diff --git a/libnymea/network/pingreply.cpp b/libnymea/network/pingreply.cpp
index 8afb2752..f16db831 100644
--- a/libnymea/network/pingreply.cpp
+++ b/libnymea/network/pingreply.cpp
@@ -65,7 +65,7 @@ QNetworkInterface PingReply::networkInterface() const
 
 uint PingReply::retries() const
 {
-    return m_reties;
+    return m_retries;
 }
 
 uint PingReply::retryCount() const
diff --git a/libnymea/network/pingreply.h b/libnymea/network/pingreply.h
index 72f8fcc4..09fb0b65 100644
--- a/libnymea/network/pingreply.h
+++ b/libnymea/network/pingreply.h
@@ -95,7 +95,7 @@ private:
     QString m_hostName;
     QNetworkInterface m_networkInterface;
 
-    uint m_reties = 0;
+    uint m_retries = 0;
     uint m_retryCount = 0;
     uint m_timeout = 3;
     double m_duration = 0;