Skip to content

address_impl: Return an Ipv4Instance for v4-mapped v6 addresses. #2309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zuercher merged 4 commits into from
Jan 5, 2018
Merged

address_impl: Return an Ipv4Instance for v4-mapped v6 addresses. #2309

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06e0b1d
address_impl: Return an Ipv4Instance for v4-mapped v6 addresses.
jrajahalme Sep 29, 2017
2718741
address_impl_test: Add test for IPv4-mapped IPv6 addresses.
jrajahalme Jan 4, 2018
5412b5d
address_impl_test: Fix format.
jrajahalme Jan 4, 2018
107341b
address_impl: Simplify OSX check.
jrajahalme Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion source/common/network/address_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,20 @@ Address::InstanceConstSharedPtr addressFromSockAddr(const sockaddr_storage& ss,
RELEASE_ASSERT(ss_len == 0 || ss_len == sizeof(sockaddr_in6));
const struct sockaddr_in6* sin6 = reinterpret_cast<const struct sockaddr_in6*>(&ss);
ASSERT(AF_INET6 == sin6->sin6_family);
return std::make_shared<Address::Ipv6Instance>(*sin6, v6only);
if (!v6only && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
#ifndef s6_addr32
#if defined(__APPLE__) && defined(__MACH__)

@zuercher zuercher Jan 4, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've left it as just #ifdef __APPLE__ elsewhere. I don't think this is actually mach-specific in any event, as it was copied from BSD.

@jrajahalme jrajahalme Jan 5, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed as requested, thanks for the review!

#define s6_addr32 __u6_addr.__u6_addr32
#endif
#endif
struct sockaddr_in sin = {.sin_family = AF_INET,
.sin_port = sin6->sin6_port,
.sin_addr = {.s_addr = sin6->sin6_addr.s6_addr32[3]},
.sin_zero = {}};
return std::make_shared<Address::Ipv4Instance>(&sin);
} else {
return std::make_shared<Address::Ipv6Instance>(*sin6, v6only);
}
}
case AF_UNIX: {
const struct sockaddr_un* sun = reinterpret_cast<const struct sockaddr_un*>(&ss);
Expand Down
9 changes: 9 additions & 0 deletions test/common/network/address_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,15 @@ TEST(AddressFromSockAddr, IPv6) {
EXPECT_DEATH(addressFromSockAddr(ss, sizeof(sockaddr_in6) + 1), "ss_len");

EXPECT_EQ("[1:23::ef]:32000", addressFromSockAddr(ss, sizeof(sockaddr_in6))->asString());

// Test that IPv4-mapped IPv6 address is returned as an Ipv4Instance when 'v6only' parameter is
// 'false', but not otherwise.
EXPECT_EQ(1, inet_pton(AF_INET6, "::ffff:192.0.2.128", &sin6.sin6_addr));
EXPECT_EQ(IpVersion::v4, addressFromSockAddr(ss, sizeof(sockaddr_in6), false)->ip()->version());
EXPECT_EQ("192.0.2.128:32000", addressFromSockAddr(ss, sizeof(sockaddr_in6), false)->asString());
EXPECT_EQ(IpVersion::v6, addressFromSockAddr(ss, sizeof(sockaddr_in6), true)->ip()->version());
EXPECT_EQ("[::ffff:192.0.2.128]:32000",
addressFromSockAddr(ss, sizeof(sockaddr_in6), true)->asString());
}

TEST(AddressFromSockAddr, Pipe) {
Expand Down