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

only register avahi services on the appropriate interfaces

Browse Source
This commit is contained in:
Michael Zanetti 2018-05-28 19:31:00 +02:00
parent 1754b74138
commit 306d8edbda
6 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libnymea-core/hardware/network/avahi/qtavahiservice.cpp
View File

@ -52,6 +52,8 @@
#include "qtavahiservice_p.h"
#include "loggingcategories.h"
#include <QNetworkInterface>
namespace nymeaserver {
/*! Constructs a new \l{QtAvahiService} with the given \a parent. */
@ -79,6 +81,12 @@ QtAvahiService::~QtAvahiService()
delete d_ptr;
}
/*! Returns the hostAddress of this \l{QtAvahiService}. */
QHostAddress QtAvahiService::hostAddress() const
{
return d_ptr->hostAddress;
}
/*! Returns the port of this \l{QtAvahiService}. */
quint16 QtAvahiService::port() const
{
@ -108,7 +116,7 @@ QtAvahiService::QtAvahiServiceState QtAvahiService::state() const
}
/*! Register a new \l{QtAvahiService} with the given \a name and \a port. The service type can be specified with the \a serviceType string. The \a txtRecords records inform about additional information. Returns true if the service could be registered. */
bool QtAvahiService::registerService(const QString &name, const quint16 &port, const QString &serviceType, const QHash<QString, QString> &txtRecords)
bool QtAvahiService::registerService(const QString &name, const QHostAddress &hostAddress, const quint16 &port, const QString &serviceType, const QHash<QString, QString> &txtRecords)
{
// Check if the client is running
if (!d_ptr->client->m_client || AVAHI_CLIENT_S_RUNNING != avahi_client_get_state(d_ptr->client->m_client)) {
@ -117,6 +125,7 @@ bool QtAvahiService::registerService(const QString &name, const quint16 &port, c
}
d_ptr->name = name;
d_ptr->hostAddress = hostAddress;
d_ptr->port = port;
d_ptr->type = serviceType;
d_ptr->txtRecords = txtRecords;
@ -128,9 +137,23 @@ bool QtAvahiService::registerService(const QString &name, const quint16 &port, c
// If the group is empty
if (avahi_entry_group_is_empty(d_ptr->group)) {
// Add the service
AvahiIfIndex ifIndex = AVAHI_IF_UNSPEC;
if (hostAddress != QHostAddress("0.0.0.0")) {
foreach (const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) {
foreach (const QNetworkAddressEntry &addressEntry, interface.addressEntries()) {
QPair<QHostAddress, int> subnet = QHostAddress::parseSubnet(addressEntry.ip().toString() + "/" + addressEntry.netmask().toString());
if (hostAddress.isInSubnet(subnet.first, subnet.second)) {
ifIndex = interface.index();
break;
}
}
}
}
qCDebug(dcAvahi()) << "Registering avahi service" << name << hostAddress.toString() << port << serviceType << "on interface" << ifIndex;
d_ptr->serviceList = QtAvahiServicePrivate::createTxtList(txtRecords);
d_ptr->error = avahi_entry_group_add_service_strlst(d_ptr->group,
AVAHI_IF_UNSPEC,
ifIndex,
AVAHI_PROTO_INET,
(AvahiPublishFlags) 0,
d_ptr->name.toLatin1().data(),
@ -234,7 +257,7 @@ bool QtAvahiService::handlCollision()
qCDebug(dcAvahi()) << "Service name colision. Picking alternative service name" << alternativeServiceName;
resetService();
return registerService(alternativeServiceName, port(), serviceType(), txtRecords());
return registerService(alternativeServiceName, hostAddress(), port(), serviceType(), txtRecords());
}
void QtAvahiService::onStateChanged(const QtAvahiServiceState &state)

5
libnymea-core/hardware/network/avahi/qtavahiservice.h
View File

@ -26,7 +26,7 @@
#include <QHash>
#include <QString>
#include <QObject>
#include <QHostAddress>
namespace nymeaserver {
@ -49,13 +49,14 @@ public:
explicit QtAvahiService(QObject *parent = nullptr);
~QtAvahiService();
QHostAddress hostAddress() const;
quint16 port() const;
QString name() const;
QString serviceType() const;
QHash<QString, QString> txtRecords() const;
QtAvahiServiceState state() const;
bool registerService(const QString &name, const quint16 &port, const QString &serviceType = "_http._tcp", const QHash<QString, QString> &txtRecords = QHash<QString, QString>());
bool registerService(const QString &name, const QHostAddress &hostAddress, const quint16 &port, const QString &serviceType = "_http._tcp", const QHash<QString, QString> &txtRecords = QHash<QString, QString>());
void resetService();
bool updateTxtRecord(const QHash<QString, QString> &txtRecords);

1
libnymea-core/hardware/network/avahi/qtavahiservice_p.h
View File

@ -46,6 +46,7 @@ public:
AvahiEntryGroup *group;
AvahiStringList *serviceList = nullptr;
QString name;
QHostAddress hostAddress;
quint16 port;
QString type;
QHash<QString, QString> txtRecords;

2
libnymea-core/tcpserver.cpp
View File

@ -138,7 +138,7 @@ void TcpServer::resetAvahiService()
txt.insert("uuid", NymeaCore::instance()->configuration()->serverUuid().toString());
txt.insert("name", NymeaCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", configuration().sslEnabled ? "true" : "false");
if (!m_avahiService->registerService(QString("nymea-tcp-%1").arg(configuration().id), configuration().port, "_jsonrpc._tcp", txt)) {
if (!m_avahiService->registerService(QString("nymea-tcp-%1").arg(configuration().id), configuration().address, configuration().port, "_jsonrpc._tcp", txt)) {
qCWarning(dcTcpServer()) << "Could not register avahi service for" << configuration();
}
}

2
libnymea-core/webserver.cpp
View File

@ -544,7 +544,7 @@ void WebServer::resetAvahiService()
txt.insert("name", NymeaCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", m_configuration.sslEnabled ? "true" : "false");
if (!m_avahiService->registerService(QString("nymea-http-%1").arg(m_configuration.id), m_configuration.port, "_http._tcp", txt)) {
if (!m_avahiService->registerService(QString("nymea-http-%1").arg(m_configuration.id), m_configuration.address, m_configuration.port, "_http._tcp", txt)) {
qCWarning(dcTcpServer()) << "Could not register avahi service for" << m_configuration;
}
}

2
libnymea-core/websocketserver.cpp
View File

@ -201,7 +201,7 @@ void WebSocketServer::resetAvahiService()
return;
m_avahiService->resetService();
if (!m_avahiService->registerService(QString("nymea-ws-%1").arg(configuration().id), configuration().port, "_ws._tcp", createTxtRecord())) {
if (!m_avahiService->registerService(QString("nymea-ws-%1").arg(configuration().id), configuration().address, configuration().port, "_ws._tcp", createTxtRecord())) {
qCWarning(dcWebServer()) << "Could not register avahi service for" << configuration();
}
}