diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-28 19:18:33 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-28 19:18:33 -0700 |
| commit | 508d31513a0848236258542930cf577d95afda99 (patch) | |
| tree | 453b31d874e6ec0dee3105191142efc8a326a30d /node/Peer.cpp | |
| parent | bc0954381ccdca065987512a45d5dd6ace6cca9d (diff) | |
| parent | 7578b5629849f6c286c353dce713b0816b1cc4a9 (diff) | |
| download | infinitytier-508d31513a0848236258542930cf577d95afda99.tar.gz infinitytier-508d31513a0848236258542930cf577d95afda99.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Peer.cpp')
| -rw-r--r-- | node/Peer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp index 73c20228..3cf0ec4e 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -33,6 +33,7 @@ #include "Switch.hpp" #include "Network.hpp" #include "AntiRecursion.hpp" +#include "SelfAwareness.hpp" #include <algorithm> @@ -225,10 +226,11 @@ void Peer::doPingAndKeepalive(const RuntimeEnvironment *RR,uint64_t now) void Peer::pushDirectPaths(const RuntimeEnvironment *RR,RemotePath *path,uint64_t now,bool force) { - if ((((now - _lastDirectPathPush) >= ZT_DIRECT_PATH_PUSH_INTERVAL)||(force))) { + if (((now - _lastDirectPathPush) >= ZT_DIRECT_PATH_PUSH_INTERVAL)||(force)) { _lastDirectPathPush = now; std::vector<Path> dps(RR->node->directPaths()); + #ifdef ZT_TRACE { std::string ps; |