diff options
| author | Joseph Henry <josephjah@gmail.com> | 2018-09-17 14:42:33 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2018-09-17 14:42:33 -0700 |
| commit | 27c37a18f3e2f97d06ebc04e2db31d0c796c9452 (patch) | |
| tree | 3ceeeb6905550ad17055d03f48e52fd094e62778 /node | |
| parent | b8268d894b4dd0774eeb2bcd0009b818fe960b52 (diff) | |
| parent | af61ee6f3a35f8cdbb174676e2fe7efdaf9db11c (diff) | |
| download | infinitytier-27c37a18f3e2f97d06ebc04e2db31d0c796c9452.tar.gz infinitytier-27c37a18f3e2f97d06ebc04e2db31d0c796c9452.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node')
| -rw-r--r-- | node/Trace.cpp | 1 | ||||
| -rw-r--r-- | node/Utils.hpp | 16 |
2 files changed, 15 insertions, 2 deletions
diff --git a/node/Trace.cpp b/node/Trace.cpp index f47a029b..7b2fbbb7 100644 --- a/node/Trace.cpp +++ b/node/Trace.cpp @@ -40,6 +40,7 @@ #include "Tag.hpp" #include "Capability.hpp" #include "Revocation.hpp" +#include "../include/ZeroTierDebug.h" namespace ZeroTier { diff --git a/node/Utils.hpp b/node/Utils.hpp index 6ce67328..35493f01 100644 --- a/node/Utils.hpp +++ b/node/Utils.hpp @@ -38,6 +38,10 @@ #include <vector> #include <map> +#if defined(__FreeBSD__) +#include <sys/endian.h> +#endif + #include "Constants.hpp" #ifdef __LINUX__ @@ -419,8 +423,12 @@ public: static inline uint64_t hton(uint64_t n) { #if __BYTE_ORDER == __LITTLE_ENDIAN -#if defined(__GNUC__) && (!defined(__OpenBSD__)) +#if defined(__GNUC__) +#if defined(__FreeBSD__) + return bswap64(n); +#elif (!defined(__OpenBSD__)) return __builtin_bswap64(n); +#endif #else return ( ((n & 0x00000000000000FFULL) << 56) | @@ -448,8 +456,12 @@ public: static inline uint64_t ntoh(uint64_t n) { #if __BYTE_ORDER == __LITTLE_ENDIAN -#if defined(__GNUC__) && !defined(__OpenBSD__) +#if defined(__GNUC__) +#if defined(__FreeBSD__) + return bswap64(n); +#elif (!defined(__OpenBSD__)) return __builtin_bswap64(n); +#endif #else return ( ((n & 0x00000000000000FFULL) << 56) | |