MERGE current "dev" into "netcon" -- should not affect netcon itself but will retest -- brings ZeroTier core up to 1.1.0

1 files changed, 5 insertions, 4 deletions

diff --git a/node/Hashtable.hpp b/node/Hashtable.hpp
index beef1468..aee24989 100644
--- a/node/Hashtable.hpp
+++ b/node/Hashtable.hpp
@@ -103,7 +103,7 @@ public:
 	private:
 		unsigned long _idx;
 		Hashtable *_ht;
-		Hashtable::_Bucket *_b;
+		_Bucket *_b;
 	};
 	friend class Hashtable::Iterator;
 
@@ -322,7 +322,6 @@ public:
 		b->next = _t[bidx];
 		_t[bidx] = b;
 		++_s;
-
 		return b->v;
 	}
 
@@ -351,7 +350,6 @@ public:
 		b->next = _t[bidx];
 		_t[bidx] = b;
 		++_s;
-
 		return b->v;
 	}
 
@@ -382,7 +380,10 @@ private:
 	}
 	static inline unsigned long _hc(const uint32_t i)
 	{
-		// In the uint32_t case we use a simple multiplier for hashing to ensure coverage
+		return ((unsigned long)i * (unsigned long)0x9e3779b1);
+	}
+	static inline unsigned long _hc(const uint16_t i)
+	{
 		return ((unsigned long)i * (unsigned long)0x9e3779b1);
 	}