Simplify fbstring::insertImpl

[folly.git] / folly / IPAddressV4.h

diff --git a/folly/IPAddressV4.h b/folly/IPAddressV4.h
index 9c66afb64f18d522c69e09456cf2e45145cab3ec..02c93114f25703940cead58730d5ef6accd4578b 100644 (file)
--- a/folly/IPAddressV4.h
+++ b/folly/IPAddressV4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,8 @@ typedef std::array<uint8_t, 4> ByteArray4;
  */
 class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
  public:
+  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 +70,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 +107,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;
@@ -139,6 +153,9 @@ class IPAddressV4 : boost::totally_ordered<IPAddressV4> {
   // @see IPAddress#isLoopback
   bool isLoopback() const;
 
+  // @see IPAddress#isLinkLocal
+  bool isLinkLocal() const;
+
   // @see IPAddress#isNonroutable
   bool isNonroutable() const;
 
@@ -177,7 +194,7 @@ 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