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

forward protobuf messages.

Browse Source 
configure (send proto messages to two other hyperiond):

"protoServer" :
{
	"port"    : 19446,
	"forward" : [ "192.168.0.10:19445", "192.168.0.11:19445" ]
},


Former-commit-id: 33af219cfce99609ca7245d662dc0f0561013bbd
This commit is contained in:
redpanther
2016-02-08 16:56:23 +01:00
parent cf34f45daa
commit 5dc59344c4
6 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libsrc/protoserver/ProtoClientConnection.cpp
View File

@@ -20,7 +20,7 @@
// project includes
#include "ProtoClientConnection.h"
ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket, Hyperion * hyperion) :
ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket, Hyperion * hyperion, QStringList forwardClientList) :
QObject(),
_socket(socket),
_imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor()),
@@ -30,11 +30,22 @@ ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket, Hyperion * hype
// connect internal signals and slots
connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
connect(_socket, SIGNAL(readyRead()), this, SLOT(readData()));
for (int i = 0; i < forwardClientList.size(); ++i) {
std::cout << "Proto forward to " << forwardClientList.at(i).toLocal8Bit().constData() << std::endl;
ProtoConnection* p = new ProtoConnection("127.0.0.1:19445");
p->setSkipReply(true);
_proxy_connections << p;
}
}
ProtoClientConnection::~ProtoClientConnection()
{
delete _socket;
while (!_proxy_connections.isEmpty())
delete _proxy_connections.takeFirst();
}
void ProtoClientConnection::readData()
@@ -81,6 +92,10 @@ void ProtoClientConnection::socketClosed()
void ProtoClientConnection::handleMessage(const proto::HyperionRequest & message)
{
// forward messages
for (int i = 0; i < _proxy_connections.size(); ++i)
_proxy_connections.at(i)->sendMessage(message);
switch (message.command())
{
case proto::HyperionRequest::COLOR:

8
libsrc/protoserver/ProtoClientConnection.h
View File

@@ -6,12 +6,14 @@
// Qt includes
#include <QByteArray>
#include <QTcpSocket>
#include <QStringList>
// Hyperion includes
#include <hyperion/Hyperion.h>
// proto includes
#include "message.pb.h"
#include "protoserver/ProtoConnection.h"
class ImageProcessor;
@@ -28,7 +30,7 @@ public:
/// @param socket The Socket object for this connection
/// @param hyperion The Hyperion server
///
ProtoClientConnection(QTcpSocket * socket, Hyperion * hyperion);
ProtoClientConnection(QTcpSocket * socket, Hyperion * hyperion, QStringList forwardClientList);
///
/// Destructor
@@ -123,4 +125,8 @@ private:
/// The buffer used for reading data from the socket
QByteArray _receiveBuffer;
/// Hyperion proto connection object for forwarding
QList<ProtoConnection*> _proxy_connections;
};

7
libsrc/protoserver/ProtoServer.cpp
View File

@@ -5,12 +5,15 @@
#include <protoserver/ProtoServer.h>
#include "ProtoClientConnection.h"
ProtoServer::ProtoServer(Hyperion *hyperion, uint16_t port) :
ProtoServer::ProtoServer(Hyperion *hyperion, uint16_t port, QStringList * forwardClientList) :
QObject(),
_hyperion(hyperion),
_server(),
_openConnections()
{
for (int i = 0; i < forwardClientList->size(); ++i)
_forwardClients << forwardClientList->at(i);
if (!_server.listen(QHostAddress::Any, port))
{
throw std::runtime_error("Proto server could not bind to port");
@@ -39,7 +42,7 @@ void ProtoServer::newConnection()
if (socket != nullptr)
{
std::cout << "New proto connection" << std::endl;
ProtoClientConnection * connection = new ProtoClientConnection(socket, _hyperion);
ProtoClientConnection * connection = new ProtoClientConnection(socket, _hyperion, _forwardClients);
_openConnections.insert(connection);
// register slot for cleaning up after the connection closed