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>
119 lines
2.8 KiB
C++
119 lines
2.8 KiB
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include "tcpsocket.h"
|
|
|
|
#include <QTcpSocket>
|
|
#include <QHostAddress>
|
|
#include <QTimer>
|
|
|
|
namespace DifferentialGPS
|
|
{
|
|
TcpSocket::TcpSocket(const char *logName)
|
|
: QThread()
|
|
, m_socket(nullptr)
|
|
, m_logger(getLogger(logName))
|
|
, m_waitTime(1)
|
|
, m_reconnectTimer(nullptr)
|
|
{
|
|
qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
|
|
moveToThread(this);
|
|
}
|
|
|
|
TcpSocket::~TcpSocket()
|
|
{
|
|
cleanupObject(); // just to be sure
|
|
}
|
|
|
|
void TcpSocket::startThreadInternal(const QString &hostName, quint16 port)
|
|
{
|
|
m_hostName = hostName;
|
|
m_hostPort = port;
|
|
start();
|
|
}
|
|
|
|
void TcpSocket::run()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Starting thread";
|
|
m_reconnectTimer = new QTimer(this);
|
|
doConnect();
|
|
exec();
|
|
cleanupObject();
|
|
}
|
|
|
|
void TcpSocket::doConnect()
|
|
{
|
|
if (m_socket)
|
|
m_socket->deleteLater();;
|
|
m_socket = new QTcpSocket(this);
|
|
connect(m_socket, &QTcpSocket::connected,
|
|
this, &TcpSocket::onConnected);
|
|
connect(m_socket, &QTcpSocket::disconnected,
|
|
this, &TcpSocket::onDisconnected);
|
|
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
|
|
this, &TcpSocket::onError);
|
|
connect(m_socket, &QTcpSocket::readyRead,
|
|
this, &TcpSocket::onReadyRead);
|
|
|
|
INFO_LOG(m_logger) << "Connecting to tcp server at "
|
|
<< m_hostName << ":" << m_hostPort;
|
|
m_socket->connectToHost(m_hostName, m_hostPort);
|
|
}
|
|
|
|
void TcpSocket::onConnected()
|
|
{
|
|
INFO_LOG(m_logger) << "Connected to "
|
|
<< m_socket->peerAddress().toString()
|
|
<< ":" << m_socket->peerPort();
|
|
m_waitTime = 1;
|
|
}
|
|
|
|
void TcpSocket::onDisconnected()
|
|
{
|
|
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
|
|
<< ":" << m_socket->peerPort();
|
|
}
|
|
|
|
void TcpSocket::onError(QAbstractSocket::SocketError err)
|
|
{
|
|
ERROR_LOG(m_logger) << "Socket error: " << err
|
|
<< " " << m_socket->errorString()
|
|
<< ":" << m_socket->peerPort()
|
|
<< " - trying to reconnect in " << m_waitTime << " seconds";
|
|
m_socket->disconnectFromHost();
|
|
if (m_socket->state() != QAbstractSocket::UnconnectedState)
|
|
m_socket->waitForDisconnected();
|
|
|
|
m_waitTime += 2;
|
|
|
|
if (!m_reconnectTimer->isActive())
|
|
m_reconnectTimer->start(m_waitTime * 1000);
|
|
|
|
if (m_waitTime > 120)
|
|
m_waitTime = 120;
|
|
}
|
|
|
|
void TcpSocket::cleanupObject()
|
|
{
|
|
if (m_reconnectTimer)
|
|
{
|
|
m_reconnectTimer->disconnect(this);
|
|
delete m_reconnectTimer;
|
|
m_reconnectTimer = nullptr;
|
|
}
|
|
if (m_socket)
|
|
{
|
|
m_socket->disconnect(this);
|
|
m_socket->close();
|
|
if (m_socket->state() != QAbstractSocket::UnconnectedState)
|
|
m_socket->waitForDisconnected();
|
|
delete m_socket;
|
|
m_socket = nullptr;
|
|
}
|
|
}
|
|
|
|
|
|
} // namespace DifferentialGPS
|