diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-09-26 13:47:55 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-09-26 13:47:55 -0700 |
| commit | e8cdff3eafd8096da22122eabddf57a09fe2bb90 (patch) | |
| tree | d231aa6d9ccccc8ced6e1ead606ce16ff551cab9 /node/Address.hpp | |
| parent | 53d98343b7b444508259f6f1643e8d6724fb11e9 (diff) | |
| parent | f69454ec9879a0b0a424f743ca144d1123ef7e99 (diff) | |
| download | infinitytier-e8cdff3eafd8096da22122eabddf57a09fe2bb90.tar.gz infinitytier-e8cdff3eafd8096da22122eabddf57a09fe2bb90.zip | |
Merge branch 'adamierymenko-dev' into android-jni-dev
also update for changed function calls that now accept a local address
# Conflicts:
# include/ZeroTierOne.h
# java/CMakeLists.txt
# java/jni/Android.mk
# java/jni/ZT1_jnicache.cpp
# java/jni/ZT1_jnilookup.h
# java/jni/ZT1_jniutils.cpp
# java/jni/com_zerotierone_sdk_Node.cpp
Diffstat (limited to 'node/Address.hpp')
| -rw-r--r-- | node/Address.hpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/node/Address.hpp b/node/Address.hpp index 137e4f4f..0b38ec62 100644 --- a/node/Address.hpp +++ b/node/Address.hpp @@ -167,6 +167,15 @@ public: } /** + * @return Hash code for use with Hashtable + */ + inline unsigned long hashCode() const + throw() + { + return (unsigned long)_a; + } + + /** * @return Hexadecimal string */ inline std::string toString() const @@ -197,11 +206,11 @@ public: /** * Check if this address is reserved - * + * * The all-zero null address and any address beginning with 0xff are * reserved. (0xff is reserved for future use to designate possibly * longer addresses, addresses based on IPv6 innards, etc.) - * + * * @return True if address is reserved and may not be used */ inline bool isReserved() const @@ -230,4 +239,3 @@ private: } // namespace ZeroTier #endif - |