From 19e85d509e9b12dce2af384d3880e776ba00f740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 14 Feb 2023 13:28:16 +0100 Subject: [PATCH] Remove redundand name property of transport interfaces --- libnymea-remoteproxy/server/tcpsocketserver.cpp | 5 ----- libnymea-remoteproxy/server/tcpsocketserver.h | 1 - libnymea-remoteproxy/server/transportinterface.h | 1 - libnymea-remoteproxy/server/unixsocketserver.cpp | 5 ----- libnymea-remoteproxy/server/unixsocketserver.h | 1 - libnymea-remoteproxy/server/websocketserver.cpp | 5 ----- libnymea-remoteproxy/server/websocketserver.h | 1 - libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp | 3 +-- .../tunnelproxy/tunnelproxyserverconnection.cpp | 3 ++- 9 files changed, 3 insertions(+), 22 deletions(-) diff --git a/libnymea-remoteproxy/server/tcpsocketserver.cpp b/libnymea-remoteproxy/server/tcpsocketserver.cpp index 19db242..39cf2ec 100644 --- a/libnymea-remoteproxy/server/tcpsocketserver.cpp +++ b/libnymea-remoteproxy/server/tcpsocketserver.cpp @@ -70,11 +70,6 @@ void TcpSocketServer::killClientConnection(const QUuid &clientId, const QString client->close(); } -QString TcpSocketServer::name() const -{ - return "TcpSocketServer"; -} - uint TcpSocketServer::connectionsCount() const { return m_clientList.count(); diff --git a/libnymea-remoteproxy/server/tcpsocketserver.h b/libnymea-remoteproxy/server/tcpsocketserver.h index 0a239cc..900b70a 100644 --- a/libnymea-remoteproxy/server/tcpsocketserver.h +++ b/libnymea-remoteproxy/server/tcpsocketserver.h @@ -75,7 +75,6 @@ public: void sendData(const QUuid &clientId, const QByteArray &data) override; void killClientConnection(const QUuid &clientId, const QString &killReason) override; - QString name() const override; uint connectionsCount() const override; bool running() const override; diff --git a/libnymea-remoteproxy/server/transportinterface.h b/libnymea-remoteproxy/server/transportinterface.h index 693f958..606ae9c 100644 --- a/libnymea-remoteproxy/server/transportinterface.h +++ b/libnymea-remoteproxy/server/transportinterface.h @@ -46,7 +46,6 @@ public: virtual void sendData(const QUuid &clientId, const QByteArray &data) = 0; virtual void killClientConnection(const QUuid &clientId, const QString &killReason) = 0; - virtual QString name() const = 0; virtual uint connectionsCount() const = 0; QUrl serverUrl() const; diff --git a/libnymea-remoteproxy/server/unixsocketserver.cpp b/libnymea-remoteproxy/server/unixsocketserver.cpp index 84be632..04aa3f8 100644 --- a/libnymea-remoteproxy/server/unixsocketserver.cpp +++ b/libnymea-remoteproxy/server/unixsocketserver.cpp @@ -73,11 +73,6 @@ void UnixSocketServer::killClientConnection(const QUuid &clientId, const QString } } -QString UnixSocketServer::name() const -{ - return "UnixSocketServer"; -} - uint UnixSocketServer::connectionsCount() const { return m_clientList.count(); diff --git a/libnymea-remoteproxy/server/unixsocketserver.h b/libnymea-remoteproxy/server/unixsocketserver.h index 97e91ba..ab71911 100644 --- a/libnymea-remoteproxy/server/unixsocketserver.h +++ b/libnymea-remoteproxy/server/unixsocketserver.h @@ -47,7 +47,6 @@ public: void sendData(const QUuid &clientId, const QByteArray &data) override; void killClientConnection(const QUuid &clientId, const QString &killReason) override; - QString name() const override; uint connectionsCount() const override; bool running() const override; diff --git a/libnymea-remoteproxy/server/websocketserver.cpp b/libnymea-remoteproxy/server/websocketserver.cpp index 18393d9..f90ef94 100644 --- a/libnymea-remoteproxy/server/websocketserver.cpp +++ b/libnymea-remoteproxy/server/websocketserver.cpp @@ -81,11 +81,6 @@ void WebSocketServer::killClientConnection(const QUuid &clientId, const QString client->close(QWebSocketProtocol::CloseCodeBadOperation, killReason); } -QString WebSocketServer::name() const -{ - return "WebSocketServer"; -} - uint WebSocketServer::connectionsCount() const { return m_clientList.count(); diff --git a/libnymea-remoteproxy/server/websocketserver.h b/libnymea-remoteproxy/server/websocketserver.h index 01872c7..6ab8008 100644 --- a/libnymea-remoteproxy/server/websocketserver.h +++ b/libnymea-remoteproxy/server/websocketserver.h @@ -53,7 +53,6 @@ public: void sendData(const QUuid &clientId, const QByteArray &data) override; void killClientConnection(const QUuid &clientId, const QString &killReason) override; - QString name() const override; uint connectionsCount() const override; private: diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp index 6b81061..fbb85c5 100644 --- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp +++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp @@ -212,7 +212,7 @@ QVariantMap TunnelProxyServer::currentStatistics() statisticsMap.insert("clientConnectionsCount", m_tunnelProxyClientConnections.count()); QVariantMap transports; foreach (TransportInterface *transportInterface, m_transportInterfaces) { - transports.insert(transportInterface->name(), transportInterface->connectionsCount()); + transports.insert(transportInterface->serverName(), transportInterface->connectionsCount()); } statisticsMap.insert("transports", transports); statisticsMap.insert("troughput", m_troughput); @@ -306,7 +306,6 @@ void TunnelProxyServer::onClientDisconnected(const QUuid &clientId) } else { foreach (TunnelProxyClientConnection *clientConnection, serverConnection->clientConnections()) { serverConnection->unregisterClientConnection(clientConnection); - clientConnection->setSocketAddress(0xFFFF); clientConnection->transportClient()->killConnection("Server disconnected"); } diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp index 7d91ec4..c543dc1 100644 --- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp +++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp @@ -64,15 +64,16 @@ void TunnelProxyServerConnection::registerClientConnection(TunnelProxyClientConn { quint16 socketAddress = getFreeAddress(); clientConnection->setSocketAddress(socketAddress); + clientConnection->setServerConnection(this); m_clientConnectionsAddresses.insert(socketAddress, clientConnection); m_clientConnections.insert(clientConnection->clientUuid(), clientConnection); - clientConnection->setServerConnection(this); } void TunnelProxyServerConnection::unregisterClientConnection(TunnelProxyClientConnection *clientConnection) { m_clientConnections.remove(clientConnection->clientUuid()); m_clientConnectionsAddresses.remove(clientConnection->socketAddress()); + clientConnection->setSocketAddress(0xFFFF); clientConnection->setServerConnection(nullptr); }