socket options: re-add support for directly setting options (envoypro…

…xy#19689) Signed-off-by: Jose Nino <jnino@lyft.com> Signed-off-by: Josh Perry <josh.perry@mx.com>
joshperry · Feb 13, 2022 · 603a655 · 603a655
1 parent b5a1d81
commit 603a655
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/source/common/network/addr_family_aware_socket_option_impl.h b/source/common/network/addr_family_aware_socket_option_impl.h
@@ -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,

diff --git a/test/common/network/addr_family_aware_socket_option_impl_test.cc b/test/common/network/addr_family_aware_socket_option_impl_test.cc
@@ -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{