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>
92 lines
2.1 KiB
C++
Executable File
92 lines
2.1 KiB
C++
Executable File
#include <httq/AbstractServer.h>
|
|
#include <httq/HttpRequest.h>
|
|
#include <httq/Logger.h>
|
|
|
|
#include <QTcpServer>
|
|
#include <QTcpSocket>
|
|
#include <QWebSocketServer>
|
|
|
|
|
|
namespace httq
|
|
{
|
|
AbstractServer::AbstractServer(QObject *parent)
|
|
: QObject(parent)
|
|
, mSvr(new QTcpServer(this))
|
|
, mLoggerFactory(nullptr)
|
|
, mLogger(nullptr)//mLoggerFactory->createLogger(this))
|
|
{}
|
|
|
|
|
|
LoggerFactory *AbstractServer::createLoggerFactory()
|
|
{
|
|
return new LoggerFactory(this);
|
|
}
|
|
|
|
|
|
LoggerFactory *AbstractServer::getLoggerFactory()
|
|
{
|
|
if (mLoggerFactory == nullptr)
|
|
mLoggerFactory = createLoggerFactory();
|
|
return mLoggerFactory;
|
|
}
|
|
|
|
|
|
void AbstractServer::slotNewConnection()
|
|
{
|
|
mLogger->debug(QStringLiteral("newConnection"));
|
|
|
|
while (QTcpSocket *cli = mSvr->nextPendingConnection())
|
|
{
|
|
mLogger->debug(QStringLiteral("nextPendingConnection"));
|
|
|
|
if (cli == nullptr)
|
|
{
|
|
mLogger->debug(QStringLiteral("invalid tcp client"));
|
|
return;
|
|
}
|
|
|
|
HttpRequest *req = new HttpRequest(cli, this);
|
|
|
|
connect(req, &HttpRequest::signalUpgrade,
|
|
this, [this, req](QTcpSocket *sock)
|
|
{
|
|
mLogger->debug(QStringLiteral("signalUpgrade"));
|
|
|
|
QWebSocketServer *wsSvr = webSocketServer();
|
|
|
|
if (wsSvr == nullptr)
|
|
{
|
|
mLogger->debug(QStringLiteral("no websocket server available for websocket upgrade"));
|
|
sock->close();
|
|
sock->deleteLater();
|
|
return;
|
|
}
|
|
|
|
wsSvr->handleConnection(sock);
|
|
emit sock->readyRead(); // rollbackTransaction doesn't re-emit the readyRead signal
|
|
});
|
|
|
|
connect(req, &HttpRequest::signalReady,
|
|
this, [this, req]()
|
|
{
|
|
mLogger->debug(QStringLiteral("signalReady"));
|
|
newHttpConnection(req); // TODO: who owns HttpRequest now?
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
bool AbstractServer::listen(qint16 port, const QHostAddress &host)
|
|
{
|
|
mLoggerFactory = createLoggerFactory();
|
|
mLogger = mLoggerFactory->createLogger(this);
|
|
|
|
mLogger->debug(QStringLiteral("listen"));
|
|
|
|
connect(mSvr, &QTcpServer::newConnection,
|
|
this, &AbstractServer::slotNewConnection);
|
|
|
|
return mSvr->listen(host, port);
|
|
}
|
|
}
|