- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
127 lines
3.4 KiB
C++
127 lines
3.4 KiB
C++
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "PrtCnvInjectionSocket.hpp"
|
|
#include <CoPrtCnv/CoPrtCnvInjectionHeader.hpp>
|
|
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
|
#include "PrtCnvInjectionThread.hpp"
|
|
#include <QtCore/QByteArray>
|
|
#include <QTcpSocket>
|
|
|
|
namespace PrtCnv
|
|
{
|
|
|
|
PrtCnvInjectionSocket::PrtCnvInjectionSocket()
|
|
: m_Socket(nullptr)
|
|
, m_Server(nullptr)
|
|
{}
|
|
|
|
PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
|
|
{
|
|
delete m_Socket;
|
|
}
|
|
|
|
|
|
|
|
|
|
void PrtCnvInjectionSocket::disconnectClient()
|
|
{
|
|
INFO_LOG() << "A client has disconnected from the injection-server";
|
|
emit disconnected(this);
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void PrtCnvInjectionSocket::processInputData()
|
|
{
|
|
INFO_LOG() << "Injection-server has data received";
|
|
N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
|
|
qint64 bytesRead = m_Socket->peek((char*)&injectionHeader, sizeof(injectionHeader));
|
|
if (sizeof(injectionHeader) == bytesRead)
|
|
{
|
|
if (injectionHeader.isIdCorrect())
|
|
{
|
|
|
|
qint64 available = m_Socket->bytesAvailable();
|
|
if (available < (injectionHeader.m_Size+sizeof(injectionHeader)))
|
|
{
|
|
INFO_LOG() << "not enough bytes available - waiting for more data: "
|
|
<< "headersize=" << sizeof(injectionHeader) << " id1="
|
|
<< injectionHeader.m_Id1 << " id2=" << injectionHeader.m_Id2
|
|
<< " kind=" << (int)injectionHeader.m_Kind << " size="
|
|
<< injectionHeader.m_Size;
|
|
return;
|
|
}
|
|
|
|
m_Socket->read((char*)&injectionHeader, sizeof(injectionHeader));
|
|
if (injectionHeader.isIdCorrect())
|
|
{
|
|
|
|
|
|
|
|
QByteArray data(injectionHeader.m_Size, Qt::Uninitialized);
|
|
m_Socket->read(data.data(), injectionHeader.m_Size);
|
|
|
|
switch (injectionHeader.m_Kind)
|
|
{
|
|
case N_CoPrtCnv::CoPrtCnvInjectionHeader::eCentral:
|
|
case N_CoPrtCnv::CoPrtCnvInjectionHeader::eRadio:
|
|
{
|
|
N_CoPrtCnv::CoPrtCnvCentralTelegram *tele = new N_CoPrtCnv::CoPrtCnvCentralTelegram(data);
|
|
|
|
if (N_CoPrtCnv::CoPrtCnvInjectionHeader::eCentral == injectionHeader.m_Kind &&
|
|
tele->telegramId() != TrainingAreaBase::TetraIcd::TelegramId::DATENVERKEHR_TDS_SRT)
|
|
{
|
|
INFO_LOG() << "Got an injection-central-telegram with telId=" << tele->telegramId();
|
|
m_Server->addToCentralList(tele);
|
|
}
|
|
else
|
|
{
|
|
INFO_LOG() << "Got an injection-radio-telegram with telId=" << tele->telegramId();
|
|
m_Server->addToRadioList(tele);
|
|
}
|
|
}
|
|
break;
|
|
|
|
default:
|
|
ERROR_LOG() << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ERROR_LOG() << "Corrupt injection-telegram received => reconnect";
|
|
m_Socket->disconnectFromHost();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void PrtCnvInjectionSocket::setSocket(QTcpSocket* a_socket, PrtCnvInjectionThread* a_server)
|
|
{
|
|
m_Socket = a_socket;
|
|
m_Server = a_server;
|
|
connect(this, &PrtCnvInjectionSocket::disconnected, m_Server, &PrtCnvInjectionThread::disconnectClient, Qt::QueuedConnection);
|
|
if (m_Socket)
|
|
{
|
|
connect(m_Socket, &QTcpSocket::readyRead, this, &PrtCnvInjectionSocket::processInputData, Qt::QueuedConnection);
|
|
connect(m_Socket, &QTcpSocket::disconnected, this, &PrtCnvInjectionSocket::disconnectClient, Qt::QueuedConnection);
|
|
}
|
|
}
|
|
|
|
}
|