Commit 0d38f577 authored by Eli Lindsey's avatar Eli Lindsey Committed by Facebook Github Bot

replace getnameinfo with inet_ntop in v6 string formatting

Summary: Some implementations of getnameinfo are triggering reverse DNS lookups despite us specifying NI_NUMERICHOST. Avoid all that by instead producing our string representations of v6 addresses manually via inet_ntop and if_indextoname.

Differential Revision: D5408572

fbshipit-source-id: 69b0171a9a54738045f9041381aea5512b17eb13
parent 604c1b15
......@@ -19,6 +19,8 @@
#include <ostream>
#include <string>
#include <net/if.h>
#include <folly/Format.h>
#include <folly/IPAddress.h>
#include <folly/IPAddressV4.h>
......@@ -404,28 +406,21 @@ IPAddressV6 IPAddressV6::mask(size_t numBits) const {
// public
string IPAddressV6::str() const {
char buffer[INET6_ADDRSTRLEN] = {0};
sockaddr_in6 sock = toSockAddr();
int error = getnameinfo(
(sockaddr*)&sock,
sizeof(sock),
buffer,
INET6_ADDRSTRLEN,
nullptr,
0,
NI_NUMERICHOST);
if (!error) {
if (inet_ntop(AF_INET6, toAddr().s6_addr, buffer, INET6_ADDRSTRLEN)) {
string ip(buffer);
char ifname[IFNAMSIZ] = {0};
if (if_indextoname(getScopeId(), ifname)) {
ip += "%";
ip += ifname;
}
return ip;
} else {
throw IPAddressFormatException(to<std::string>(
"Invalid address with hex ",
"'",
detail::Bytes::toHex(bytes(), 16),
"%",
sock.sin6_scope_id,
"'",
" , with error ",
gai_strerror(error)));
"'"));
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment