diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-03 11:18:45 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-03 11:18:45 -0800 |
| commit | a42d714a871349e29900634d59dcb507e902802c (patch) | |
| tree | 3c980b969f3b8a846505525692a6b61494d50c0c | |
| parent | c9e6e60c091db9274bcd550f53d4387793593528 (diff) | |
| download | infinitytier-a42d714a871349e29900634d59dcb507e902802c.tar.gz infinitytier-a42d714a871349e29900634d59dcb507e902802c.zip | |
.
| -rw-r--r-- | node/Peer.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp index 9d0d78e5..0b981c8e 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -83,10 +83,10 @@ void Peer::received( Packet::Verb inReVerb) { #ifdef ZT_ENABLE_CLUSTER - InetAddress redirectTo; if ((RR->cluster)&&(hops == 0)) { // Note: findBetterEndpoint() is first since we still want to check // for a better endpoint even if we don't actually send a redirect. + InetAddress redirectTo; if ( (RR->cluster->findBetterEndpoint(redirectTo,_id.address(),remoteAddr,false)) && (verb != Packet::VERB_OK)&&(verb != Packet::VERB_ERROR)&&(verb != Packet::VERB_RENDEZVOUS)&&(verb != Packet::VERB_PUSH_DIRECT_PATHS) ) { if (_vProto >= 5) { // For newer peers we can send a more idiomatic verb: PUSH_DIRECT_PATHS. @@ -141,13 +141,6 @@ void Peer::received( else if (verb == Packet::VERB_MULTICAST_FRAME) _lastMulticastFrame = now; -#ifdef ZT_ENABLE_CLUSTER - // If we think this peer belongs elsewhere, don't learn this path or - // do other connection init stuff. - if (redirectTo) - return; -#endif - if ((now - _lastAnnouncedTo) >= ((ZT_MULTICAST_LIKE_EXPIRE / 2) - 1000)) { _lastAnnouncedTo = now; needMulticastGroupAnnounce = true; |