diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-27 18:23:02 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-27 18:23:02 -0700 |
| commit | b73c36acbf03431fd7fa3584e8621875fdcbebf4 (patch) | |
| tree | a08a976e4d4a63efecc2892bc969cc60141b4c5f /node/RuntimeEnvironment.hpp | |
| parent | 181369964f501c3c702971b30c82b9e84eed58db (diff) | |
| parent | d2c5d7150253a5ae5613cac1d65e84b3aa5d33bc (diff) | |
| download | infinitytier-b73c36acbf03431fd7fa3584e8621875fdcbebf4.tar.gz infinitytier-b73c36acbf03431fd7fa3584e8621875fdcbebf4.zip | |
Merge branch 'adamierymenko-dev' of ssh://shub-niggurath.zerotier.com:222/git/ZeroTierOne into adamierymenko-dev
Diffstat (limited to 'node/RuntimeEnvironment.hpp')
| -rw-r--r-- | node/RuntimeEnvironment.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/node/RuntimeEnvironment.hpp b/node/RuntimeEnvironment.hpp index ffa6cbdb..228679a1 100644 --- a/node/RuntimeEnvironment.hpp +++ b/node/RuntimeEnvironment.hpp @@ -64,7 +64,8 @@ class RuntimeEnvironment public: RuntimeEnvironment() : shutdownInProgress(false), - timeOfLastNetworkEnvironmentChange(0), + timeOfLastResynchronize(0), + timeOfLastPacketReceived(0), log((Logger *)0), prng((CMWC4096 *)0), mc((Multicaster *)0), @@ -90,7 +91,11 @@ public: volatile bool shutdownInProgress; // Time network environment (e.g. fingerprint) last changed -- used to determine online-ness - volatile uint64_t timeOfLastNetworkEnvironmentChange; + volatile uint64_t timeOfLastResynchronize; + + // Time last packet was received -- from anywhere. This is updated in Peer::receive() + // via an ugly const_cast<>. + volatile uint64_t timeOfLastPacketReceived; /* * Order matters a bit here. These are constructed in this order |