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

Reenable UPnP, regardless if ZeroConf is enabled already

Browse Source
This commit is contained in:
Michael Zanetti 2020-01-17 23:06:04 +01:00
parent afb5e3cfc3
commit 8f0379945f
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libnymea-app-core/connection/discovery/nymeadiscovery.cpp
View File

@ -49,21 +49,13 @@ void NymeaDiscovery::setDiscovering(bool discovering)
return;
m_discovering = discovering;
// If we have zeroconf skip upnp. ZeroConf will not do an active discovery and if it's available it'll always have good data
if (!m_zeroConf->available()) {
if (discovering) {
m_upnp->discover();
} else {
m_upnp->stopDiscovery();
}
}
if (discovering) {
// If there's no Zeroconf, use UPnP instead
if (!m_zeroConf->available()) {
m_upnp->discover();
}
// ZeroConf is always in discovery mode, nothing to do...
// Always start Bluetooth discovery if HW is available
// Start UPnP discovery
m_upnp->discover();
// Start Bluetooth discovery if HW is available
if (m_bluetooth) {
m_bluetooth->discover();
}
@ -75,9 +67,7 @@ void NymeaDiscovery::setDiscovering(bool discovering)
m_awsClient->fetchDevices();
}
} else {
if (!m_zeroConf->available()) {
m_upnp->stopDiscovery();
}
m_upnp->stopDiscovery();
if (m_bluetooth) {
m_bluetooth->stopDiscovery();

2
libnymea-app-core/connection/discovery/upnpdiscovery.cpp
View File

@ -238,7 +238,7 @@ void UpnpDiscovery::networkReplyFinished(QNetworkReply *reply)
}
}
// qDebug() << "discovered device" << uuid << name << discoveredAddress << version << connections << data;
qDebug() << "UPnP: Discovered device" << name << discoveredAddress << version << connections /*<< data*/;
NymeaHost* device = m_nymeaHosts->find(uuid);
if (!device) {