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

Merge PR #184: Update ZeroConf names when the server is renamed

Browse Source
This commit is contained in:
Jenkins 2019-07-22 12:16:57 +02:00
commit bd3aaf1877
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libnymea-core/servermanager.cpp
View File

@ -298,7 +298,6 @@ void ServerManager::mqttServerConfigurationChanged(const QString &id)
if (m_mqttBroker->startServer(config, m_sslConfiguration)) { if (m_mqttBroker->startServer(config, m_sslConfiguration)) {
registerZeroConfService(config, "mqtt", "_mqtt._tcp"); registerZeroConfService(config, "mqtt", "_mqtt._tcp");
} }
} }
void ServerManager::mqttServerConfigurationRemoved(const QString &id) void ServerManager::mqttServerConfigurationRemoved(const QString &id)
@ -369,15 +368,26 @@ void ServerManager::setServerName(const QString &serverName)
qCDebug(dcServerManager()) << "Server name changed" << serverName; qCDebug(dcServerManager()) << "Server name changed" << serverName;
foreach (WebSocketServer *websocketServer, m_webSocketServers.values()) { foreach (WebSocketServer *websocketServer, m_webSocketServers.values()) {
unregisterZeroConfService(websocketServer->configuration().id, "ws");
websocketServer->setServerName(serverName); websocketServer->setServerName(serverName);
registerZeroConfService(websocketServer->configuration(), "ws", "_ws._tcp");
} }
foreach (WebServer *webServer, m_webServers.values()) { foreach (WebServer *webServer, m_webServers.values()) {
unregisterZeroConfService(webServer->configuration().id, "http");
webServer->setServerName(serverName); webServer->setServerName(serverName);
registerZeroConfService(webServer->configuration(), "http", "_http._tcp");
} }
foreach (TcpServer *tcpServer, m_tcpServers.values()) { foreach (TcpServer *tcpServer, m_tcpServers.values()) {
unregisterZeroConfService(tcpServer->configuration().id, "tcp");
tcpServer->setServerName(serverName); tcpServer->setServerName(serverName);
registerZeroConfService(tcpServer->configuration(), "tcp", "_jsonrpc._tcp");
}
foreach (const ServerConfiguration &config, m_mqttBroker->configurations()) {
unregisterZeroConfService(config.id, "mqtt");
registerZeroConfService(config, "mqtt", "_mqtt._tcp");
} }
} }

5
libnymea-core/servers/webserver.cpp
View File

@ -602,6 +602,11 @@ bool WebServer::stopServer()
return true; return true;
} }
WebServerConfiguration WebServer::configuration() const
{
return m_configuration;
}
QByteArray WebServer::createServerXmlDocument(QHostAddress address) QByteArray WebServer::createServerXmlDocument(QHostAddress address)
{ {

1
libnymea-core/servers/webserver.h
View File

@ -117,6 +117,7 @@ public slots:
void setServerName(const QString &serverName); void setServerName(const QString &serverName);
bool startServer(); bool startServer();
bool stopServer(); bool stopServer();
WebServerConfiguration configuration() const;
}; };