ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-27 22:39:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VERSION 0.6.5: minor bug fix in peer connection tracking

Browse Source
This commit is contained in:
Adam Ierymenko 2013-12-31 01:22:32 -08:00
parent 83a38b8f46
commit 8055635e85
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/Peer.cpp
View File

@ -83,18 +83,20 @@ void Peer::onReceive(
_r->sw->announceMulticastGroups(SharedPtr<Peer>(this)); _r->sw->announceMulticastGroups(SharedPtr<Peer>(this));
} }
// Update last receive info for our direct path
WanPath *const wp = (remoteAddr.isV4() ? &_ipv4p : &_ipv6p);
wp->lastReceive = now;
wp->localPort = ((localPort) ? localPort : Demarc::ANY_PORT);
// Do things like learn latency or endpoints on OK or ERROR replies // Do things like learn latency or endpoints on OK or ERROR 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].packetId == inRePacketId)&&(_requestHistory[p].verb == inReVerb)) { if ((_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 paths // Only learn paths on replies to packets we have sent, otherwise
// this introduces both an asymmetry problem in NAT-t and a potential // this introduces both an asymmetry problem in NAT-t and a potential
// reply DOS attack. // reply DOS attack.
WanPath *const wp = (remoteAddr.isV4() ? &_ipv4p : &_ipv6p);
wp->lastReceive = now;
wp->localPort = ((localPort) ? localPort : Demarc::ANY_PORT);
if (!wp->fixed) if (!wp->fixed)
wp->addr = remoteAddr; wp->addr = remoteAddr;

2
version.h
View File

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