Skip to content

Commit 2b216ca

Browse files
tschroedmattklein123
tschroed
authored and
mattklein123
committed
Correct AddrFaily to AddrFamily. (#3636)
Signed-off-by: Trevor Schroeder <[email protected]>
1 parent 7ca1882 commit 2b216ca

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎source/common/network/addr_family_aware_socket_option_impl.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
namespace Envoy {
1111
namespace Network {
1212

13-
bool AddrFailyAwareSocketOptionImpl::setOption(Socket& socket, Socket::SocketState state) const {
13+
bool AddrFamilyAwareSocketOptionImpl::setOption(Socket& socket, Socket::SocketState state) const {
1414
return setIpSocketOption(socket, state, ipv4_option_, ipv6_option_);
1515
}
1616

17-
bool AddrFailyAwareSocketOptionImpl::setIpSocketOption(
17+
bool AddrFamilyAwareSocketOptionImpl::setIpSocketOption(
1818
Socket& socket, Socket::SocketState state, const std::unique_ptr<SocketOptionImpl>& ipv4_option,
1919
const std::unique_ptr<SocketOptionImpl>& ipv6_option) {
2020
// If this isn't IP, we're out of luck.

‎source/common/network/addr_family_aware_socket_option_impl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
namespace Envoy {
1515
namespace Network {
1616

17-
class AddrFailyAwareSocketOptionImpl : public Socket::Option,
18-
Logger::Loggable<Logger::Id::connection> {
17+
class AddrFamilyAwareSocketOptionImpl : public Socket::Option,
18+
Logger::Loggable<Logger::Id::connection> {
1919
public:
20-
AddrFailyAwareSocketOptionImpl(Socket::SocketState in_state, SocketOptionName ipv4_optname,
21-
SocketOptionName ipv6_optname, int value)
20+
AddrFamilyAwareSocketOptionImpl(Socket::SocketState in_state, SocketOptionName ipv4_optname,
21+
SocketOptionName ipv6_optname, int value)
2222
: ipv4_option_(absl::make_unique<SocketOptionImpl>(in_state, ipv4_optname, value)),
2323
ipv6_option_(absl::make_unique<SocketOptionImpl>(in_state, ipv6_optname, value)) {}
2424

‎source/common/network/socket_option_factory.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ SocketOptionFactory::buildTcpKeepaliveOptions(Network::TcpKeepaliveConfig keepal
3232

3333
std::unique_ptr<Socket::Options> SocketOptionFactory::buildIpFreebindOptions() {
3434
std::unique_ptr<Socket::Options> options = absl::make_unique<Socket::Options>();
35-
options->push_back(std::make_shared<Network::AddrFailyAwareSocketOptionImpl>(
35+
options->push_back(std::make_shared<Network::AddrFamilyAwareSocketOptionImpl>(
3636
Network::Socket::SocketState::PreBind, ENVOY_SOCKET_IP_FREEBIND, ENVOY_SOCKET_IPV6_FREEBIND,
3737
1));
3838
return options;
3939
}
4040

4141
std::unique_ptr<Socket::Options> SocketOptionFactory::buildIpTransparentOptions() {
4242
std::unique_ptr<Socket::Options> options = absl::make_unique<Socket::Options>();
43-
options->push_back(std::make_shared<Network::AddrFailyAwareSocketOptionImpl>(
43+
options->push_back(std::make_shared<Network::AddrFamilyAwareSocketOptionImpl>(
4444
Network::Socket::SocketState::PreBind, ENVOY_SOCKET_IP_TRANSPARENT,
4545
ENVOY_SOCKET_IPV6_TRANSPARENT, 1));
46-
options->push_back(std::make_shared<Network::AddrFailyAwareSocketOptionImpl>(
46+
options->push_back(std::make_shared<Network::AddrFamilyAwareSocketOptionImpl>(
4747
Network::Socket::SocketState::PostBind, ENVOY_SOCKET_IP_TRANSPARENT,
4848
ENVOY_SOCKET_IPV6_TRANSPARENT, 1));
4949
return options;
@@ -58,4 +58,4 @@ SocketOptionFactory::buildTcpFastOpenOptions(uint32_t queue_length) {
5858
}
5959

6060
} // namespace Network
61-
} // namespace Envoy
61+
} // namespace Envoy

‎test/common/network/addr_family_aware_socket_option_impl_test.cc‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,101 +6,101 @@ namespace Envoy {
66
namespace Network {
77
namespace {
88

9-
class AddrFailyAwareSocketOptionImplTest : public SocketOptionTest {};
9+
class AddrFamilyAwareSocketOptionImplTest : public SocketOptionTest {};
1010

1111
// We fail to set the option when the underlying setsockopt syscall fails.
12-
TEST_F(AddrFailyAwareSocketOptionImplTest, SetOptionFailure) {
12+
TEST_F(AddrFamilyAwareSocketOptionImplTest, SetOptionFailure) {
1313
EXPECT_CALL(socket_, fd()).WillOnce(Return(-1));
14-
AddrFailyAwareSocketOptionImpl socket_option{
14+
AddrFamilyAwareSocketOptionImpl socket_option{
1515
Socket::SocketState::PreBind, Network::SocketOptionName(std::make_pair(5, 10)), {}, 1};
1616
EXPECT_LOG_CONTAINS(
1717
"warning", "Failed to set IP socket option on non-IP socket",
1818
EXPECT_FALSE(socket_option.setOption(socket_, Socket::SocketState::PreBind)););
1919
}
2020

2121
// If a platform supports IPv4 socket option variant for an IPv4 address, it works
22-
TEST_F(AddrFailyAwareSocketOptionImplTest, SetOptionSuccess) {
22+
TEST_F(AddrFamilyAwareSocketOptionImplTest, SetOptionSuccess) {
2323
Address::Ipv4Instance address("1.2.3.4", 5678);
2424
const int fd = address.socket(Address::SocketType::Stream);
2525
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
2626

27-
AddrFailyAwareSocketOptionImpl socket_option{
27+
AddrFamilyAwareSocketOptionImpl socket_option{
2828
Socket::SocketState::PreBind, Network::SocketOptionName(std::make_pair(5, 10)), {}, 1};
2929
testSetSocketOptionSuccess(socket_option, Network::SocketOptionName(std::make_pair(5, 10)), 1,
3030
{Socket::SocketState::PreBind});
3131
}
3232

3333
// If a platform doesn't support IPv4 socket option variant for an IPv4 address we fail
34-
TEST_F(AddrFailyAwareSocketOptionImplTest, V4EmptyOptionNames) {
34+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V4EmptyOptionNames) {
3535
Address::Ipv4Instance address("1.2.3.4", 5678);
3636
const int fd = address.socket(Address::SocketType::Stream);
3737
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
38-
AddrFailyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind, {}, {}, 1};
38+
AddrFamilyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind, {}, {}, 1};
3939

4040
EXPECT_LOG_CONTAINS("warning", "Setting option on socket failed: Operation not supported",
4141
EXPECT_FALSE(socket_option.setOption(socket_, Socket::SocketState::PreBind)));
4242
}
4343

4444
// If a platform doesn't support IPv4 and IPv6 socket option variants for an IPv4 address, we fail
45-
TEST_F(AddrFailyAwareSocketOptionImplTest, V6EmptyOptionNames) {
45+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V6EmptyOptionNames) {
4646
Address::Ipv6Instance address("::1:2:3:4", 5678);
4747
const int fd = address.socket(Address::SocketType::Stream);
4848
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
49-
AddrFailyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind, {}, {}, 1};
49+
AddrFamilyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind, {}, {}, 1};
5050

5151
EXPECT_LOG_CONTAINS("warning", "Setting option on socket failed: Operation not supported",
5252
EXPECT_FALSE(socket_option.setOption(socket_, Socket::SocketState::PreBind)));
5353
}
5454

5555
// If a platform suppports IPv4 and IPv6 socket option variants for an IPv4 address, we apply the
5656
// IPv4 varient
57-
TEST_F(AddrFailyAwareSocketOptionImplTest, V4IgnoreV6) {
57+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V4IgnoreV6) {
5858
Address::Ipv4Instance address("1.2.3.4", 5678);
5959
const int fd = address.socket(Address::SocketType::Stream);
6060
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
6161

62-
AddrFailyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind,
63-
Network::SocketOptionName(std::make_pair(5, 10)),
64-
Network::SocketOptionName(std::make_pair(6, 11)), 1};
62+
AddrFamilyAwareSocketOptionImpl socket_option{
63+
Socket::SocketState::PreBind, Network::SocketOptionName(std::make_pair(5, 10)),
64+
Network::SocketOptionName(std::make_pair(6, 11)), 1};
6565
testSetSocketOptionSuccess(socket_option, Network::SocketOptionName(std::make_pair(5, 10)), 1,
6666
{Socket::SocketState::PreBind});
6767
}
6868

6969
// If a platform suppports IPv6 socket option variant for an IPv6 address it works
70-
TEST_F(AddrFailyAwareSocketOptionImplTest, V6Only) {
70+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V6Only) {
7171
Address::Ipv6Instance address("::1:2:3:4", 5678);
7272
const int fd = address.socket(Address::SocketType::Stream);
7373
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
7474

75-
AddrFailyAwareSocketOptionImpl socket_option{
75+
AddrFamilyAwareSocketOptionImpl socket_option{
7676
Socket::SocketState::PreBind, {}, Network::SocketOptionName(std::make_pair(6, 11)), 1};
7777
testSetSocketOptionSuccess(socket_option, Network::SocketOptionName(std::make_pair(6, 11)), 1,
7878
{Socket::SocketState::PreBind});
7979
}
8080

8181
// If a platform suppports only the IPv4 variant for an IPv6 address,
8282
// we apply the IPv4 variant.
83-
TEST_F(AddrFailyAwareSocketOptionImplTest, V6OnlyV4Fallback) {
83+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V6OnlyV4Fallback) {
8484
Address::Ipv6Instance address("::1:2:3:4", 5678);
8585
const int fd = address.socket(Address::SocketType::Stream);
8686
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
8787

88-
AddrFailyAwareSocketOptionImpl socket_option{
88+
AddrFamilyAwareSocketOptionImpl socket_option{
8989
Socket::SocketState::PreBind, Network::SocketOptionName(std::make_pair(5, 10)), {}, 1};
9090
testSetSocketOptionSuccess(socket_option, Network::SocketOptionName(std::make_pair(5, 10)), 1,
9191
{Socket::SocketState::PreBind});
9292
}
9393

9494
// If a platform suppports IPv4 and IPv6 socket option variants for an IPv6 address,
95-
// AddrFailyAwareSocketOptionImpl::setIpSocketOption() works with the IPv6 variant.
96-
TEST_F(AddrFailyAwareSocketOptionImplTest, V6Precedence) {
95+
// AddrFamilyAwareSocketOptionImpl::setIpSocketOption() works with the IPv6 variant.
96+
TEST_F(AddrFamilyAwareSocketOptionImplTest, V6Precedence) {
9797
Address::Ipv6Instance address("::1:2:3:4", 5678);
9898
const int fd = address.socket(Address::SocketType::Stream);
9999
EXPECT_CALL(socket_, fd()).WillRepeatedly(Return(fd));
100100

101-
AddrFailyAwareSocketOptionImpl socket_option{Socket::SocketState::PreBind,
102-
Network::SocketOptionName(std::make_pair(5, 10)),
103-
Network::SocketOptionName(std::make_pair(6, 11)), 1};
101+
AddrFamilyAwareSocketOptionImpl socket_option{
102+
Socket::SocketState::PreBind, Network::SocketOptionName(std::make_pair(5, 10)),
103+
Network::SocketOptionName(std::make_pair(6, 11)), 1};
104104
testSetSocketOptionSuccess(socket_option, Network::SocketOptionName(std::make_pair(6, 11)), 1,
105105
{Socket::SocketState::PreBind});
106106
}

0 commit comments

Comments
 (0)