ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 13:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another deadlock.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-08-23 17:14:06 -07:00
parent 0a9c3b5571
commit 4d5983114c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/Switch.cpp
View File

@ -544,11 +544,16 @@ void Switch::onLocalEthernet(void *tPtr,const SharedPtr<Network> &network,const
void Switch::send(void *tPtr,Packet &packet,bool encrypt) void Switch::send(void *tPtr,Packet &packet,bool encrypt)
{ {
if (packet.destination() == RR->identity.address()) const Address dest(packet.destination());
if (dest == RR->identity.address())
return; return;
if (!_trySend(tPtr,packet,encrypt)) { if (!_trySend(tPtr,packet,encrypt)) {
{
Mutex::Lock _l(_txQueue_m); Mutex::Lock _l(_txQueue_m);
_txQueue.push_back(TXQueueEntry(packet.destination(),RR->node->now(),packet,encrypt)); _txQueue.push_back(TXQueueEntry(dest,RR->node->now(),packet,encrypt));
}
if (!RR->topology->getPeer(tPtr,dest))
requestWhois(tPtr,RR->node->now(),dest);
} }
} }
@ -714,7 +719,6 @@ bool Switch::_trySend(void *tPtr,Packet &packet,bool encrypt)
} }
} }
} else { } else {
requestWhois(tPtr,now,destination);
return false; // if we are not in cluster mode, there is no way we can send without knowing the peer directly return false; // if we are not in cluster mode, there is no way we can send without knowing the peer directly
} }