Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 07:03:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update variable naming in NodeList from Id to ID

Browse source
This commit is contained in:
Ryan Huffman 2018-04-16 12:03:58 -07:00
parent 2546ff91ca
commit e9d2912576
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/networking/src/NodeList.cpp
View file

@ -215,16 +215,16 @@ void NodeList::processPingPacket(QSharedPointer<ReceivedMessage> message, Shared
} }
} }
int64_t connectionId; int64_t connectionID;
message->readPrimitive(&connectionId); message->readPrimitive(&connectionID);
auto it = _connectionIDs.find(sendingNode->getUUID()); auto it = _connectionIDs.find(sendingNode->getUUID());
if (it != _connectionIDs.end()) { if (it != _connectionIDs.end()) {
if (connectionId > it->second) { if (connectionID > it->second) {
qDebug() << "Received a ping packet with a larger connection id (" << connectionId << ">" << it->second << ") from " qDebug() << "Received a ping packet with a larger connection id (" << connectionID << ">" << it->second << ") from "
<< sendingNode->getUUID(); << sendingNode->getUUID();
killNodeWithUUID(sendingNode->getUUID(), connectionId); killNodeWithUUID(sendingNode->getUUID(), connectionID);
} }
} }
@ -704,17 +704,17 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
qCDebug(networking) << "No response to UDP hole punch pings for node" << node->getUUID() << "in last second."; qCDebug(networking) << "No response to UDP hole punch pings for node" << node->getUUID() << "in last second.";
} }
auto nodeId = node->getUUID(); auto nodeID = node->getUUID();
// send the ping packet to the local and public sockets for this node // send the ping packet to the local and public sockets for this node
auto localPingPacket = constructPingPacket(nodeId, PingType::Local); auto localPingPacket = constructPingPacket(nodeID, PingType::Local);
sendPacket(std::move(localPingPacket), *node, node->getLocalSocket()); sendPacket(std::move(localPingPacket), *node, node->getLocalSocket());
auto publicPingPacket = constructPingPacket(nodeId, PingType::Public); auto publicPingPacket = constructPingPacket(nodeID, PingType::Public);
sendPacket(std::move(publicPingPacket), *node, node->getPublicSocket()); sendPacket(std::move(publicPingPacket), *node, node->getPublicSocket());
if (!node->getSymmetricSocket().isNull()) { if (!node->getSymmetricSocket().isNull()) {
auto symmetricPingPacket = constructPingPacket(nodeId, PingType::Symmetric); auto symmetricPingPacket = constructPingPacket(nodeID, PingType::Symmetric);
sendPacket(std::move(symmetricPingPacket), *node, node->getSymmetricSocket()); sendPacket(std::move(symmetricPingPacket), *node, node->getSymmetricSocket());
} }