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

Fix crash for long taking mac address loockup

Browse Source
This commit is contained in:
Simon Stürz 2022-03-21 12:49:51 +01:00
parent 28d2f53261
commit 64d347d921
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea/network/networkdevicediscovery.cpp
View File

@ -209,6 +209,9 @@ void NetworkDeviceDiscovery::finishDiscovery()
void NetworkDeviceDiscovery::updateOrAddNetworkDeviceArp(const QNetworkInterface &interface, const QHostAddress &address, const QString &macAddress, const QString &manufacturer) void NetworkDeviceDiscovery::updateOrAddNetworkDeviceArp(const QNetworkInterface &interface, const QHostAddress &address, const QString &macAddress, const QString &manufacturer)
{ {
if (!m_currentReply)
return;
int index = m_currentReply->networkDeviceInfos().indexFromHostAddress(address); int index = m_currentReply->networkDeviceInfos().indexFromHostAddress(address);
if (index >= 0) { if (index >= 0) {
// Update the network device // Update the network device
@ -257,7 +260,7 @@ void NetworkDeviceDiscovery::onArpResponseRceived(const QNetworkInterface &inter
// Lookup the mac address vendor if possible // Lookup the mac address vendor if possible
if (m_macAddressDatabase->available()) { if (m_macAddressDatabase->available()) {
MacAddressDatabaseReply *reply = m_macAddressDatabase->lookupMacAddress(macAddress); MacAddressDatabaseReply *reply = m_macAddressDatabase->lookupMacAddress(macAddress);
connect(reply, &MacAddressDatabaseReply::finished, this, [=](){ connect(reply, &MacAddressDatabaseReply::finished, m_currentReply, [=](){
qCDebug(dcNetworkDeviceDiscovery()) << "MAC manufacturer lookup finished for" << macAddress << ":" << reply->manufacturer(); qCDebug(dcNetworkDeviceDiscovery()) << "MAC manufacturer lookup finished for" << macAddress << ":" << reply->manufacturer();
updateOrAddNetworkDeviceArp(interface, address, macAddress, reply->manufacturer()); updateOrAddNetworkDeviceArp(interface, address, macAddress, reply->manufacturer());
}); });