Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 17:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

have killNodeWithUUID return success to avoid double lookup

Browse source
This commit is contained in:
Stephen Birarda 2015-11-16 10:58:11 -08:00
parent ea38c4cc49
commit 584e35e4ab
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/src/DomainServer.cpp
View file

@ -1836,9 +1836,7 @@ void DomainServer::processNodeDisconnectRequestPacket(QSharedPointer<NLPacket> p
qDebug() << "Received a disconnect request from node with UUID" << nodeUUID; qDebug() << "Received a disconnect request from node with UUID" << nodeUUID;
if (limitedNodeList->nodeWithUUID(nodeUUID)) { if (limitedNodeList->killNodeWithUUID(nodeUUID)) {
limitedNodeList->killNodeWithUUID(nodeUUID);
static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID); static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID);
removedNodePacket->reset(); removedNodePacket->reset();

5
libraries/networking/src/LimitedNodeList.cpp
View file

@ -441,7 +441,7 @@ void LimitedNodeList::reset() {
_nodeSocket.clearConnections(); _nodeSocket.clearConnections();
} }
void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) { bool LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
QReadLocker readLocker(&_nodeMutex); QReadLocker readLocker(&_nodeMutex);
NodeHash::iterator it = _nodeHash.find(nodeUUID); NodeHash::iterator it = _nodeHash.find(nodeUUID);
@ -456,7 +456,10 @@ void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
} }
handleNodeKill(matchingNode); handleNodeKill(matchingNode);
return true;
} }
return false;
} }
void LimitedNodeList::processKillNode(NLPacket& packet) { void LimitedNodeList::processKillNode(NLPacket& packet) {

2
libraries/networking/src/LimitedNodeList.h
View file

@ -230,7 +230,7 @@ public slots:
virtual void sendSTUNRequest(); virtual void sendSTUNRequest();
void sendPingPackets(); void sendPingPackets();
void killNodeWithUUID(const QUuid& nodeUUID); bool killNodeWithUUID(const QUuid& nodeUUID);
signals: signals:
void dataSent(quint8 channelType, int bytes); void dataSent(quint8 channelType, int bytes);