From 7ff0cab1b7b6a9bfe5880dd4fefbd947c6eb78e2 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 31 Mar 2015 18:33:39 -0700 Subject: docs --- include/README.md | 2 +- node/Peer.hpp | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/README.md b/include/README.md index 8de54492..a3254ba3 100644 --- a/include/README.md +++ b/include/README.md @@ -1,4 +1,4 @@ ZeroTier Node API ====== -Not much to see here yet. In the future this will be the externally-facing API, but it's very much a work in progress right now. +This is the externally facing plain C API, which wraps the Node class in the node/ folder. It provides a platform-agnostic interface to the core ZeroTier network virtualization engine. 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 #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; -- cgit v1.2.3