diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-03 15:39:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-03 15:39:05 -0700 |
| commit | eebcf08084097fc7cd8703a11686e66157fa8efa (patch) | |
| tree | 8c866efeb6f925f4cd3fa1881990779f17b2015f /node/Node.cpp | |
| parent | 01aa469591019d0412cd6714312467823aaacea9 (diff) | |
| download | infinitytier-eebcf08084097fc7cd8703a11686e66157fa8efa.tar.gz infinitytier-eebcf08084097fc7cd8703a11686e66157fa8efa.zip | |
Tweaks to new Path code for dual-stack operation, and other fixes.
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index d2840bd0..a7d4cfa9 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -243,7 +243,7 @@ public: lastReceiveFromUpstream = std::max(p->lastReceive(),lastReceiveFromUpstream); } else if (p->activelyTransferringFrames(_now)) { // Normal nodes get their preferred link kept alive if the node has generated frame traffic recently - p->doPingAndKeepalive(_now,0); + p->doPingAndKeepalive(_now,-1); } } @@ -422,7 +422,6 @@ ZT_PeerList *Node::peers() const memcpy(&(p->paths[p->pathCount].address),&((*path)->address()),sizeof(struct sockaddr_storage)); p->paths[p->pathCount].lastSend = (*path)->lastOut(); p->paths[p->pathCount].lastReceive = (*path)->lastIn(); - p->paths[p->pathCount].active = (*path)->alive(_now) ? 1 : 0; p->paths[p->pathCount].preferred = (*path == bestp) ? 1 : 0; p->paths[p->pathCount].trustedPathId = RR->topology->getOutboundPathTrust((*path)->address()); ++p->pathCount; |
