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

Merge PR #682: Update UPnP discovery when the device interfaces change

Browse Source
This commit is contained in:
Jenkins nymea 2021-09-30 12:01:08 +02:00
commit 2eb7f0d3aa
4 changed files with 84 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
libnymea-app/connection/discovery/upnpdiscovery.cpp
View File

@ -34,6 +34,7 @@
#include <QUrl>
#include <QXmlStreamReader>
#include <QNetworkInterface>
#include <QNetworkConfigurationManager>
#include "logging.h"
@ -43,46 +44,18 @@ UpnpDiscovery::UpnpDiscovery(NymeaHosts *nymeaHosts, QObject *parent) :
QObject(parent),
m_nymeaHosts(nymeaHosts)
{
m_networkConfigurationManager = new QNetworkConfigurationManager(this);
m_networkAccessManager = new QNetworkAccessManager(this);
connect(m_networkAccessManager, &QNetworkAccessManager::finished, this, &UpnpDiscovery::networkReplyFinished);
m_repeatTimer.setInterval(500);
connect(&m_repeatTimer, &QTimer::timeout, this, &UpnpDiscovery::writeDiscoveryPacket);
foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) {
if (!iface.flags().testFlag(QNetworkInterface::CanMulticast)) {
continue;
}
foreach (const QNetworkAddressEntry &netAddressEntry, iface.addressEntries()) {
if (netAddressEntry.ip().protocol() == QAbstractSocket::IPv4Protocol) {
#ifdef Q_OS_IOS
// On iOS this will fail, but it's also not of interest as we won't run app and core on the same iOS host
if (netAddressEntry.ip() == QHostAddress::LocalHost) {
continue;
}
connect(m_networkConfigurationManager, &QNetworkConfigurationManager::configurationAdded, this, &UpnpDiscovery::updateInterfaces);
connect(m_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged, this, &UpnpDiscovery::updateInterfaces);
connect(m_networkConfigurationManager, &QNetworkConfigurationManager::configurationRemoved, this, &UpnpDiscovery::updateInterfaces);
#endif
QUdpSocket *socket = new QUdpSocket(this);
int port = -1;
for (int i = 49125; i < 65535; i++) {
if(socket->bind(netAddressEntry.ip(), i, QUdpSocket::DontShareAddress)){
port = i;
break;
}
}
if (port == 65535 || socket->state() != QUdpSocket::BoundState) {
socket->deleteLater();
qCWarning(dcUPnP()) << "Discovery could not bind to interface" << netAddressEntry.ip();
continue;
}
bool ret = socket->joinMulticastGroup(QHostAddress("239.255.255.250"));
qCInfo(dcUPnP()) << "Discovering on" << netAddressEntry.ip() << port << ret;
m_sockets.append(socket);
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(error(QAbstractSocket::SocketError)));
connect(socket, &QUdpSocket::readyRead, this, &UpnpDiscovery::readData);
}
}
}
updateInterfaces();
}
bool UpnpDiscovery::discovering() const
@ -116,6 +89,55 @@ void UpnpDiscovery::stopDiscovery()
emit discoveringChanged();
}
void UpnpDiscovery::updateInterfaces()
{
QList<QHostAddress> existingSockets = m_sockets.keys();
// Now add all the interfaces where we don't have a socket yet
foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) {
if (!iface.flags().testFlag(QNetworkInterface::CanMulticast)) {
continue;
}
foreach (const QNetworkAddressEntry &netAddressEntry, iface.addressEntries()) {
if (netAddressEntry.ip().protocol() != QAbstractSocket::IPv4Protocol) {
continue;
}
if (m_sockets.contains(netAddressEntry.ip())) {
existingSockets.removeAll(netAddressEntry.ip());
continue;
}
QUdpSocket *socket = new QUdpSocket(this);
int port = -1;
for (int i = 49125; i < 65535; i++) {
if(socket->bind(netAddressEntry.ip(), i, QUdpSocket::DontShareAddress)){
port = i;
break;
}
}
if (port == 65535 || socket->state() != QUdpSocket::BoundState) {
socket->deleteLater();
qCWarning(dcUPnP()) << "Discovery could not bind to interface" << netAddressEntry.ip();
continue;
}
qCInfo(dcUPnP()) << "Discovering on" << netAddressEntry.ip() << port;
m_sockets.insert(netAddressEntry.ip(), socket);
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(error(QAbstractSocket::SocketError)));
connect(socket, &QUdpSocket::readyRead, this, &UpnpDiscovery::readData);
}
}
// Remove remaining existing sockets, their interface has vanished
foreach (const QHostAddress &address, existingSockets) {
if (!QNetworkInterface::allAddresses().contains(address)) {
QUdpSocket *socket = m_sockets.value(address);
qCInfo(dcUPnP()) << "Removing discovery from vanished interface" << socket->localAddress();
delete m_sockets.take(address);
}
}
}
void UpnpDiscovery::writeDiscoveryPacket()
{
QByteArray ssdpSearchMessage = QByteArray("M-SEARCH * HTTP/1.1\r\n"
@ -124,7 +146,6 @@ void UpnpDiscovery::writeDiscoveryPacket()
"MX:2\r\n"
"ST: ssdp:all\r\n\r\n");
qCDebug(dcUPnP()) << "sending discovery packet";
foreach (QUdpSocket* socket, m_sockets) {
qint64 ret = socket->writeDatagram(ssdpSearchMessage, QHostAddress("239.255.255.250"), 1900);
if (ret != ssdpSearchMessage.length()) {
@ -137,7 +158,7 @@ void UpnpDiscovery::writeDiscoveryPacket()
void UpnpDiscovery::error(QAbstractSocket::SocketError error)
{
QUdpSocket* socket = static_cast<QUdpSocket*>(sender());
qWarning() << "UPnP: Socket error:" << error << socket->errorString() << socket->localAddress();
qWarning() << "UPnP: Socket error:" << error << socket->errorString();
}
void UpnpDiscovery::readData()
@ -270,12 +291,12 @@ void UpnpDiscovery::networkReplyFinished(QNetworkReply *reply)
foreach (const QUrl &url, connections) {
Connection *connection = device->connections()->find(url);
if (!connection) {
qCInfo(dcUPnP()) << "Adding new connection to host:" << device->name() << url;
bool sslEnabled = url.scheme() == "nymeas" || url.scheme() == "wss";
QString displayName = QString("%1:%2").arg(url.host()).arg(url.port());
Connection::BearerType bearerType = QHostAddress(url.host()).isLoopback() ? Connection::BearerTypeLoopback : Connection::BearerTypeLan;
connection = new Connection(url, bearerType, sslEnabled, displayName);
connection->setOnline(true);
qCInfo(dcUPnP()) << "Adding new connection to host:" << device->name() << url << bearerType;
device->connections()->addConnection(connection);
} else {
qCInfo(dcUPnP()) << "Setting connection online:" << device->name() << url.toString();

26
libnymea-app/connection/discovery/upnpdiscovery.h
View File

@ -35,6 +35,7 @@
#include <QHostAddress>
#include <QNetworkReply>
#include <QNetworkAccessManager>
#include <QNetworkConfigurationManager>
#include <QTimer>
#include "../nymeahost.h"
@ -53,9 +54,22 @@ public:
Q_INVOKABLE void discover();
Q_INVOKABLE void stopDiscovery();
signals:
void discoveringChanged();
void availableChanged();
void nymeaHostsChanged();
private slots:
void updateInterfaces();
void writeDiscoveryPacket();
void error(QAbstractSocket::SocketError error);
void readData();
void networkReplyFinished(QNetworkReply *reply);
private:
QList<QUdpSocket*> m_sockets;
QHash<QHostAddress, QUdpSocket*> m_sockets;
QNetworkAccessManager *m_networkAccessManager;
QNetworkConfigurationManager *m_networkConfigurationManager;
QTimer m_repeatTimer;
@ -64,16 +78,6 @@ private:
QHash<QNetworkReply *, QHostAddress> m_runningReplies;
QList<QUrl> m_foundDevices;
signals:
void discoveringChanged();
void availableChanged();
void nymeaHostsChanged();
private slots:
void writeDiscoveryPacket();
void error(QAbstractSocket::SocketError error);
void readData();
void networkReplyFinished(QNetworkReply *reply);
};
#endif // UPNPDISCOVERY_H

2
libnymea-app/connection/nymeahosts.cpp
View File

@ -258,7 +258,7 @@ bool NymeaHostsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &s
if (m_jsonRpcClient && !m_showUneachableBearers) {
bool hasReachableConnection = false;
for (int i = 0; i < host->connections()->rowCount(); i++) {
// qDebug() << "checking host for available bearer" << host->name() << host->connections()->get(i)->url() << "available bearer types:" << m_nymeaConnection->availableBearerTypes() << "hosts bearer types" << host->connections()->get(i)->bearerType();
qCritical() << "checking host for available bearer" << host->name() << host->connections()->get(i)->url() << "available bearer types:" << m_jsonRpcClient->availableBearerTypes() << "hosts bearer types" << host->connections()->get(i)->bearerType();
// Either enable a connection when the Bearer type is directly available
switch (host->connections()->get(i)->bearerType()) {
case Connection::BearerTypeLan:

14
nymea-app/ui/connection/NewConnectionWizard.qml
View File

@ -189,6 +189,10 @@ WizardPageBase {
width: parent.width
property var nymeaHost: hostsProxy.get(index)
property string defaultConnectionIndex: {
if (!nymeaHost) {
return -1
}
var bestIndex = -1
var bestPriority = 0;
for (var i = 0; i < nymeaHost.connections.count; i++) {
@ -201,6 +205,10 @@ WizardPageBase {
return bestIndex;
}
iconName: {
if (!nymeaHost) {
return
}
switch (nymeaHost.connections.get(defaultConnectionIndex).bearerType) {
case Connection.BearerTypeLan:
case Connection.BearerTypeWan:
@ -218,12 +226,12 @@ WizardPageBase {
return ""
}
text: model.name
subText: nymeaHost.connections.get(defaultConnectionIndex).url
subText: nymeaHost ? nymeaHost.connections.get(defaultConnectionIndex).url : ""
wrapTexts: false
prominentSubText: false
progressive: false
property bool isSecure: nymeaHost.connections.get(defaultConnectionIndex).secure
property bool isOnline: nymeaHost.connections.get(defaultConnectionIndex).bearerType !== Connection.BearerTypeWan ? nymeaHost.connections.get(defaultConnectionIndex).online : true
property bool isSecure: nymeaHost && nymeaHost.connections.get(defaultConnectionIndex).secure
property bool isOnline: nymeaHost && nymeaHost.connections.get(defaultConnectionIndex).bearerType !== Connection.BearerTypeWan ? nymeaHost.connections.get(defaultConnectionIndex).online : true
tertiaryIconName: isSecure ? "/ui/images/connections/network-secure.svg" : ""
secondaryIconName: !isOnline ? "/ui/images/connections/cloud-error.svg" : ""
secondaryIconColor: "red"