X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FIPAddressV4.h;h=26a2dba38acdbf0efd1ecc049dd8754f755bd787;hb=89f9bd3ef68c3e617ad527e5e1f6dfaafc6e1a80;hp=7355648227ba0d6efc8c07ae21a5ccd141abe3da;hpb=275ca94d04e44f28cfa411668eb1c1dd8db90b80;p=folly.git

diff --git a/folly/IPAddressV4.h b/folly/IPAddressV4.h
index 73556482..26a2dba3 100644
--- a/folly/IPAddressV4.h
+++ b/folly/IPAddressV4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 
 #pragma once
 
-#include <functional>
-#include <iostream>
+#include <cstring>
 
-#include <boost/operators.hpp>
+#include <array>
+#include <functional>
+#include <iosfwd>
 
 #include <folly/Hash.h>
 #include <folly/Range.h>
@@ -51,8 +52,11 @@ typedef std::array<uint8_t, 4> ByteArray4;
  *
  * @see IPAddress
  */
-class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
+class IPAddressV4 {
  public:
+  // returns true iff the input string can be parsed as an ipv4-address
+  static bool validate(StringPiece ip);
+
   // create an IPAddressV4 instance from a uint32_t (network byte order)
   static IPAddressV4 fromLong(uint32_t src);
   // same as above but host byte order
@@ -68,6 +72,13 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
     return addr;
   }
 
+  /**
+   * Returns the address as a Range.
+   */
+  ByteRange toBinary() const {
+    return ByteRange((const unsigned char *) &addr_.inAddr_.s_addr, 4);
+  }
+
   /**
    * Convert a IPv4 address string to a long in network byte order.
    * @param [in] ip the address to convert
@@ -98,6 +109,11 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
   // Return the V6 mapped representation of the address.
   IPAddressV6 createIPv6() const;
 
+  /**
+   * Return a V6 address in the format of an 6To4 address.
+   */
+  IPAddressV6 getIPv6For6To4() const;
+
   // Return the long (network byte order) representation of the address.
   uint32_t toLong() const {
     return toAddr().s_addr;
@@ -153,7 +169,8 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
 
   // @see IPAddress#isZero
   bool isZero() const {
-    return detail::Bytes::isZero(bytes(), 4);
+    constexpr auto zero = ByteArray4{{}};
+    return 0 == std::memcmp(bytes(), zero.data(), zero.size());
   }
 
   bool isLinkLocalBroadcast() const {
@@ -180,14 +197,14 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
   ByteArray4 toByteArray() const {
     ByteArray4 ba{{0}};
     std::memcpy(ba.data(), bytes(), 4);
-    return std::move(ba);
+    return ba;
   }
 
   // @see IPAddress#toFullyQualified
   std::string toFullyQualified() const { return str(); }
 
   // @see IPAddress#version
-  size_t version() const { return 4; }
+  uint8_t version() const { return 4; }
 
   /**
    * Return the mask associated with the given number of bits.
@@ -199,15 +216,11 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
    */
   static const ByteArray4 fetchMask(size_t numBits);
 
-  // Given 2 IPAddressV4,mask pairs extract the longest common IPAddress,
+  // Given 2 IPAddressV4, mask pairs extract the longest common IPAddress,
   // mask pair
   static CIDRNetworkV4 longestCommonPrefix(
-    const CIDRNetworkV4& one, const CIDRNetworkV4& two) {
-    auto prefix =
-      detail::Bytes::longestCommonPrefix(one.first.addr_.bytes_, one.second,
-                                         two.first.addr_.bytes_, two.second);
-    return {IPAddressV4(prefix.first), prefix.second};
-  }
+      const CIDRNetworkV4& one,
+      const CIDRNetworkV4& two);
   // Number of bytes in the address representation.
   static size_t byteCount() { return 4; }
   //get nth most significant bit - 0 indexed
@@ -267,6 +280,19 @@ inline bool operator==(const IPAddressV4& addr1, const IPAddressV4& addr2) {
 inline bool operator<(const IPAddressV4& addr1, const IPAddressV4& addr2) {
   return (addr1.toLongHBO() < addr2.toLongHBO());
 }
+// Derived operators
+inline bool operator!=(const IPAddressV4& a, const IPAddressV4& b) {
+  return !(a == b);
+}
+inline bool operator>(const IPAddressV4& a, const IPAddressV4& b) {
+  return b < a;
+}
+inline bool operator<=(const IPAddressV4& a, const IPAddressV4& b) {
+  return !(a > b);
+}
+inline bool operator>=(const IPAddressV4& a, const IPAddressV4& b) {
+  return !(a < b);
+}
 
 }  // folly