summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-03-31 18:33:39 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-03-31 18:33:39 -0700
commit7ff0cab1b7b6a9bfe5880dd4fefbd947c6eb78e2 (patch)
tree73ef26a7f6cbe0577e4621ff1ea86d26b75d4ecc /node
parentb7238557515bcc12360eaf9d6e048542714250e5 (diff)
downloadinfinitytier-7ff0cab1b7b6a9bfe5880dd4fefbd947c6eb78e2.tar.gz
infinitytier-7ff0cab1b7b6a9bfe5880dd4fefbd947c6eb78e2.zip
docs
Diffstat (limited to 'node')
-rw-r--r--node/Peer.hpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/node/Peer.hpp b/node/Peer.hpp
index 7fe473a1..9380fa12 100644
--- a/node/Peer.hpp
+++ b/node/Peer.hpp
@@ -36,16 +36,15 @@
#include <stdexcept>
#include "Constants.hpp"
+#include "RuntimeEnvironment.hpp"
#include "Path.hpp"
#include "Address.hpp"
#include "Utils.hpp"
#include "Identity.hpp"
#include "Logger.hpp"
-#include "RuntimeEnvironment.hpp"
#include "InetAddress.hpp"
#include "Packet.hpp"
#include "SharedPtr.hpp"
-#include "Socket.hpp"
#include "AtomicCounter.hpp"
#include "NonCopyable.hpp"
@@ -404,20 +403,20 @@ public:
private:
void _announceMulticastGroups(const RuntimeEnvironment *RR,uint64_t now);
- volatile uint64_t _lastUsed;
- volatile uint64_t _lastReceive; // direct or indirect
- volatile uint64_t _lastUnicastFrame;
- volatile uint64_t _lastMulticastFrame;
- volatile uint64_t _lastAnnouncedTo;
- volatile uint16_t _vProto;
- volatile uint16_t _vMajor;
- volatile uint16_t _vMinor;
- volatile uint16_t _vRevision;
+ uint64_t _lastUsed;
+ uint64_t _lastReceive; // direct or indirect
+ uint64_t _lastUnicastFrame;
+ uint64_t _lastMulticastFrame;
+ uint64_t _lastAnnouncedTo;
+ uint16_t _vProto;
+ uint16_t _vMajor;
+ uint16_t _vMinor;
+ uint16_t _vRevision;
Path _paths[ZT_PEER_MAX_PATHS];
- volatile unsigned int _numPaths;
+ unsigned int _numPaths;
- volatile unsigned int _latency;
+ unsigned int _latency;
unsigned char _key[ZT_PEER_SECRET_KEY_LENGTH];
Identity _id;