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

Flatbuffer, Forwarder

Browse Source 
- Flatbuffer now only sends data if priority registration was successful
- Forwarder no longer needs to worry about registering the priority
This commit is contained in:
Paulchen-Panther
2019-02-05 19:55:48 +01:00
parent 657fe00211
commit 5cc353468d
17 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/flatbufserver/FlatBufferClient.cpp
View File

@@ -111,6 +111,12 @@ void FlatBufferClient::handleRegisterCommand(const hyperionnet::Register *regReq
{
_priority = regReq->priority();
_hyperion->registerInput(_priority, hyperion::COMP_FLATBUFSERVER, regReq->origin()->c_str()+_clientAddress);
auto reply = hyperionnet::CreateReplyDirect(_builder, nullptr, -1, (_priority ? _priority : -1));
_builder.Finish(reply);
// send reply
sendMessage();
}
void FlatBufferClient::handleImageCommand(const hyperionnet::Image *image)

36
libsrc/flatbufserver/FlatBufferConnection.cpp
View File

@@ -95,7 +95,19 @@ void FlatBufferConnection::setRegister(const QString& origin, int priority)
auto req = hyperionnet::CreateRequest(_builder, hyperionnet::Command_Register, registerReq.Union());
_builder.Finish(req);
sendMessage(_builder.GetBufferPointer(), _builder.GetSize());
uint32_t size = _builder.GetSize();
const uint8_t header[] = {
uint8_t((size >> 24) & 0xFF),
uint8_t((size >> 16) & 0xFF),
uint8_t((size >> 8) & 0xFF),
uint8_t((size ) & 0xFF)};
// write message
int count = 0;
count += _socket.write(reinterpret_cast<const char *>(header), 4);
count += _socket.write(reinterpret_cast<const char *>(_builder.GetBufferPointer()), size);
_socket.flush();
_builder.Clear();
}
void FlatBufferConnection::setColor(const ColorRgb & color, int priority, int duration)
@@ -136,10 +148,7 @@ void FlatBufferConnection::connectToHost()
{
// try connection only when
if (_socket.state() == QAbstractSocket::UnconnectedState)
{
_socket.connectToHost(_host, _port);
//_socket.waitForConnected(1000);
}
}
void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
@@ -147,19 +156,17 @@ void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
// print out connection message only when state is changed
if (_socket.state() != _prevSocketState )
{
_registered = false;
switch (_socket.state() )
{
case QAbstractSocket::UnconnectedState:
Info(_log, "No connection to Hyperion: %s:%d", _host.toStdString().c_str(), _port);
_registered = false;
break;
case QAbstractSocket::ConnectedState:
Info(_log, "Connected to Hyperion: %s:%d", _host.toStdString().c_str(), _port);
_registered = false;
break;
default:
Debug(_log, "Connecting to Hyperion: %s:%d", _host.toStdString().c_str(), _port);
_registered = false;
break;
}
_prevSocketState = _socket.state();
@@ -171,7 +178,6 @@ void FlatBufferConnection::sendMessage(const uint8_t* buffer, uint32_t size)
if(!_registered)
{
_registered = true;
setRegister(_origin, _priority);
return;
}
@@ -194,14 +200,22 @@ bool FlatBufferConnection::parseReply(const hyperionnet::Reply *reply)
{
if (!reply->error())
{
// no error set must be a success or video
// no error set must be a success or registered or video
const auto videoMode = reply->video();
const auto registered = reply->registered();
if (videoMode != -1) {
// We got a video reply.
emit setVideoMode(static_cast<VideoMode>(videoMode));
}
return true;
}
}
// We got a registered reply.
if (registered != -1 && registered != _priority)
_registered = false;
else
_registered = true;
return true;
}
return false;
}

1
libsrc/flatbufserver/hyperion_reply.fbs
View File

@@ -3,6 +3,7 @@ namespace hyperionnet;
table Reply {
error:string;
video:int = -1;
registered:int = -1;
}
root_type Reply;

7
libsrc/hyperion/MessageForwarder.cpp
View File

@@ -98,7 +98,7 @@ void MessageForwarder::componentStateChanged(const hyperion::Components componen
{
_forwarder_enabled = enable;
handleSettingsUpdate(settings::NETFORWARD, _hyperion->getSetting(settings::NETFORWARD));
Info(_log, "Message Forwarder change state to %s", (_forwarder_enabled ? "enabled" : "disabled"));
Info(_log, "Forwarder change state to %s", (_forwarder_enabled ? "enabled" : "disabled"));
_hyperion->getComponentRegister().componentStateChanged(component, _forwarder_enabled);
}
}
@@ -187,7 +187,7 @@ void MessageForwarder::addProtoSlave(QString slave)
if (_forwarder_enabled)
{
_protoSlaves << slave;
FlatBufferConnection* flatbuf = new FlatBufferConnection("Message Forwarder", slave.toLocal8Bit().constData(), _priority, true);
FlatBufferConnection* flatbuf = new FlatBufferConnection("Forwarder", slave.toLocal8Bit().constData(), _priority, false);
_forwardClients << flatbuf;
}
}
@@ -215,10 +215,7 @@ void MessageForwarder::forwardProtoMessage(const Image<ColorRgb> &image)
if (_forwarder_enabled)
{
for (int i=0; i < _forwardClients.size(); i++)
{
_forwardClients.at(i)->setRegister("Message Forwarder", _priority);
_forwardClients.at(i)->setImage(image);
}
}
}