add sslEnabled flags to avahi txt record, fix something in avahi :D

This commit is contained in:
Michael Zanetti 2017-09-26 22:16:06 +02:00
parent 07e2b87665
commit 921c13c656
4 changed files with 4 additions and 1 deletions

View File

@ -157,6 +157,7 @@ bool TcpServer::startServer()
txt.insert("manufacturer", "guh GmbH");
txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
txt.insert("name", GuhCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", configuration().sslEnabled ? "true" : "false");
m_avahiService->registerService("guhIO", configuration().port, "_jsonrpc._tcp", txt);
qCDebug(dcConnection) << "Started Tcp server on" << m_server->serverAddress().toString() << m_server->serverPort();

View File

@ -522,6 +522,7 @@ bool WebServer::startServer()
txt.insert("manufacturer", "guh GmbH");
txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
txt.insert("name", GuhCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", m_configuration.sslEnabled ? "true" : "false");
m_avahiService->registerService("guhIO", m_configuration.port, "_http._tcp", txt);
m_enabled = true;

View File

@ -225,6 +225,7 @@ bool WebSocketServer::startServer()
txt.insert("manufacturer", "guh GmbH");
txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
txt.insert("name", GuhCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", configuration().sslEnabled ? "true" : "false");
m_avahiService->registerService("guhIO", configuration().port, "_ws._tcp", txt);
return true;

View File

@ -93,7 +93,7 @@ void AvahiWatch::gotIn()
void AvahiWatch::gotOut()
{
m_lastEvent = AVAHI_WATCH_IN;
m_lastEvent = AVAHI_WATCH_OUT;
m_incallback = true;
m_callback(this, m_fd, m_lastEvent, m_userdata);
m_incallback = false;