summaryrefslogtreecommitdiff
path: root/node/InetAddress.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-24 06:40:50 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-24 06:40:50 -0700
commitee649ae69a2e4e4f325e66a9a31694ea0a5f3d9a (patch)
tree53d325ebfc7b53c7ffbbc3d9c8f952b9f459a983 /node/InetAddress.hpp
parent20d155e630aba9fdfb757765e889c13ea8d9a9d9 (diff)
downloadinfinitytier-ee649ae69a2e4e4f325e66a9a31694ea0a5f3d9a.tar.gz
infinitytier-ee649ae69a2e4e4f325e66a9a31694ea0a5f3d9a.zip
Add 6plane assignment support to network controller, and cleanup.
Diffstat (limited to 'node/InetAddress.hpp')
-rw-r--r--node/InetAddress.hpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/node/InetAddress.hpp b/node/InetAddress.hpp
index 8abf1c04..e03deb71 100644
--- a/node/InetAddress.hpp
+++ b/node/InetAddress.hpp
@@ -471,8 +471,7 @@ struct InetAddress : public sockaddr_storage
* @param mac MAC address seed
* @return IPv6 link-local address
*/
- static InetAddress makeIpv6LinkLocal(const MAC &mac)
- throw();
+ static InetAddress makeIpv6LinkLocal(const MAC &mac);
/**
* Compute private IPv6 unicast address from network ID and ZeroTier address
@@ -515,8 +514,12 @@ struct InetAddress : public sockaddr_storage
* @param zeroTierAddress 40-bit device address (in least significant 40 bits, highest 24 bits ignored)
* @return IPv6 private unicast address with /88 netmask
*/
- static InetAddress makeIpv6rfc4193(uint64_t nwid,uint64_t zeroTierAddress)
- throw();
+ static InetAddress makeIpv6rfc4193(uint64_t nwid,uint64_t zeroTierAddress);
+
+ /**
+ * Compute a private IPv6 "6plane" unicast address from network ID and ZeroTier address
+ */
+ static InetAddress makeIpv66plane(uint64_t nwid,uint64_t zeroTierAddress);
};
} // namespace ZeroTier