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
97 lines
3.6 KiB
C++
Executable File
97 lines
3.6 KiB
C++
Executable File
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the example classes of the Qt Toolkit.
|
|
**
|
|
** This file may be used under the terms of the GNU General Public
|
|
** License version 2.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of
|
|
** this file. Please review the following information to ensure GNU
|
|
** General Public Licensing requirements will be met:
|
|
** http://www.trolltech.com/products/qt/opensource.html
|
|
**
|
|
** If you are unsure which license is appropriate for your use, please
|
|
** review the following information:
|
|
** http://www.trolltech.com/products/qt/licensing.html or contact the
|
|
** sales department at sales@trolltech.com.
|
|
**
|
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtGui>
|
|
#include <QtNetwork>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "server.h"
|
|
#include "bonjourserviceregister.h"
|
|
Server::Server(QWidget *parent)
|
|
: QDialog(parent)
|
|
{
|
|
setWindowModality(Qt::ApplicationModal);
|
|
statusLabel = new QLabel;
|
|
quitButton = new QPushButton(tr("Quit"));
|
|
quitButton->setAutoDefault(false);
|
|
|
|
tcpServer = new QTcpServer(this);
|
|
if (!tcpServer->listen()) {
|
|
QMessageBox::critical(this, tr("Fortune Server"),
|
|
tr("Unable to start the server: %1.")
|
|
.arg(tcpServer->errorString()));
|
|
close();
|
|
return;
|
|
}
|
|
|
|
statusLabel->setText(tr("The server is running on port %1.\n"
|
|
"Run the Fortune Client example now.")
|
|
.arg(tcpServer->serverPort()));
|
|
|
|
fortunes << tr("You've been leading a dog's life. Stay off the furniture.")
|
|
<< tr("You've got to think about tomorrow.")
|
|
<< tr("You will be surprised by a loud noise.")
|
|
<< tr("You will feel hungry again in another hour.")
|
|
<< tr("You might have mail.")
|
|
<< tr("You cannot kill time without injuring eternity.")
|
|
<< tr("Computers are not intelligent. They only think they are.");
|
|
|
|
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
|
|
connect(tcpServer, SIGNAL(newConnection()), this, SLOT(sendFortune()));
|
|
|
|
QHBoxLayout *buttonLayout = new QHBoxLayout;
|
|
buttonLayout->addStretch(1);
|
|
buttonLayout->addWidget(quitButton);
|
|
buttonLayout->addStretch(1);
|
|
|
|
QVBoxLayout *mainLayout = new QVBoxLayout;
|
|
mainLayout->addWidget(statusLabel);
|
|
mainLayout->addLayout(buttonLayout);
|
|
setLayout(mainLayout);
|
|
|
|
bonjourRegister = new BonjourServiceRegister(this);
|
|
bonjourRegister->registerService(BonjourRecord(tr("Fortune Server on %1").arg(QHostInfo::localHostName()),
|
|
QLatin1String("_trollfortune._tcp"), QString()),
|
|
tcpServer->serverPort());
|
|
setWindowTitle(tr("Fortune Server"));
|
|
}
|
|
|
|
void Server::sendFortune()
|
|
{
|
|
QByteArray block;
|
|
QDataStream out(&block, QIODevice::WriteOnly);
|
|
out.setVersion(QDataStream::Qt_4_0);
|
|
out << (quint16)0;
|
|
out << fortunes.at(qrand() % fortunes.size());
|
|
out.device()->seek(0);
|
|
out << (quint16)(block.size() - sizeof(quint16));
|
|
|
|
QTcpSocket *clientConnection = tcpServer->nextPendingConnection();
|
|
connect(clientConnection, SIGNAL(disconnected()),
|
|
clientConnection, SLOT(deleteLater()));
|
|
|
|
clientConnection->write(block);
|
|
clientConnection->disconnectFromHost();
|
|
}
|