/*
- * Copyright 2014 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.
* limitations under the License.
*/
-#include "IPAddress.h"
+#include <folly/IPAddress.h>
#include <limits>
#include <ostream>
#include <string>
#include <vector>
+#include <folly/Conv.h>
#include <folly/String.h>
+#include <folly/detail/IPAddressSource.h>
using std::ostream;
using std::string;
result->append(addr.str());
}
+bool IPAddress::validate(StringPiece ip) {
+ return IPAddressV4::validate(ip) || IPAddressV6::validate(ip);
+}
+
// public static
IPAddressV4 IPAddress::createIPv4(const IPAddress& addr) {
if (addr.isV4()) {
if (elemCount == 0 || // weird invalid string
elemCount > 2) { // invalid string (IP/CIDR/extras)
- throw IPAddressFormatException("Invalid ipSlashCidr specified. ",
- "Expected IP/CIDR format, got ",
- "'", ipSlashCidr, "'");
+ throw IPAddressFormatException(to<std::string>(
+ "Invalid ipSlashCidr specified. ",
+ "Expected IP/CIDR format, got ",
+ "'",
+ ipSlashCidr,
+ "'"));
}
IPAddress subnet(vec.at(0));
- uint8_t cidr = (defaultCidr > -1) ? defaultCidr : (subnet.isV4() ? 32 : 128);
+ uint8_t cidr =
+ (defaultCidr > -1) ? uint8_t(defaultCidr) : (subnet.isV4() ? 32 : 128);
if (elemCount == 2) {
try {
cidr = to<uint8_t>(vec.at(1));
} catch (...) {
- throw IPAddressFormatException("Mask value ",
- "'", vec.at(1), "' not a valid mask");
+ throw IPAddressFormatException(
+ to<std::string>("Mask value ", "'", vec.at(1), "' not a valid mask"));
}
}
if (cidr > subnet.bitCount()) {
- throw IPAddressFormatException("CIDR value '", cidr, "' ",
- "is > network bit count ",
- "'", subnet.bitCount(), "'");
+ throw IPAddressFormatException(to<std::string>(
+ "CIDR value '",
+ cidr,
+ "' ",
+ "is > network bit count ",
+ "'",
+ subnet.bitCount(),
+ "'"));
}
return std::make_pair(applyMask ? subnet.mask(cidr) : subnet, cidr);
}
+// public static
+std::string IPAddress::networkToString(const CIDRNetwork& network) {
+ return network.first.str() + "/" + folly::to<std::string>(network.second);
+}
+
// public static
IPAddress IPAddress::fromBinary(ByteRange bytes) {
if (bytes.size() == 4) {
return IPAddress(IPAddressV6::fromBinary(bytes));
} else {
string hexval = detail::Bytes::toHex(bytes.data(), bytes.size());
- throw IPAddressFormatException("Invalid address with hex value ",
- "'", hexval, "'");
+ throw IPAddressFormatException(
+ to<std::string>("Invalid address with hex value ", "'", hexval, "'"));
}
}
{
string ip = addr.str(); // inet_pton() needs NUL-terminated string
auto throwFormatException = [&](const string& msg) {
- throw IPAddressFormatException("Invalid IP '", ip, "': ", msg);
+ throw IPAddressFormatException(
+ to<std::string>("Invalid IP '", ip, "': ", msg));
};
if (ip.size() < 2) {
// need to check for V4 address second, since IPv4-mapped IPv6 addresses may
// contain a period
if (ip.find(':') != string::npos) {
- in6_addr ipAddr;
- if (inet_pton(AF_INET6, ip.c_str(), &ipAddr) != 1) {
- throwFormatException("inet_pton failed for V6 address");
+ struct addrinfo* result;
+ struct addrinfo hints;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_INET6;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICHOST;
+ if (!getaddrinfo(ip.c_str(), nullptr, &hints, &result)) {
+ struct sockaddr_in6* ipAddr = (struct sockaddr_in6*)result->ai_addr;
+ addr_ = IPAddressV46(IPAddressV6(*ipAddr));
+ family_ = AF_INET6;
+ freeaddrinfo(result);
+ } else {
+ throwFormatException("getsockaddr failed for V6 address");
}
- addr_ = IPAddressV46(IPAddressV6(ipAddr));
- family_ = AF_INET6;
} else if (ip.find('.') != string::npos) {
in_addr ipAddr;
if (inet_pton(AF_INET, ip.c_str(), &ipAddr) != 1) {
}
case AF_INET6: {
const sockaddr_in6 *v6addr = reinterpret_cast<const sockaddr_in6*>(addr);
- addr_.ipV6Addr = IPAddressV6(v6addr->sin6_addr);
+ addr_.ipV6Addr = IPAddressV6(*v6addr);
break;
}
default:
} else {
throw std::invalid_argument("Unknown address family");
}
- return {IPAddress(0), 0};
}
+[[noreturn]] void IPAddress::asV4Throw() const {
+ auto fam = detail::familyNameStr(family());
+ throw InvalidAddressFamilyException(to<std::string>(
+ "Can't convert address with family ", fam, " to AF_INET address"));
+}
+
+[[noreturn]] void IPAddress::asV6Throw() const {
+ auto fam = detail::familyNameStr(family());
+ throw InvalidAddressFamilyException(to<std::string>(
+ "Can't convert address with family ", fam, " to AF_INET6 address"));
+}
+
+
} // folly