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

ENABLE_AVAHI is not included in WebServer
hyperion-project · Sep 16, 2020 · c711d62 · c711d62
2 parents e53760b + 9204f8a
commit c711d62
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/include/flatbufserver/FlatBufferServer.h b/include/flatbufserver/FlatBufferServer.h
@@ -7,6 +7,7 @@
 // qt
 #include <QVector>
 
+class BonjourServiceRegister;
 class QTcpServer;
 class FlatBufferClient;
 class NetOrigin;
@@ -63,6 +64,7 @@ private slots:
 	int _timeout;
 	quint16 _port;
 	const QJsonDocument _config;
+	BonjourServiceRegister * _serviceRegister = nullptr;
 
 	QVector<FlatBufferClient*> _openConnections;
 };
diff --git a/libsrc/flatbufserver/FlatBufferServer.cpp b/libsrc/flatbufserver/FlatBufferServer.cpp
@@ -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
+		}
 	}
 }
 

diff --git a/libsrc/jsonserver/JsonServer.cpp b/libsrc/jsonserver/JsonServer.cpp
@@ -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)
 	{

diff --git a/libsrc/webserver/WebServer.cpp b/libsrc/webserver/WebServer.cpp
@@ -1,4 +1,5 @@
 #include "webserver/WebServer.h"
+#include "HyperionConfig.h"
 #include "StaticFileServing.h"
 #include "QtHttpServer.h"