diff options
| author | Joseph Henry <josephjah@gmail.com> | 2018-01-10 12:43:18 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2018-01-10 12:43:18 -0800 |
| commit | 6e1823ac8156b39f68b0cbba1d350f4bdc149231 (patch) | |
| tree | 38a0f46da441957299ccb10cdf9e456be955de22 /node | |
| parent | 640cc22749276e7c7f6e7cfa4eee8c0590064ac0 (diff) | |
| parent | 9bab49d2f91fbb1d19c75e868bc04959ef9f135e (diff) | |
| download | infinitytier-6e1823ac8156b39f68b0cbba1d350f4bdc149231.tar.gz infinitytier-6e1823ac8156b39f68b0cbba1d350f4bdc149231.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node')
| -rw-r--r-- | node/NetworkConfig.hpp | 20 | ||||
| -rw-r--r-- | node/Utils.hpp | 9 |
2 files changed, 7 insertions, 22 deletions
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index 4121a241..4f343206 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -102,11 +102,6 @@ */ #define ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR 0x0000040000000000ULL -/** - * Device can send CIRCUIT_TESTs for this network - */ -#define ZT_NETWORKCONFIG_SPECIALIST_TYPE_CIRCUIT_TESTER 0x0000080000000000ULL - namespace ZeroTier { // Dictionary capacity needed for max size network config @@ -345,21 +340,6 @@ public: } /** - * @param byPeer Address to check - * @return True if this peer is allowed to do circuit tests on this network (controller is always true) - */ - inline bool circuitTestingAllowed(const Address &byPeer) const - { - if (byPeer.toInt() == ((networkId >> 24) & 0xffffffffffULL)) - return true; - for(unsigned int i=0;i<specialistCount;++i) { - if ((byPeer == specialists[i])&&((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_CIRCUIT_TESTER) != 0)) - return true; - } - return false; - } - - /** * @return True if this network config is non-NULL */ inline operator bool() const { return (networkId != 0); } diff --git a/node/Utils.hpp b/node/Utils.hpp index 8dd0292a..1b2b65aa 100644 --- a/node/Utils.hpp +++ b/node/Utils.hpp @@ -40,8 +40,9 @@ #include "Constants.hpp" -// So it's 2017 and this still helps on most Linux versions. It shouldn't but it does. Go figure. -#if defined(__LINUX__) && ((defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))) +#ifdef __LINUX__ + +#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64)) #include <emmintrin.h> static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) { @@ -74,6 +75,10 @@ static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) #define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) #endif +#else +#define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) +#endif + namespace ZeroTier { /** |