torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
91 lines
2.5 KiB
C++
91 lines
2.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* The ClientConnection class represents a connection to a single client.
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hannes Baeuerle, SLSE, 2016-08-25
|
|
*/
|
|
#include "client_connection.h"
|
|
|
|
#include <QWebSocket>
|
|
|
|
namespace LtsWebSocket
|
|
{
|
|
|
|
ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
|
|
: QThread(parent)
|
|
, m_socket(socket ? socket : new QWebSocket)
|
|
, m_logger(getLogger("ClientConnection"))
|
|
{
|
|
}
|
|
|
|
ClientConnection::~ClientConnection()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Thread closed" << this;
|
|
delete m_socket;
|
|
qDeleteAll(m_messageQueue);
|
|
}
|
|
|
|
bool ClientConnection::init()
|
|
{
|
|
if (m_socket == nullptr)
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
|
|
return false;
|
|
}
|
|
|
|
DEBUG_LOG(m_logger) << "Started new thread" << this;
|
|
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection);
|
|
connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
|
|
connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
|
|
|
|
return true;
|
|
}
|
|
|
|
void ClientConnection::addReply(ReplyMessage *message)
|
|
{
|
|
if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
|
|
{
|
|
m_messageQueue.enqueue(message);
|
|
DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
|
|
return;
|
|
}
|
|
const QString msg(message->toJsonString());
|
|
DEBUG_LOG(m_logger) << "Sending message: " << msg ;//<< msg;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
}
|
|
|
|
void ClientConnection::onNewTextMessageFromSocket(const QString &message)
|
|
{
|
|
DEBUG_LOG(m_logger) << "Recv msg: " << message << this;
|
|
emit newTextMessage(this, message);
|
|
}
|
|
|
|
void ClientConnection::sendMessagesFromQueue()
|
|
{
|
|
INFO_LOG(m_logger) << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
|
|
|
|
if (m_socket->state() != QAbstractSocket::ConnectedState)
|
|
return;
|
|
while (!m_messageQueue.isEmpty())
|
|
{
|
|
ReplyMessage *message = m_messageQueue.dequeue();
|
|
const QString msg(message->toJsonString());
|
|
TRACE_LOG(m_logger) << "Send msg: " << msg;
|
|
m_socket->sendTextMessage(msg);
|
|
delete message;
|
|
DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
|
|
}
|
|
}
|
|
|
|
void ClientConnection::onSocketDisconnect()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
|
|
exit(0);
|
|
emit disconnected(this);
|
|
}
|
|
|
|
} // namespace LtsWebSocket
|