ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smaller fixes in the NetworkDiscovery

Browse Source 
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
This commit is contained in:
Michael Zanetti 2022-06-09 00:03:14 +02:00 committed by Simon Stürz
parent 2dbd8c47ba
commit 568bbc6972
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp
View File

@ -93,7 +93,7 @@ NetworkDeviceDiscoveryImpl::NetworkDeviceDiscoveryImpl(QObject *parent) :
NetworkDeviceDiscoveryImpl::~NetworkDeviceDiscoveryImpl()
{
delete m_cacheSettings;
}
NetworkDeviceDiscoveryReply *NetworkDeviceDiscoveryImpl::discover()

6
libnymea/network/ping.cpp
View File

@ -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

2
libnymea/network/pingreply.cpp
View File

@ -65,7 +65,7 @@ QNetworkInterface PingReply::networkInterface() const
uint PingReply::retries() const
{
return m_reties;
return m_retries;
}
uint PingReply::retryCount() const

2
libnymea/network/pingreply.h
View File

@ -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;