From 816111ddc71af40f9c81c7c98520603555a138e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Mar 2022 17:09:12 +0100 Subject: [PATCH] Update package to packet --- libnymea-remoteproxy/proxy/proxyclient.cpp | 8 ++++---- libnymea-remoteproxy/server/jsonrpcserver.cpp | 10 +++++----- libnymea-remoteproxy/server/jsonrpcserver.h | 2 +- .../tunnelproxy/tunnelproxyclient.cpp | 14 +++++++------- .../tunnelproxy/tunnelproxyserver.cpp | 4 ++-- libnymea-remoteproxyclient/proxyjsonrpcclient.cpp | 6 +++--- libnymea-remoteproxyclient/proxyjsonrpcclient.h | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libnymea-remoteproxy/proxy/proxyclient.cpp b/libnymea-remoteproxy/proxy/proxyclient.cpp index 1b5b68b..0971e9a 100644 --- a/libnymea-remoteproxy/proxy/proxyclient.cpp +++ b/libnymea-remoteproxy/proxy/proxyclient.cpp @@ -127,22 +127,22 @@ void ProxyClient::resetTimer() QList ProxyClient::processData(const QByteArray &data) { - QList packages; + QList packets; // Handle packet fragmentation m_dataBuffer.append(data); int splitIndex = m_dataBuffer.indexOf("}\n{"); while (splitIndex > -1) { - packages.append(m_dataBuffer.left(splitIndex + 1)); + packets.append(m_dataBuffer.left(splitIndex + 1)); m_dataBuffer = m_dataBuffer.right(m_dataBuffer.length() - splitIndex - 2); splitIndex = m_dataBuffer.indexOf("}\n{"); } if (m_dataBuffer.trimmed().endsWith("}")) { - packages.append(m_dataBuffer); + packets.append(m_dataBuffer); m_dataBuffer.clear(); } - return packages; + return packets; } QDebug operator<<(QDebug debug, ProxyClient *proxyClient) diff --git a/libnymea-remoteproxy/server/jsonrpcserver.cpp b/libnymea-remoteproxy/server/jsonrpcserver.cpp index 6b30d5e..9157d0a 100644 --- a/libnymea-remoteproxy/server/jsonrpcserver.cpp +++ b/libnymea-remoteproxy/server/jsonrpcserver.cpp @@ -189,7 +189,7 @@ void JsonRpcServer::unregisterHandler(JsonHandler *handler) m_handlers.remove(handler->name()); } -void JsonRpcServer::processDataPackage(TransportClient *transportClient, const QByteArray &data) +void JsonRpcServer::processDataPacket(TransportClient *transportClient, const QByteArray &data) { QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error); @@ -347,8 +347,8 @@ void JsonRpcServer::processData(TransportClient *transportClient, const QByteArr qCDebug(dcJsonRpcTraffic()) << "Incoming data from" << transportClient << ": " << qUtf8Printable(data); - // Handle package fragmentation - QList packages = transportClient->processData(data); + // Handle packet fragmentation + QList packets = transportClient->processData(data); // Make sure the buffer size is in range if (transportClient->bufferSize() > 1024 * 10) { @@ -357,8 +357,8 @@ void JsonRpcServer::processData(TransportClient *transportClient, const QByteArr return; } - foreach (const QByteArray &package, packages) { - processDataPackage(transportClient, package); + foreach (const QByteArray &packet, packets) { + processDataPacket(transportClient, packet); } } diff --git a/libnymea-remoteproxy/server/jsonrpcserver.h b/libnymea-remoteproxy/server/jsonrpcserver.h index c294084..bed18ce 100644 --- a/libnymea-remoteproxy/server/jsonrpcserver.h +++ b/libnymea-remoteproxy/server/jsonrpcserver.h @@ -74,7 +74,7 @@ private slots: void asyncReplyFinished(); public slots: - void processDataPackage(TransportClient *transportClient, const QByteArray &data); + void processDataPacket(TransportClient *transportClient, const QByteArray &data); // Client registration for JSON RPC traffic void registerClient(TransportClient *transportClient); diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp index a9354c7..710fdab 100644 --- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp +++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp @@ -27,11 +27,11 @@ void TunnelProxyClient::setType(Type type) QList TunnelProxyClient::processData(const QByteArray &data) { - QList packages; + QList packets; - // Parse packages depending on the encoded + // Parse packets depending on the encoded if (m_slipEnabled) { - // Read each byte until we get END byte, then unescape the package + // Read each byte until we get END byte, then unescape the packet for (int i = 0; i < data.length(); i++) { quint8 byte = static_cast(data.at(i)); if (byte == SlipDataProcessor::ProtocolByteEnd) { @@ -44,7 +44,7 @@ QList TunnelProxyClient::processData(const QByteArray &data) qCWarning(dcTunnelProxyServerTraffic()) << "Received inconsistant SLIP encoded message. Ignoring data..."; } else { qCDebug(dcTunnelProxyServerTraffic()) << "Frame received"; - packages.append(m_dataBuffer); + packets.append(m_dataBuffer); m_dataBuffer.clear(); } } else { @@ -56,17 +56,17 @@ QList TunnelProxyClient::processData(const QByteArray &data) m_dataBuffer.append(data); int splitIndex = m_dataBuffer.indexOf("}\n{"); while (splitIndex > -1) { - packages.append(m_dataBuffer.left(splitIndex + 1)); + packets.append(m_dataBuffer.left(splitIndex + 1)); m_dataBuffer = m_dataBuffer.right(m_dataBuffer.length() - splitIndex - 2); splitIndex = m_dataBuffer.indexOf("}\n{"); } if (m_dataBuffer.trimmed().endsWith("}")) { - packages.append(m_dataBuffer); + packets.append(m_dataBuffer); m_dataBuffer.clear(); } } - return packages; + return packets; } QDebug operator<<(QDebug debug, TunnelProxyClient *tunnelProxyClient) diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp index 3614c5f..7c434b4 100644 --- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp +++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp @@ -350,14 +350,14 @@ void TunnelProxyServer::onClientDataAvailable(const QUuid &clientId, const QByte // Data coming from a connected server connection if (tunnelProxyClient->slipEnabled()) { // Unpack SLIP data, get address, pipe to client or give it to the json rpc server if address 0x0000 - // Handle package fragmentation + // Handle packet fragmentation QList frames = tunnelProxyClient->processData(data); foreach (const QByteArray &frameData, frames) { SlipDataProcessor::Frame frame = SlipDataProcessor::parseFrame(frameData); if (frame.socketAddress == 0x0000) { qCDebug(dcTunnelProxyServerTraffic()) << "Received frame for the JSON server" << tunnelProxyClient; - m_jsonRpcServer->processDataPackage(tunnelProxyClient, frame.data); + m_jsonRpcServer->processDataPacket(tunnelProxyClient, frame.data); } else { // This data seems to be for a client with the given address TunnelProxyServerConnection *serverConnection = m_tunnelProxyServerConnections.value(tunnelProxyClient->uuid()); diff --git a/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp index e5ed682..889f59e 100644 --- a/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp +++ b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp @@ -133,7 +133,7 @@ void JsonRpcClient::sendRequest(const QVariantMap &request, bool slipEnabled) m_connection->sendData(data); } -void JsonRpcClient::processDataPackage(const QByteArray &data) +void JsonRpcClient::processDataPacket(const QByteArray &data) { QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error); @@ -196,12 +196,12 @@ void JsonRpcClient::processData(const QByteArray &data) m_dataBuffer.append(data); int splitIndex = m_dataBuffer.indexOf("}\n{"); while (splitIndex > -1) { - processDataPackage(m_dataBuffer.left(splitIndex + 1)); + processDataPacket(m_dataBuffer.left(splitIndex + 1)); m_dataBuffer = m_dataBuffer.right(m_dataBuffer.length() - splitIndex - 2); splitIndex = m_dataBuffer.indexOf("}\n{"); } if (m_dataBuffer.trimmed().endsWith("}")) { - processDataPackage(m_dataBuffer); + processDataPacket(m_dataBuffer); m_dataBuffer.clear(); } } diff --git a/libnymea-remoteproxyclient/proxyjsonrpcclient.h b/libnymea-remoteproxyclient/proxyjsonrpcclient.h index 22d0321..115c859 100644 --- a/libnymea-remoteproxyclient/proxyjsonrpcclient.h +++ b/libnymea-remoteproxyclient/proxyjsonrpcclient.h @@ -68,7 +68,7 @@ private: QHash m_replies; void sendRequest(const QVariantMap &request, bool slipEnabled = false); - void processDataPackage(const QByteArray &data); + void processDataPacket(const QByteArray &data); signals: void tunnelEstablished(const QString clientName, const QString &clientUuid);