populate zeroconf/avahi/bonjour records via json api (#419)

* start of integrating a bonkour service browser

* some experiments

* blub

* bonjour browser via jsonrpc ...

* fix indention

* - make leddevice as component
- extend sysinfo with domain
- add more data for  bonjour browser (e.g. split domain and hostname)

* code cleanup

* add translation

* use component names instead of ids

* fix compile

include/bonjour/bonjourrecord.h

@@ -5,14 +5,14 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
  1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+	this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
+	this list of conditions and the following disclaimer in the documentation
+	and/or other materials provided with the distribution.
 
  3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
+	derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -35,24 +35,34 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 class BonjourRecord
 {
 public:
-    BonjourRecord() {}
-    BonjourRecord(const QString &name, const QString &regType, const QString &domain)
-        : serviceName(name), registeredType(regType), replyDomain(domain)
-    {}
-    BonjourRecord(const char *name, const char *regType, const char *domain)
-    {
-        serviceName = QString::fromUtf8(name);
-        registeredType = QString::fromUtf8(regType);
-        replyDomain = QString::fromUtf8(domain);
-    }
-    QString serviceName;
-    QString registeredType;
-    QString replyDomain;
-    bool operator==(const BonjourRecord &other) const {
-        return serviceName == other.serviceName
-               && registeredType == other.registeredType
-               && replyDomain == other.replyDomain;
-    }
+	BonjourRecord() : port(-1) {}
+	BonjourRecord(const QString &name, const QString &regType, const QString &domain)
+		: serviceName(name)
+		, registeredType(regType)
+		, replyDomain(domain)
+		, port(-1)
+	{}
+
+	BonjourRecord(const char *name, const char *regType, const char *domain)
+		: serviceName(QString::fromUtf8(name))
+		, registeredType(QString::fromUtf8(regType))
+		, replyDomain(QString::fromUtf8(domain))
+		, port(-1)
+	{
+	}
+
+	QString serviceName;
+	QString registeredType;
+	QString replyDomain;
+	QString hostName;
+	int     port;
+
+	bool operator==(const BonjourRecord &other) const
+	{
+		return serviceName       == other.serviceName
+			   && registeredType == other.registeredType
+			   && replyDomain    == other.replyDomain;
+	}
 };
 
 Q_DECLARE_METATYPE(BonjourRecord)

include/bonjour/bonjourservicebrowser.h

@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2007, Trenton Schulz
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+	this list of conditions and the following disclaimer in the documentation
+	and/or other materials provided with the distribution.
+
+ 3. The name of the author may not be used to endorse or promote products
+	derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef BONJOURSERVICEBROWSER_H
+#define BONJOURSERVICEBROWSER_H
+
+#include <QtCore/QObject>
+#include <dns_sd.h>
+#include "bonjour/bonjourrecord.h"
+
+
+class QSocketNotifier;
+class BonjourServiceBrowser : public QObject
+{
+	Q_OBJECT
+public:
+	BonjourServiceBrowser(QObject *parent = 0);
+	~BonjourServiceBrowser();
+	void browseForServiceType(const QString &serviceType);
+	inline QList<BonjourRecord> currentRecords() const { return bonjourRecords; }
+	inline QString serviceType() const { return browsingType; }
+
+signals:
+	void currentBonjourRecordsChanged(const QList<BonjourRecord> &list);
+	void error(DNSServiceErrorType err);
+
+private slots:
+	void bonjourSocketReadyRead();
+
+private:
+	static void DNSSD_API bonjourBrowseReply(DNSServiceRef , DNSServiceFlags flags, quint32,
+								   DNSServiceErrorType errorCode, const char *serviceName,
+								   const char *regType, const char *replyDomain, void *context);
+	DNSServiceRef dnssref;
+	QSocketNotifier *bonjourSocket;
+	QList<BonjourRecord> bonjourRecords;
+	QString browsingType;
+};
+
+#endif // BONJOURSERVICEBROWSER_H

include/bonjour/bonjourserviceresolver.h

@@ -0,0 +1,69 @@
+/*
+Copyright (c) 2007, Trenton Schulz
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef BONJOURSERVICERESOLVER_H
+#define BONJOURSERVICERESOLVER_H
+
+#include <QtCore/QObject>
+
+
+#include <dns_sd.h>
+
+class QSocketNotifier;
+class QHostInfo;
+class BonjourRecord;
+
+class BonjourServiceResolver : public QObject
+{
+	Q_OBJECT
+public:
+	BonjourServiceResolver(QObject *parent);
+    ~BonjourServiceResolver();
+
+    bool resolveBonjourRecord(const BonjourRecord &record);
+
+signals:
+    void bonjourRecordResolved(const QHostInfo &hostInfo, int port);
+    void error(DNSServiceErrorType error);
+
+private slots:
+    void bonjourSocketReadyRead();
+    void cleanupResolve();
+    void finishConnect(const QHostInfo &hostInfo);
+
+private:
+    static void DNSSD_API bonjourResolveReply(DNSServiceRef sdRef, DNSServiceFlags flags,
+                                    quint32 interfaceIndex, DNSServiceErrorType errorCode,
+                                    const char *fullName, const char *hosttarget, quint16 port,
+                                    quint16 txtLen, const char *txtRecord, void *context);
+    DNSServiceRef dnssref;
+    QSocketNotifier *bonjourSocket;
+    int bonjourPort;
+};
+
+#endif // BONJOURSERVICERESOLVER_H

include/hyperion/Hyperion.h

@@ -2,11 +2,12 @@
 
 // stl includes
 #include <list>
-#include <map>
+#include <QMap>
 
 // QT includes
 #include <QObject>
 #include <QString>
+#include <QStringList>
 #include <QTimer>
 #include <QSize>
 #include <QJsonObject>
@@ -33,6 +34,8 @@
 
 // KodiVideoChecker includes
 #include <kodivideochecker/KODIVideoChecker.h>
+#include <bonjour/bonjourservicebrowser.h>
+#include <bonjour/bonjourserviceresolver.h>
 
 // Forward class declaration
 class LedDevice;
@@ -52,8 +55,8 @@ class Hyperion : public QObject
 public:
 	///  Type definition of the info structure used by the priority muxer
 	typedef PriorityMuxer::InputInfo InputInfo;
-	typedef std::map<QString,int> PriorityRegister;
-
+	typedef QMap<QString,int> PriorityRegister;
+	typedef QMap<QString,BonjourRecord>  BonjourRegister;
 	///
 	/// RGB-Color channel enumeration
 	///
@@ -257,6 +260,9 @@ public slots:
 	/// sets the methode how image is maped to leds
 	void setLedMappingType(int mappingType);
 
+	///
+	Hyperion::BonjourRegister getHyperionSessions();
+
 public:
 	static Hyperion *_hyperion;
 
@@ -302,6 +308,10 @@ private slots:
 	///
 	void update();
 
+	void currentBonjourRecordsChanged(const QList<BonjourRecord> &list);
+    void bonjourRecordResolved(const QHostInfo &hostInfo, int port);
+	void bonjourResolve();
+
 private:
 	
 	///
@@ -344,6 +354,7 @@ private:
 
 	/// The timer for handling priority channel timeouts
 	QTimer _timer;
+	QTimer _timerBonjourResolver;
 
 	/// buffer for leds
 	std::vector<ColorRgb> _ledBuffer;
@@ -373,5 +384,9 @@ private:
 	
 	int _configVersionId;
 	
-	hyperion::Components _prevCompId;
+	hyperion::Components   _prevCompId;
+	BonjourServiceBrowser  _bonjourBrowser;
+	BonjourServiceResolver _bonjourResolver;
+	BonjourRegister        _hyperionSessions;
+	QString                _bonjourCurrentServiceToResolve;
 };

include/leddevice/LedDevice.h

@@ -19,6 +19,7 @@
 #include <utils/RgbToRgbw.h>
 #include <utils/Logger.h>
 #include <functional>
+#include <utils/Components.h>
 
 class LedDevice;
 
@@ -58,6 +59,12 @@ public:
 	static QJsonObject getLedDeviceSchemas();
 	static void setLedCount(int ledCount);
 	static int  getLedCount() { return _ledCount; }
+	
+	void setEnable(bool enable);
+	bool enabled() { return _enabled; };
+
+	inline bool componentState() { return enabled(); };
+	
 protected:
 	///
 	/// Writes the RGB-Color values to the leds.
@@ -88,11 +95,13 @@ protected:
 	/// e.g. Adalight device will switch off when it does not receive data at least every 15 seconds
 	QTimer        _refresh_timer;
 	unsigned int _refresh_timer_interval;
-	
+
 protected slots:
 	/// Write the last data to the leds again
 	int rewriteLeds();
 
 private:
 	std::vector<ColorRgb> _ledValues;
+	bool _componentRegistered;
+	bool _enabled;
 };

include/utils/Components.h

@@ -19,7 +19,8 @@ enum Components
 	COMP_V4L,
 	COMP_COLOR,
 	COMP_EFFECT,
-	COMP_PROTOSERVER
+	COMP_PROTOSERVER,
+	COMP_LEDDEVICE
 };
 
 inline const char* componentToString(Components c)
@@ -37,6 +38,7 @@ inline const char* componentToString(Components c)
 		case COMP_COLOR:         return "Solid color";
 		case COMP_EFFECT:        return "Effect";
 		case COMP_PROTOSERVER:   return "Proto Server";
+		case COMP_LEDDEVICE:     return "LED device";
 		default:                 return "";
 	}
 }
@@ -56,6 +58,7 @@ inline const char* componentToIdString(Components c)
 		case COMP_COLOR:         return "COLOR";
 		case COMP_EFFECT:        return "EFFECT";
 		case COMP_PROTOSERVER:   return "PROTOSERVER";
+		case COMP_LEDDEVICE:     return "LEDDEVICE";
 		default:                 return "";
 	}
 }
@@ -74,6 +77,7 @@ inline  Components stringToComponent(QString component)
 	if (component == "COLOR")         return COMP_COLOR;
 	if (component == "EFFECT")        return COMP_EFFECT;
 	if (component == "PROTOSERVER")   return COMP_PROTOSERVER;
+	if (component == "LEDDEVICE")     return COMP_LEDDEVICE;
 
 	return COMP_INVALID;
 }

include/utils/SysInfo.h

@@ -18,6 +18,7 @@ public:
 		QString productVersion;
 		QString prettyName;
 		QString hostName;
+		QString domainName;
 	};
 
 	~SysInfo();