diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-09 09:01:41 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-09 09:01:41 -0800 |
| commit | 473ce82040e6f4eb54594baf07a6daed727d5f35 (patch) | |
| tree | 26588d7ff6bd3d85717446a01c4b206fcb44914a /node/IncomingPacket.cpp | |
| parent | ab013d831c0744fcc87ffca2834f9762803705dd (diff) | |
| parent | 6bc8c9d8efd05c7f85ac269be29c781fcc40672b (diff) | |
| download | infinitytier-473ce82040e6f4eb54594baf07a6daed727d5f35.tar.gz infinitytier-473ce82040e6f4eb54594baf07a6daed727d5f35.zip | |
Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge
Diffstat (limited to 'node/IncomingPacket.cpp')
| -rw-r--r-- | node/IncomingPacket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index f2216235..26339b00 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -972,7 +972,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const Sha if ( ((flags & 0x01) == 0) && (Path::isAddressValidForPath(a)) ) { if (++countPerScope[(int)a.ipScope()][0] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) { TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str()); - peer->attemptToContactAt(RR,_localAddress,a,now); + peer->sendHELLO(RR,_localAddress,a,now); } else { TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str()); } @@ -983,7 +983,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const Sha if ( ((flags & 0x01) == 0) && (Path::isAddressValidForPath(a)) ) { if (++countPerScope[(int)a.ipScope()][1] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) { TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str()); - peer->attemptToContactAt(RR,_localAddress,a,now); + peer->sendHELLO(RR,_localAddress,a,now); } else { TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str()); } |