X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FIPAddressV6.h;h=f641bdcd85e988fa8562a0f986cb0aa467597f2a;hb=8f4003a8d3b8d95215238d3fd52f85e87d591c0e;hp=21e892a42aac4f986c2c4a0d89585cb0e4b1431e;hpb=5da6f8de1779620e07722fea4d6e0bbc31e2e226;p=folly.git diff --git a/folly/IPAddressV6.h b/folly/IPAddressV6.h index 21e892a4..f641bdcd 100644 --- a/folly/IPAddressV6.h +++ b/folly/IPAddressV6.h @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -69,7 +70,9 @@ class IPAddressV6 { public: // V6 Address Type enum Type { - TEREDO, T6TO4, NORMAL, + TEREDO, + T6TO4, + NORMAL, }; // A constructor parameter to indicate that we should create a link-local // IPAddressV6. @@ -86,7 +89,7 @@ class IPAddressV6 { // Size of std::string returned by toFullyQualified. static constexpr size_t kToFullyQualifiedSize = - 8 /*words*/ * 4 /*hex chars per word*/ + 7 /*separators*/; + 8 /*words*/ * 4 /*hex chars per word*/ + 7 /*separators*/; // returns true iff the input string can be parsed as an ipv6-address static bool validate(StringPiece ip); @@ -112,7 +115,7 @@ class IPAddressV6 { * Returns the address as a Range. */ ByteRange toBinary() const { - return ByteRange((const unsigned char *) &addr_.in6Addr_.s6_addr, 16); + return ByteRange((const unsigned char*)&addr_.in6Addr_.s6_addr, 16); } /** @@ -171,7 +174,9 @@ class IPAddressV6 { * @see IPAddress#bitCount * @returns 128 */ - static size_t bitCount() { return 128; } + static constexpr size_t bitCount() { + return 128; + } /** * @see IPAddress#toJson @@ -188,8 +193,8 @@ class IPAddressV6 { bool inSubnet(const IPAddressV6& subnet, uint8_t cidr) const { return inSubnetWithMask(subnet, fetchMask(cidr)); } - bool inSubnetWithMask(const IPAddressV6& subnet, - const ByteArray16& mask) const; + bool inSubnetWithMask(const IPAddressV6& subnet, const ByteArray16& mask) + const; // @see IPAddress#isLoopback bool isLoopback() const; @@ -227,6 +232,16 @@ class IPAddressV6 { */ Optional getMacAddressFromLinkLocal() const; + /** + * Return the mac address if this is an auto-configured IPv6 address based on + * EUI-64 + * + * @return an Optional union representing the mac address. + * If the address is not based on EUI-64 it will return an empty Optional. + * You can use Optional::value() to check whether the mac address is not null. + */ + Optional getMacAddressFromEUI64() const; + /** * Return true if this is a multicast address. */ @@ -256,9 +271,13 @@ class IPAddressV6 { IPAddressV6 mask(size_t numBits) const; // return underlying in6_addr structure - in6_addr toAddr() const { return addr_.in6Addr_; } + in6_addr toAddr() const { + return addr_.in6Addr_; + } - uint16_t getScopeId() const { return scope_; } + uint16_t getScopeId() const { + return scope_; + } void setScopeId(uint16_t scope) { scope_ = scope; } @@ -281,13 +300,18 @@ class IPAddressV6 { // @see IPAddress#toFullyQualified std::string toFullyQualified() const; + // @see IPAddress#toFullyQualifiedAppend + void toFullyQualifiedAppend(std::string& out) const; + std::string toInverseArpaName() const; // @see IPAddress#str std::string str() const; // @see IPAddress#version - uint8_t version() const { return 6; } + uint8_t version() const { + return 6; + } /** * Return the solicited-node multicast address for this address. @@ -309,31 +333,60 @@ class IPAddressV6 { const CIDRNetworkV6& one, const CIDRNetworkV6& two); // Number of bytes in the address representation. - static constexpr size_t byteCount() { return 16; } + static constexpr size_t byteCount() { + return 16; + } - //get nth most significant bit - 0 indexed + // get nth most significant bit - 0 indexed bool getNthMSBit(size_t bitIndex) const { return detail::getNthMSBitImpl(*this, bitIndex, AF_INET6); } - //get nth most significant byte - 0 indexed + // get nth most significant byte - 0 indexed uint8_t getNthMSByte(size_t byteIndex) const; - //get nth bit - 0 indexed + // get nth bit - 0 indexed bool getNthLSBit(size_t bitIndex) const { return getNthMSBit(bitCount() - bitIndex - 1); } - //get nth byte - 0 indexed + // get nth byte - 0 indexed uint8_t getNthLSByte(size_t byteIndex) const { return getNthMSByte(byteCount() - byteIndex - 1); } - const unsigned char* bytes() const { return addr_.in6Addr_.s6_addr; } - protected: + const unsigned char* bytes() const { + return addr_.in6Addr_.s6_addr; + } + + protected: /** * Helper that returns true if the address is in the binary subnet specified * by addr. */ - bool inBinarySubnet(const std::array addr, - size_t numBits) const; + bool inBinarySubnet(const std::array addr, size_t numBits) const; + + private: + auto tie() const { + return std::tie(addr_.bytes_, scope_); + } + + public: + friend inline bool operator==(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() == b.tie(); + } + friend inline bool operator!=(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() != b.tie(); + } + friend inline bool operator<(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() < b.tie(); + } + friend inline bool operator>(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() > b.tie(); + } + friend inline bool operator<=(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() <= b.tie(); + } + friend inline bool operator>=(const IPAddressV6& a, const IPAddressV6& b) { + return a.tie() >= b.tie(); + } private: union AddressStorage { @@ -342,8 +395,8 @@ class IPAddressV6 { AddressStorage() { std::memset(this, 0, sizeof(AddressStorage)); } - explicit AddressStorage(const ByteArray16& bytes): bytes_(bytes) {} - explicit AddressStorage(const in6_addr& addr): in6Addr_(addr) {} + explicit AddressStorage(const ByteArray16& bytes) : bytes_(bytes) {} + explicit AddressStorage(const in6_addr& addr) : in6Addr_(addr) {} explicit AddressStorage(MacAddress mac); } addr_; @@ -351,8 +404,6 @@ class IPAddressV6 { // are *not* link-local. uint16_t scope_{0}; - static const std::array masks_; - /** * Set the current IPAddressV6 object to have the address specified by bytes. * @throws IPAddressFormatException if bytes.size() is not 16. @@ -368,44 +419,13 @@ std::ostream& operator<<(std::ostream& os, const IPAddressV6& addr); void toAppend(IPAddressV6 addr, std::string* result); void toAppend(IPAddressV6 addr, fbstring* result); -/** - * Return true if two addresses are equal. - */ -inline bool operator==(const IPAddressV6& addr1, const IPAddressV6& addr2) { - return (std::memcmp(addr1.toAddr().s6_addr, addr2.toAddr().s6_addr, 16) == 0) - && addr1.getScopeId() == addr2.getScopeId(); -} -// Return true if addr1 < addr2 -inline bool operator<(const IPAddressV6& addr1, const IPAddressV6& addr2) { - auto cmp = std::memcmp(addr1.toAddr().s6_addr, - addr2.toAddr().s6_addr, 16) < 0; - if (!cmp) { - return addr1.getScopeId() < addr2.getScopeId(); - } else { - return cmp; - } -} -// Derived operators -inline bool operator!=(const IPAddressV6& a, const IPAddressV6& b) { - return !(a == b); -} -inline bool operator>(const IPAddressV6& a, const IPAddressV6& b) { - return b < a; -} -inline bool operator<=(const IPAddressV6& a, const IPAddressV6& b) { - return !(a > b); -} -inline bool operator>=(const IPAddressV6& a, const IPAddressV6& b) { - return !(a < b); -} - -} // folly +} // namespace folly namespace std { -template<> +template <> struct hash { size_t operator()(const folly::IPAddressV6& addr) const { return addr.hash(); } }; -} // std +} // namespace std