mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
6fbfda03fa
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config
Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process
* reversing errant change to hyperion.systemd.sh
* added bonjour/zeroconf service discovery to the json interface.
When clients are also modified, they can
- find hyperiond on the network much more quickly than ping/portscan;
- find multiple instances running on different ports instead of assuming 19444
* Moved zeroconf calls to hyperiond.cpp
* Added mDNS/zerconf/bonjour registration for proto server
Added config options.
"jsonServer" :
{
"port" : 49444,
// "mDNSDescr" : "hyperiond jsonServer blah de blah",
"mDNSService" : "_hyperiond_json._tcp"
},
* cleaned up a couple of compiler warnings
* moved bitpair_to_byte initialiser to (hopefully) work with older GCC
* compiler warning in udp driver
removed some tabs in ws2812b.cpp
* formatting - spaces to tabs
* moved rpi_281x to tag sk6812-v1.0
* moving to my fork of rpi_281x
* Now uses the led device name and hostname to create the annouce name
Former-commit-id: abfa51bcf359cafa63338181c1b83ecfd231bc87
103 lines
4.1 KiB
C++
Executable File
103 lines
4.1 KiB
C++
Executable File
/*
|
|
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.
|
|
*/
|
|
|
|
//#include "bonjourserviceregister.h"
|
|
#include <bonjour/bonjourserviceregister.h>
|
|
|
|
|
|
#include <QtCore/QSocketNotifier>
|
|
|
|
BonjourServiceRegister::BonjourServiceRegister(QObject *parent)
|
|
: QObject(parent), dnssref(0), bonjourSocket(0)
|
|
{
|
|
}
|
|
|
|
BonjourServiceRegister::~BonjourServiceRegister()
|
|
{
|
|
if (dnssref) {
|
|
DNSServiceRefDeallocate(dnssref);
|
|
dnssref = 0;
|
|
}
|
|
}
|
|
|
|
void BonjourServiceRegister::registerService(const BonjourRecord &record, quint16 servicePort)
|
|
{
|
|
if (dnssref) {
|
|
qWarning("Warning: Already registered a service for this object, aborting new register");
|
|
return;
|
|
}
|
|
quint16 bigEndianPort = servicePort;
|
|
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
|
|
{
|
|
bigEndianPort = 0 | ((servicePort & 0x00ff) << 8) | ((servicePort & 0xff00) >> 8);
|
|
}
|
|
#endif
|
|
|
|
DNSServiceErrorType err = DNSServiceRegister(&dnssref, 0, 0, record.serviceName.toUtf8().constData(),
|
|
record.registeredType.toUtf8().constData(),
|
|
record.replyDomain.isEmpty() ? 0
|
|
: record.replyDomain.toUtf8().constData(), 0,
|
|
bigEndianPort, 0, 0, bonjourRegisterService, this);
|
|
if (err != kDNSServiceErr_NoError) {
|
|
emit error(err);
|
|
} else {
|
|
int sockfd = DNSServiceRefSockFD(dnssref);
|
|
if (sockfd == -1) {
|
|
emit error(kDNSServiceErr_Invalid);
|
|
} else {
|
|
bonjourSocket = new QSocketNotifier(sockfd, QSocketNotifier::Read, this);
|
|
connect(bonjourSocket, SIGNAL(activated(int)), this, SLOT(bonjourSocketReadyRead()));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void BonjourServiceRegister::bonjourSocketReadyRead()
|
|
{
|
|
DNSServiceErrorType err = DNSServiceProcessResult(dnssref);
|
|
if (err != kDNSServiceErr_NoError)
|
|
emit error(err);
|
|
}
|
|
|
|
|
|
void BonjourServiceRegister::bonjourRegisterService(DNSServiceRef, DNSServiceFlags,
|
|
DNSServiceErrorType errorCode, const char *name,
|
|
const char *regtype, const char *domain,
|
|
void *data)
|
|
{
|
|
BonjourServiceRegister *serviceRegister = static_cast<BonjourServiceRegister *>(data);
|
|
if (errorCode != kDNSServiceErr_NoError) {
|
|
emit serviceRegister->error(errorCode);
|
|
} else {
|
|
serviceRegister->finalRecord = BonjourRecord(QString::fromUtf8(name),
|
|
QString::fromUtf8(regtype),
|
|
QString::fromUtf8(domain));
|
|
emit serviceRegister->serviceRegistered(serviceRegister->finalRecord);
|
|
}
|
|
}
|