Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- 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>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -25,7 +25,6 @@ AesHandler::AesHandler(NgsHandler *ngsHandler)
, m_ftcAes(nullptr)
, m_dtcPpm(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AesHandler"))
{
}
@@ -44,7 +44,5 @@ private:
QMap<int, void*> m_pendingRequests;
LtsUtils::RequestHelper *m_requestHelper;
NGL::INGLLogger &m_logger;
};
}
@@ -12,9 +12,8 @@ namespace HighLevelArchitecture
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_exerciseHasHlaConnection(false)
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
DdsHandler::~DdsHandler()
@@ -28,7 +27,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -38,7 +38,6 @@ private:
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_dtcExm;
bool m_exerciseHasHlaConnection;
NGL::INGLLogger &m_logger;
};
}
@@ -16,7 +16,6 @@ namespace HighLevelArchitecture
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_exerciseId(0)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
@@ -32,7 +31,7 @@ bool MainHandler::init(int domainId, int exerciseId)
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Could not init DDS handler";
ERROR_LOG() << "Could not init DDS handler";
return false;
}
connect(m_ddsHandler.get(), &DdsHandler::exerciseHlaStateChanged,
@@ -30,6 +30,5 @@ private:
std::shared_ptr<NgsHandler> m_ngsHandler;
std::shared_ptr<WebSocketHandler> m_wsHandler;
int m_exerciseId;
LOGGER_T m_logger;
};
}
@@ -145,8 +145,6 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this))
, m_logger(getLogger("NgsConnector"))
{
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
@@ -214,7 +212,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const ngs::NGSSimWorldException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
return false;
}
@@ -229,7 +227,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const NGSException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
return false;
}
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -279,22 +277,22 @@ void NgsConnector::subscribeAtNgs()
m_enitityNumberCounter = 1;
m_eventCount = 1;
INFO_LOG(m_logger) << "Subscribe at NGS - Human Objects";
INFO_LOG() << "Subscribe at NGS - Human Objects";
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
humanObjClass.subscribeAllAttributes();
humanObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - GroundVehicle Objects";
INFO_LOG() << "Subscribe at NGS - GroundVehicle Objects";
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.subscribeAllAttributes();
groundVehicleObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - LongBowApache Objects";
INFO_LOG() << "Subscribe at NGS - LongBowApache Objects";
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
longBowApacheObjClass.subscribeAllAttributes();
longBowApacheObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Designator Objects";
INFO_LOG() << "Subscribe at NGS - Designator Objects";
rpr2::IObserverDesignatorObjClass &designatorObjClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
designatorObjClass.subscribeAllAttributes();
designatorObjClass.subscribe();
@@ -323,35 +321,35 @@ void NgsConnector::unsubscribeFromNgs()
if (m_somPlayer)
{
INFO_LOG(m_logger) << "Unsubscribe at NGS - Human Objects";
INFO_LOG() << "Unsubscribe at NGS - Human Objects";
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
humanObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - GroundVehicle Objects";
INFO_LOG() << "Unsubscribe at NGS - GroundVehicle Objects";
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - LongBowApache Objects";
INFO_LOG() << "Unsubscribe at NGS - LongBowApache Objects";
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
longBowApacheObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Designator Objects";
INFO_LOG() << "Unsubscribe at NGS - Designator Objects";
rpr2::IObserverDesignatorObjClass &designatorObjectClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
designatorObjectClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Engagement Reply Interaction";
INFO_LOG() << "Unsubscribe at NGS - Engagement Reply Interaction";
rpr2::IObserverEngagementReplyIntClass &enr = m_somPlayer->getObserverEngagementReplyIntClass(*m_iaEngagementReplyCallback);
enr.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Event Report Interaction";
INFO_LOG() << "Unsubscribe at NGS - Event Report Interaction";
rpr2::IObserverEventReportIntClass &evr = m_somPlayer->getObserverEventReportIntClass(*m_iaEventReportCallback);
evr.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Munition Detonation Interaction";
INFO_LOG() << "Unsubscribe at NGS - Munition Detonation Interaction";
rpr2::IObserverMunitionDetonationIntClass &md = m_somPlayer->getObserverMunitionDetonationIntClass(*m_iaMunitionDetonationCallback);
md.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Weapon Fire Interaction";
INFO_LOG() << "Unsubscribe at NGS - Weapon Fire Interaction";
rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
wf.unsubscribe();
}
@@ -517,7 +515,7 @@ bool NgsConnector::sendData(int eqNo, const QByteArray& data, int requestIdentif
vds.NumberOfLongLongs__A__Padding__A__DatumValue.resize(data.size() / 8 + 1);
vds.DatumLengthInBits = 8 * data.size();
TRACE_LOG(m_logger) << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
TRACE_LOG() << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
for (unsigned int i=0; i< vds.NumberOfLongLongs__A__Padding__A__DatumValue.size(); ++i)
{
@@ -684,11 +682,11 @@ void NgsConnector::go()
}
catch (const NGSException &ex)
{
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
}
catch (const std::exception &e)
{
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
}
catch (...)
{
@@ -1501,7 +1499,7 @@ void NgsConnector::onNewMunitionDetonation(const rpr2::IObserverMunitionDetonati
const auto &objectIdentifier = interaction.getEventIdentifier().IssuingObjectIdentifier;
int eqId = getEquipmentNoByRTIObjectId(objectIdentifier.ID);
DEBUG_LOG(m_logger) << "Engagement Reply, Issuer: " << eqId;
DEBUG_LOG() << "Engagement Reply, Issuer: " << eqId;
if (m_playerMap.contains(eqId) || objectIdentifier.ID == std::to_string(IdentifierStruct(0).toInt64()))
return;
@@ -267,9 +267,7 @@ protected:
bool m_bInitialized;
bool m_bCanPublishData;
QTimer *m_timer;
NGL::INGLLogger &m_logger;
QTimer *m_timer;
static quint16 s_ownSiteId;
static quint16 s_ownApplicationId;
@@ -17,7 +17,6 @@ namespace HighLevelArchitecture
NgsHandler::NgsHandler(QObject *parent)
: QObject(parent)
, m_ddsHandler(nullptr)
, m_logger(getLogger("NgsHandler"))
{}
NgsHandler::~NgsHandler()
@@ -40,7 +39,7 @@ bool NgsHandler::init(const std::shared_ptr<DdsHandler> &ddsHandler)
ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
m_ngsConnector =
@@ -62,9 +61,9 @@ void NgsHandler::onFirstTickFinished()
m_ppmHandler = std::make_shared<PpmHandler>(this);
m_aesHandler = std::make_shared<AesHandler>(this);
if (!m_ppmHandler->init())
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish participants to HLA";
ERROR_LOG() << "Could not init ppm handler - not able to publish participants to HLA";
if (!m_aesHandler->init())
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish area effect simulations to HLA";
ERROR_LOG() << "Could not init ppm handler - not able to publish area effect simulations to HLA";
connect(m_ppmHandler.get(), &PpmHandler::externalEquipmentNumberAdded,
this, &NgsHandler::externalEquipmentNumberAdded);
@@ -90,11 +89,11 @@ void NgsHandler::initSocketReaders()
sr->start();
connect(sr, &SocketReader::newData, this, &NgsHandler::onNewSocketReaderData);
m_socketReaders.append(sr);
INFO_LOG(m_logger) << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
INFO_LOG() << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
}
else
{
ERROR_LOG(m_logger) << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
ERROR_LOG() << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
}
}
}
@@ -57,6 +57,5 @@ private:
std::shared_ptr<AesHandler> m_aesHandler;
std::shared_ptr<NgsConnector> m_ngsConnector;
QList<SocketReader *> m_socketReaders;
LOGGER_T m_logger;
};
}
@@ -16,7 +16,6 @@ namespace HighLevelArchitecture
PpmHandler::PpmHandler(NgsHandler *ngsHandler)
: m_ngsHandler(ngsHandler)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("PpmHandler"))
{}
PpmHandler::~PpmHandler()
@@ -83,7 +82,7 @@ bool PpmHandler::init()
m_dtsTab->enableEquipmentGearAssignment())
)
{
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
return false;
}
@@ -173,7 +172,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
int equipmentNo = getEquipmentNo(data.participantId());
if (equipmentNo == 0)
{
ERROR_LOG(m_logger) << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
ERROR_LOG() << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
return;
}
@@ -236,7 +235,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
DEBUG_LOG() << "onParticipantChanged: " << data;
switch (modType)
{
case DataModification::eAdded:
@@ -315,7 +314,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
DEBUG_LOG() << "onParticipantPositionChanged: " << data;
switch (modType)
{
case DataModification::eAdded:
@@ -405,7 +404,7 @@ void PpmHandler::onChargeTypeChanged(const ProjectDataManagement::ChargeType &da
void PpmHandler::startPublishToNgs()
{
INFO_LOG(m_logger) << "Recreating all players from scratch due to structure / exercise change";
INFO_LOG() << "Recreating all players from scratch due to structure / exercise change";
m_createdParticipantIds.clear();
@@ -414,7 +413,7 @@ void PpmHandler::startPublishToNgs()
INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
INFO_LOG() << "(Re)Adding all players, size: " << m_partData.size();
for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
createParticipant(participant);
@@ -475,7 +474,7 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromPercenta
void PpmHandler::participantVulnerabilityStateRequest(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &request)
{
DEBUG_LOG(m_logger) << "Participant Vulnerability State Request";
DEBUG_LOG() << "Participant Vulnerability State Request";
rpr2::DetonationResultCodeEnum8::ET resCode = rpr2DetonationResultFromVulnerabilityState(request.reqestedState);
m_ngsHandler->ngsConnector()->sendMunitionDetonation(request.header.equipmentNumber,
@@ -504,7 +503,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
if (!m_ngsHandler->ngsConnector()->canPublishData())
{
WARNING_LOG(m_logger) << "Can not publish data ... :(";
WARNING_LOG() << "Can not publish data ... :(";
return;
}
@@ -134,9 +134,6 @@ private:
QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
QMap<qint32, ProjectDataManagement::GearTypeChargeType> m_gearTypeChargeTypes;
NGL::INGLLogger &m_logger;
};
}
@@ -22,6 +22,6 @@ void ObserverActionRequestCBNotifier::newActionRequestIntInstance(const rpr2::IO
void ObserverActionRequestCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -25,8 +25,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newActionRequest(const rpr2::IObserverActionRequestIntInstance &interaction);
@@ -22,6 +22,6 @@ void ObserverDataCBNotifier::newDataIntInstance(const rpr2::IObserverDataIntInst
void ObserverDataCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -25,8 +25,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newData(const rpr2::IObserverDataIntInstance &interaction);
@@ -23,6 +23,6 @@ void ObserverEngagementReplyCBNotifier::newEngagementReplyIntInstance(const rpr2
void ObserverEngagementReplyCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -25,8 +25,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newEngagementReply(const rpr2::IObserverEngagementReplyIntInstance &interaction);
};
@@ -22,6 +22,6 @@ void ObserverEventReportCBNotifier::newEventReportIntInstance(const rpr2::IObser
void ObserverEventReportCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -25,8 +25,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newEventReport(const rpr2::IObserverEventReportIntInstance &interaction);
};
@@ -17,6 +17,6 @@ void ObserverMunitionDetonationCBNotifier::newMunitionDetonationIntInstance(cons
void ObserverMunitionDetonationCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -24,8 +24,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newMunitionDetonation(const rpr2::IObserverMunitionDetonationIntInstance &interaction);
};
@@ -23,6 +23,6 @@ void ObserverWeaponFireCBNotifier::newWeaponFireIntInstance(const rpr2::IObserve
void ObserverWeaponFireCBNotifier::deleteInterface()
{
DEBUG_LOG(m_logger) << "Delete Interface";
DEBUG_LOG() << "Delete Interface";
}
@@ -25,8 +25,6 @@ public:
void deleteInterface() override;
protected:
NGL::INGLLogger &m_logger;
signals:
void newWeaponFire(const rpr2::IObserverWeaponFireIntInstance &interaction);
};
@@ -40,5 +40,4 @@ Q_SIGNALS:
void objectInstanceDeleted(const ngs::IObserverObjectInstance &object);
protected:
NGL::INGLLogger &m_logger;
};
@@ -25,7 +25,7 @@ public:
void deleteObjectInstance() override
{
DEBUG_LOG(m_logger) << "deleteObjectInstance";
DEBUG_LOG() << "deleteObjectInstance";
if (m_pCB && m_pIObject)
m_pCB->deleteObjectInstance(*m_pIObject);
delete this;
@@ -43,5 +43,4 @@ public:
protected:
OBJ *m_pIObject;
OBJ_CB *m_pCB;
NGL::INGLLogger &m_logger;
};
@@ -22,7 +22,7 @@ SocketReader::SocketReader(QObject *parent)
bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
{
DEBUG_LOG(m_logger) << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
DEBUG_LOG() << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
m_hlaRequestIdentifier = hlaRequestIdentifier;
connect(m_socket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
@@ -49,9 +49,9 @@ void SocketReader::onReadyRead()
DEBUG_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
DEBUG_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
QByteArray ba(m_socket->readAll());
TRACE_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
TRACE_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
emit newData(ba, m_hlaRequestIdentifier);
}
@@ -75,7 +75,7 @@ void SocketReader::onSocketError(const QAbstractSocket::SocketError &error)
}
}
ERROR_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
ERROR_LOG() << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
}
}
@@ -28,8 +28,6 @@ signals:
protected:
QTcpSocket *m_socket;
int m_hlaRequestIdentifier;
NGL::INGLLogger &m_logger;
private slots:
void onReadyRead();
void onSocketError(const QAbstractSocket::SocketError &error);
@@ -20,7 +20,6 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
, m_mainHandler(mainHandler)
, m_exerciseId(exerciseId)
, m_logger(getLogger("WebSocketHandler"))
{}
WebSocketHandler::~WebSocketHandler()
@@ -33,7 +32,7 @@ bool WebSocketHandler::init(quint16 listenPort)
{
if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
return false;
}
connect(m_webSocketServer, &QWebSocketServer::newConnection,
@@ -52,7 +51,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
DEBUG_LOG() << "jsonStr: " << jsonStr;
bool bOk = false;
for (auto wsw : std::as_const(m_webSockets))
@@ -69,12 +68,12 @@ void WebSocketHandler::sendHlaConnectionState()
TrainingAreaBase::TetraIcd::ProxyConnectionState connState;
connState.connectedToSystem = m_mainHandler->isConnectedToHla();
sendTelegram(&connState, m_exerciseId);
DEBUG_LOG(m_logger) << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
DEBUG_LOG() << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
}
void WebSocketHandler::sendParticipantConnectionStates()
{
DEBUG_LOG(m_logger) << "sendParticipantConnectionStates";
DEBUG_LOG() << "sendParticipantConnectionStates";
TrainingAreaBase::TetraIcd::WlsParticipantsConnectionState partConnState;
partConnState.equipmentNumber = -1;
partConnState.dataCommunicationPossible = false;
@@ -82,7 +81,7 @@ void WebSocketHandler::sendParticipantConnectionStates()
if (!m_mainHandler->isConnectedToHla())
{
INFO_LOG(m_logger) << "We are (not) yet connected to HLA - don't send participant connection states";
INFO_LOG() << "We are (not) yet connected to HLA - don't send participant connection states";
return;
}
const auto externalEquipmentNumbers = m_mainHandler->ngsHandler()->ppmHandler()->externalEquipmentNumbers();
@@ -118,7 +117,7 @@ void WebSocketHandler::onNewConnection()
QWebSocket *ws = m_webSocketServer->nextPendingConnection();
if (!ws)
return;
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
auto wsw = std::make_shared<WebSocketWrapper>(ws);
connect(wsw.get(), &WebSocketWrapper::textMessageReceived,
@@ -133,11 +132,11 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
{
using namespace TrainingAreaBase::TetraIcd;
TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
if (!wsw)
{
ERROR_LOG(m_logger) << "Internal error - sender is no WebSocketWrapper";
ERROR_LOG() << "Internal error - sender is no WebSocketWrapper";
return;
}
@@ -157,7 +156,7 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
if (!typeId.isDouble())
{
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
ERROR_LOG() << "Can not read type id: " << baJson;
return;
}
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -186,14 +185,14 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
emit vulnerabilityStateRequest(DemandVulnerabilityStateChange::fromJson(data));
break;
default:
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
<< " not yet implemented (" << baJson << ")";
return;
}
}
catch (const std::exception &e)
{
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
return;
}
}
@@ -66,8 +66,6 @@ private:
QVector<std::shared_ptr<WebSocketWrapper>> m_webSockets;
MainHandler *m_mainHandler;
int m_exerciseId;
LOGGER_T m_logger;
};
class WebSocketWrapper : public QObject