summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-02-01 14:05:13 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-02-01 14:05:13 -0800
commitfc3f4fb988c77d35792e593c17715a223a126d60 (patch)
tree2631b2be1c9f4a74b6e169154b8ddfb7f0d4be58
parent60ff280dcb213a3e50eb410184493ace1d4c2736 (diff)
downloadinfinitytier-fc3f4fb988c77d35792e593c17715a223a126d60.tar.gz
infinitytier-fc3f4fb988c77d35792e593c17715a223a126d60.zip
Yeah that could never have worked (normal packets in cluster mode).
-rw-r--r--node/Switch.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp
index 6860b865..fdf889ea 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -197,11 +197,6 @@ void Switch::onRemotePacket(const InetAddress &localAddr,const InetAddress &from
const Address destination(reinterpret_cast<const uint8_t *>(data) + 8,ZT_ADDRESS_LENGTH);
const Address source(reinterpret_cast<const uint8_t *>(data) + 13,ZT_ADDRESS_LENGTH);
- // Catch this and toss it -- it would never work, but it could happen if we somehow
- // mistakenly guessed an address we're bound to as a destination for another peer.
- if (source == RR->identity.address())
- return;
-
//TRACE("<< %.16llx %s -> %s (size: %u)",(unsigned long long)packet->packetId(),source.toString().c_str(),destination.toString().c_str(),packet->size());
if (destination != RR->identity.address()) {
@@ -223,7 +218,7 @@ void Switch::onRemotePacket(const InetAddress &localAddr,const InetAddress &from
}
} else {
#ifdef ZT_ENABLE_CLUSTER
- if (RR->cluster) {
+ if ((RR->cluster)&&(source != RR->identity.address())) {
bool shouldUnite;
{
Mutex::Lock _l(_lastUniteAttempt_m);