diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-05-23 14:32:31 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-05-23 14:32:31 -0700 |
| commit | beb7b5bbe578035efdf8ebbb521065b15e40f9b0 (patch) | |
| tree | 8e61d70c11af4adfd392cfbf902cf599d6993957 /node/Address.hpp | |
| parent | 05f5755bb193003852f725d2e0aae41c2ac1cd26 (diff) | |
| download | infinitytier-beb7b5bbe578035efdf8ebbb521065b15e40f9b0.tar.gz infinitytier-beb7b5bbe578035efdf8ebbb521065b15e40f9b0.zip | |
GitHub Issue #69 - make MAC assignment schema differ between virtual networks.
Diffstat (limited to 'node/Address.hpp')
| -rw-r--r-- | node/Address.hpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/node/Address.hpp b/node/Address.hpp index 11aeea8e..a045ec61 100644 --- a/node/Address.hpp +++ b/node/Address.hpp @@ -37,7 +37,6 @@ #include "Constants.hpp" #include "Utils.hpp" -#include "MAC.hpp" #include "Buffer.hpp" namespace ZeroTier { @@ -168,35 +167,6 @@ public: } /** - * Derive a MAC whose first octet is the ZeroTier LAN standard - * - * @return Ethernet MAC derived from address - */ - inline MAC toMAC() const - throw() - { - MAC m; - m.data[0] = ZT_MAC_FIRST_OCTET; - copyTo(m.data + 1,ZT_ADDRESS_LENGTH); - return m; - } - - /** - * @param mac MAC address to check - * @return True if this address would have this MAC - */ - inline bool wouldHaveMac(const MAC &mac) const - throw() - { - return ((mac.data[0] == ZT_MAC_FIRST_OCTET)&& - (mac.data[1] == (unsigned char)((_a >> 32) & 0xff))&& - (mac.data[2] == (unsigned char)((_a >> 24) & 0xff))&& - (mac.data[3] == (unsigned char)((_a >> 16) & 0xff))&& - (mac.data[4] == (unsigned char)((_a >> 8) & 0xff))&& - (mac.data[5] == (unsigned char)(_a & 0xff))); - } - - /** * @return Hexadecimal string */ inline std::string toString() const |