Skip to content
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

Jump to bottom

socket options: re-add support for directly setting options #19689

Merged
merged 1 commit into from
Jan 26, 2022
Merged

socket options: re-add support for directly setting options #19689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions source/common/network/addr_family_aware_socket_option_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class AddrFamilyAwareSocketOptionImpl : public Socket::Option,
SocketOptionName ipv6_optname, absl::string_view ipv6_value)
: ipv4_option_(std::make_unique<SocketOptionImpl>(in_state, ipv4_optname, ipv4_value)),
ipv6_option_(std::make_unique<SocketOptionImpl>(in_state, ipv6_optname, ipv6_value)) {}
AddrFamilyAwareSocketOptionImpl(Socket::OptionConstPtr&& ipv4_option,
Socket::OptionConstPtr&& ipv6_option)
: ipv4_option_(std::move(ipv4_option)), ipv6_option_(std::move(ipv6_option)) {}

// Socket::Option
bool setOption(Socket& socket,
Expand Down
16 changes: 16 additions & 0 deletions test/common/network/addr_family_aware_socket_option_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ class AddrFamilyAwareSocketOptionImplTest : public SocketOptionTest {
}
};

// Set options directly
TEST_F(AddrFamilyAwareSocketOptionImplTest, SetSocketOptionsDirectly) {
AddrFamilyAwareSocketOptionImpl socket_option(
std::make_unique<SocketOptionImpl>(envoy::config::core::v3::SocketOption::STATE_PREBIND,
ENVOY_MAKE_SOCKET_OPTION_NAME(5, 10), 1),
std::make_unique<SocketOptionImpl>(envoy::config::core::v3::SocketOption::STATE_PREBIND,
ENVOY_MAKE_SOCKET_OPTION_NAME(5, 10), 2));

EXPECT_CALL(socket_, ipVersion()).WillRepeatedly(testing::Return(Address::IpVersion::v4));
testSetSocketOptionSuccess(socket_option, ENVOY_MAKE_SOCKET_OPTION_NAME(5, 10), 1,
{envoy::config::core::v3::SocketOption::STATE_PREBIND});
EXPECT_CALL(socket_, ipVersion()).WillRepeatedly(testing::Return(Address::IpVersion::v6));
testSetSocketOptionSuccess(socket_option, ENVOY_MAKE_SOCKET_OPTION_NAME(5, 10), 2,
{envoy::config::core::v3::SocketOption::STATE_PREBIND});
}

// Different values for v4 and v6
TEST_F(AddrFamilyAwareSocketOptionImplTest, DifferentV4AndV6OptionValue) {
AddrFamilyAwareSocketOptionImpl socket_option{
Expand Down