ETM-Schurig
/
nymea-remoteproxy
mirror of https://github.com/nymea/nymea-remoteproxy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundand name property of transport interfaces

cleanup-proxy-code
Simon Stürz 2023-02-14 13:28:16 +01:00
parent 1a3a69c01f
commit 19e85d509e
9 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-remoteproxy/server/tcpsocketserver.cpp
View File

@ -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();

1
libnymea-remoteproxy/server/tcpsocketserver.h
View File

@ -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;

1
libnymea-remoteproxy/server/transportinterface.h
View File

@ -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;

5
libnymea-remoteproxy/server/unixsocketserver.cpp
View File

@ -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();

1
libnymea-remoteproxy/server/unixsocketserver.h
View File

@ -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;

5
libnymea-remoteproxy/server/websocketserver.cpp
View File

@ -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();

1
libnymea-remoteproxy/server/websocketserver.h
View File

@ -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:

3
libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
View File

@ -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");
}

3
libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp
View File

@ -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);
}