From fb8d2e34fb46bea9e9b483ed6e05a061a1c60371 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 23 Jan 2017 13:14:53 -0800 Subject: [PATCH] fix needless reinterpret_cast for DomainServerNodeData --- domain-server/src/DomainGatekeeper.cpp | 12 ++++++------ domain-server/src/DomainServer.cpp | 14 +++++++------- domain-server/src/DomainServerSettingsManager.cpp | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index 97f3e1a697..3d4e48f94a 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -107,7 +107,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); nodeData->setSendingSockAddr(message->getSenderSockAddr()); // guard against patched agents asking to hear about other agents @@ -128,12 +128,12 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointergetSenderSockAddr() - << "with hardware address" << nodeConnection.hardwareAddress + << "with hardware address" << nodeConnection.hardwareAddress << "and machine fingerprint" << nodeConnection.machineFingerprint; } } -NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QString verifiedUsername, const QHostAddress& senderAddress, +NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QString verifiedUsername, const QHostAddress& senderAddress, const QString& hardwareAddress, const QUuid& machineFingerprint) { NodePermissions userPerms; @@ -283,7 +283,7 @@ void DomainGatekeeper::updateNodePermissions() { QString hardwareAddress; QUuid machineFingerprint; - DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); if (nodeData) { hardwareAddress = nodeData->getHardwareAddress(); machineFingerprint = nodeData->getMachineFingerprint(); @@ -336,7 +336,7 @@ SharedNodePointer DomainGatekeeper::processAssignmentConnectRequest(const NodeCo // add the new node SharedNodePointer newNode = addVerifiedNodeFromConnectRequest(nodeConnection); - DomainServerNodeData* nodeData = reinterpret_cast(newNode->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(newNode->getLinkedData()); // set assignment related data on the linked data for this node nodeData->setAssignmentUUID(matchingQueuedAssignment->getUUID()); @@ -458,7 +458,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect newNode->setPermissions(userPerms); // grab the linked data for our new node so we can set the username - DomainServerNodeData* nodeData = reinterpret_cast(newNode->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(newNode->getLinkedData()); // if we have a username from the connect request, set it on the DomainServerNodeData nodeData->setUsername(username); diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 0f7923519b..aebec1e317 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -841,7 +841,7 @@ void DomainServer::processListRequestPacket(QSharedPointer mess sendingNode->setLocalSocket(nodeRequestData.localSockAddr); // update the NodeInterestSet in case there have been any changes - DomainServerNodeData* nodeData = reinterpret_cast(sendingNode->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(sendingNode->getLinkedData()); // guard against patched agents asking to hear about other agents auto safeInterestSet = nodeRequestData.interestList.toSet(); @@ -945,7 +945,7 @@ void DomainServer::sendDomainListToNode(const SharedNodePointer& node, const Hif // always send the node their own UUID back QDataStream domainListStream(domainListPackets.get()); - DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); // store the nodeInterestSet on this DomainServerNodeData, in case it has changed auto& nodeInterestSet = nodeData->getNodeInterestSet(); @@ -994,7 +994,7 @@ QUuid DomainServer::connectionSecretForNodes(const SharedNodePointer& nodeA, con secretUUID = QUuid::createUuid(); // set it on the other Node's sessionSecretHash - reinterpret_cast(nodeBData)->getSessionSecretHash().insert(nodeA->getUUID(), secretUUID); + static_cast(nodeBData)->getSessionSecretHash().insert(nodeA->getUUID(), secretUUID); } return secretUUID; @@ -1124,7 +1124,7 @@ void DomainServer::processRequestAssignmentPacket(QSharedPointer()->eachNode([&](const SharedNodePointer& node){ - DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); if (!nodeData->getAssignmentUUID().isNull() && !nodeData->getWalletUUID().isNull()) { // check if we have a non-finalized transaction for this node to add this amount to @@ -1556,7 +1556,7 @@ QJsonObject DomainServer::jsonObjectForNode(const SharedNodePointer& node) { nodeJson[JSON_KEY_UPTIME] = QString::number(double(QDateTime::currentMSecsSinceEpoch() - node->getWakeTimestamp()) / 1000.0); // if the node has pool information, add it - DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); // add the node username, if it exists nodeJson[JSON_KEY_USERNAME] = nodeData->getUsername(); @@ -1687,7 +1687,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url // enumerate the NodeList to find the assigned nodes nodeList->eachNode([this, &assignedNodesJSON](const SharedNodePointer& node){ - DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(node->getLinkedData()); if (!nodeData->getAssignmentUUID().isNull()) { // add the node using the UUID as the key @@ -1775,7 +1775,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url if (matchingNode) { // create a QJsonDocument with the stats QJsonObject QJsonObject statsObject = - reinterpret_cast(matchingNode->getLinkedData())->getStatsJSONObject(); + static_cast(matchingNode->getLinkedData())->getStatsJSONObject(); // add the node type to the JSON data for output purposes statsObject["node_type"] = NodeType::getNodeTypeName(matchingNode->getType()).toLower().replace(' ', '-'); diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 5e1d747604..a0b80875b0 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -725,7 +725,7 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer(matchingNode->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(matchingNode->getLinkedData()); if (nodeData) { // mac address first NodePermissionsKey macAddressKey(nodeData->getHardwareAddress(), 0); @@ -807,7 +807,7 @@ void DomainServerSettingsManager::processUsernameFromIDRequestPacket(QSharedPoin usernameFromIDReplyPacket->writeString(verifiedUsername); // now put in the machine fingerprint - DomainServerNodeData* nodeData = reinterpret_cast(matchingNode->getLinkedData()); + DomainServerNodeData* nodeData = static_cast(matchingNode->getLinkedData()); machineFingerprint = nodeData ? nodeData->getMachineFingerprint() : QUuid(); usernameFromIDReplyPacket->write(machineFingerprint.toRfc4122()); } else {