ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-31 08:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VERSION 0.6.7: revert change for GitHub issue #20

Browse Source 
This will have to be thought out more. The old version worked fine 99% of the
time so we'll revisit this.
This commit is contained in:
Adam Ierymenko 2013-12-31 11:36:13 -08:00
parent 17126b0c6d
commit 9f28eec95c
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/Peer.cpp
View File

@ -87,32 +87,19 @@ void Peer::onReceive(
WanPath *const wp = (remoteAddr.isV4() ? &_ipv4p : &_ipv6p); WanPath *const wp = (remoteAddr.isV4() ? &_ipv4p : &_ipv6p);
wp->lastReceive = now; wp->lastReceive = now;
wp->localPort = ((localPort) ? localPort : Demarc::ANY_PORT); wp->localPort = ((localPort) ? localPort : Demarc::ANY_PORT);
if (!wp->fixed)
wp->addr = remoteAddr;
// Do things like learn latency or endpoints on OK or ERROR replies // Learn latency from replies
if (inReVerb != Packet::VERB_NOP) { if (inReVerb != Packet::VERB_NOP) {
for(unsigned int p=0;p<ZT_PEER_REQUEST_HISTORY_LENGTH;++p) { for(unsigned int p=0;p<ZT_PEER_REQUEST_HISTORY_LENGTH;++p) {
if ((_requestHistory[p].timestamp)&&(_requestHistory[p].packetId == inRePacketId)&&(_requestHistory[p].verb == inReVerb)) { if ((_requestHistory[p].timestamp)&&(_requestHistory[p].packetId == inRePacketId)&&(_requestHistory[p].verb == inReVerb)) {
_latency = std::min((unsigned int)(now - _requestHistory[p].timestamp),(unsigned int)0xffff); _latency = std::min((unsigned int)(now - _requestHistory[p].timestamp),(unsigned int)0xffff);
// Only learn paths on replies to packets we have sent, otherwise
// this introduces both an asymmetry problem in NAT-t and a potential
// reply DOS attack.
if (!wp->fixed) {
wp->addr = remoteAddr;
TRACE("peer %s learned endpoint %s from %s(%s)",address().toString().c_str(),remoteAddr.toString().c_str(),Packet::verbString(verb),Packet::verbString(inReVerb));
}
_requestHistory[p].timestamp = 0; _requestHistory[p].timestamp = 0;
break; break;
} }
} }
} }
// If we get a valid packet with a different address that is not a response
// to a request, send a PROBE to authenticate this endpoint and determine if
// it is reachable.
if ((!wp->fixed)&&(wp->addr != remoteAddr))
_r->sw->sendPROBE(SharedPtr<Peer>(this),localPort,remoteAddr);
} }
if (verb == Packet::VERB_FRAME) { if (verb == Packet::VERB_FRAME) {

2
version.h
View File

@ -41,6 +41,6 @@
/** /**
* Revision * Revision
*/ */
#define ZEROTIER_ONE_VERSION_REVISION 6 #define ZEROTIER_ONE_VERSION_REVISION 7
#endif #endif