frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #996 from m-seker/bugfix/995

Browse Source 
ENABLE_AVAHI is not included in WebServer
This commit is contained in:
Murat Seker
2020-09-16 17:05:20 +02:00
committed by GitHub
parent e53760bcad 9204f8a313
commit c711d62354
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libsrc/flatbufserver/FlatBufferServer.cpp
View File

@@ -1,10 +1,16 @@
#include <flatbufserver/FlatBufferServer.h>
#include "FlatBufferClient.h"
#include "HyperionConfig.h"
// util
#include <utils/NetOrigin.h>
#include <utils/GlobalSignals.h>
// bonjour
#ifdef ENABLE_AVAHI
#include <bonjour/bonjourserviceregister.h>
#endif
// qt
#include <QJsonObject>
#include <QTcpServer>
@@ -93,14 +99,27 @@ void FlatBufferServer::startServer()
{
if(!_server->isListening())
{
if(!_server->listen(QHostAddress::Any, _port))
{
Error(_log,"Failed to bind port %d", _port);
}
else
{
Info(_log,"Started on port %d", _port);
}
if(!_server->listen(QHostAddress::Any, _port))
{
Error(_log,"Failed to bind port %d", _port);
}
else
{
Info(_log,"Started on port %d", _port);
#ifdef ENABLE_AVAHI
if(_serviceRegister == nullptr)
{
_serviceRegister = new BonjourServiceRegister(this);
_serviceRegister->registerService("_hyperiond-flatbuf._tcp", _port);
}
else if(_serviceRegister->getPort() != _port)
{
delete _serviceRegister;
_serviceRegister = new BonjourServiceRegister(this);
_serviceRegister->registerService("_hyperiond-flatbuf._tcp", _port);
}
#endif
}
}
}

2
libsrc/jsonserver/JsonServer.cpp
View File

@@ -2,6 +2,7 @@
#include <stdexcept>
// project includes
#include "HyperionConfig.h"
#include <jsonserver/JsonServer.h>
#include "JsonClientConnection.h"
@@ -49,6 +50,7 @@ void JsonServer::start()
return;
}
Info(_log, "Started on port %d", _port);
#ifdef ENABLE_AVAHI
if(_serviceRegister == nullptr)
{

1
libsrc/webserver/WebServer.cpp
View File

@@ -1,4 +1,5 @@
#include "webserver/WebServer.h"
#include "HyperionConfig.h"
#include "StaticFileServing.h"
#include "QtHttpServer.h"