Remove SbSocketIsConnected

Change-Id: I1891511b69fa0c8a905026d3a46f9bf41ad8ab00
youtube · Sep 26, 2024 · b39e0d6 · b39e0d6
1 parent 3f5c2e1
commit b39e0d6
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 81 deletions.
diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn
@@ -95,7 +95,6 @@ static_library("starboard_platform") {
     "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
-    "//starboard/shared/posix/socket_is_connected.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",
     "//starboard/shared/posix/socket_listen.cc",
     "//starboard/shared/posix/socket_receive_from.cc",

diff --git a/starboard/common/socket.cc b/starboard/common/socket.cc
@@ -92,10 +92,6 @@ Socket* Socket::Accept() {
   return NULL;
 }
 
-bool Socket::IsConnected() {
-  return SbSocketIsConnected(socket_);
-}
-
 bool Socket::IsPending() {
   return GetLastError() == kSbSocketPending;
 }

diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc
@@ -156,7 +156,6 @@ ExportedSymbols::ExportedSymbols() {
   REGISTER_SYMBOL(SbSocketGetInterfaceAddress);
   REGISTER_SYMBOL(SbSocketGetLastError);
   REGISTER_SYMBOL(SbSocketGetLocalAddress);
-  REGISTER_SYMBOL(SbSocketIsConnected);
   REGISTER_SYMBOL(SbSocketIsIpv6Supported);
   REGISTER_SYMBOL(SbSocketListen);
   REGISTER_SYMBOL(SbSocketReceiveFrom);

diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn
@@ -165,7 +165,6 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
-    "//starboard/shared/posix/socket_is_connected.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",
     "//starboard/shared/posix/socket_listen.cc",
     "//starboard/shared/posix/socket_receive_from.cc",

diff --git a/starboard/nplb/socket_is_connected_test.cc b/starboard/nplb/socket_is_connected_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if SB_API_VERSION < 17
+
 #include <utility>
 
 #include "starboard/common/log.h"
@@ -41,7 +43,6 @@ TEST_F(SbSocketIsConnectedTest, RainyDayInvalidSocket) {
   EXPECT_FALSE(SbSocketIsConnected(kSbSocketInvalid));
 }
 
-#if SB_API_VERSION < 17
 TEST_P(PairSbSocketIsConnectedTest, SunnyDay) {
   ConnectedTrio trio =
       CreateAndConnect(GetServerAddressType(), GetClientAddressType(),
@@ -62,7 +63,6 @@ TEST_P(PairSbSocketIsConnectedTest, SunnyDay) {
   EXPECT_TRUE(SbSocketDestroy(trio.client_socket));
   EXPECT_TRUE(SbSocketDestroy(trio.listen_socket));
 }
-#endif  // SB_API_VERSION < 17
 
 TEST_P(SbSocketIsConnectedTest, SunnyDayNotConnected) {
   SbSocket socket = SbSocketCreate(GetAddressType(), kSbSocketProtocolTcp);
@@ -71,15 +71,13 @@ TEST_P(SbSocketIsConnectedTest, SunnyDayNotConnected) {
   EXPECT_TRUE(SbSocketDestroy(socket));
 }
 
-#if SB_API_VERSION < 17
 TEST_P(SbSocketIsConnectedTest, SunnyDayListeningNotConnected) {
   SbSocket server_socket =
       CreateListeningTcpSocket(GetAddressType(), GetPortNumberForTests());
   ASSERT_TRUE(SbSocketIsValid(server_socket));
   EXPECT_FALSE(SbSocketIsConnected(server_socket));
   EXPECT_TRUE(SbSocketDestroy(server_socket));
 }
-#endif  // SB_API_VERSION < 17
 
 INSTANTIATE_TEST_CASE_P(SbSocketAddressTypes,
                         SbSocketIsConnectedTest,
@@ -98,3 +96,4 @@ INSTANTIATE_TEST_CASE_P(
 }  // namespace
 }  // namespace nplb
 }  // namespace starboard
+#endif  // SB_API_VERSION < 17
diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn
@@ -123,7 +123,6 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/posix/socket_get_last_error.cc",
     "//starboard/shared/posix/socket_get_local_address.cc",
     "//starboard/shared/posix/socket_internal.cc",
-    "//starboard/shared/posix/socket_is_connected.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",
     "//starboard/shared/posix/socket_listen.cc",
     "//starboard/shared/posix/socket_receive_from.cc",

diff --git a/starboard/shared/posix/socket_is_connected.cc b/starboard/shared/posix/socket_is_connected.cc
diff --git a/starboard/shared/stub/socket_is_connected.cc b/starboard/shared/stub/socket_is_connected.cc
diff --git a/starboard/socket.h b/starboard/socket.h
@@ -207,14 +207,6 @@ SB_EXPORT SbSocketError SbSocketListen(SbSocket socket);
 // |socket|: The SbSocket that is accepting a pending connection.
 SB_EXPORT SbSocket SbSocketAccept(SbSocket socket);
 
-// DEPRECATED with SB_API_VERSION 16
-//
-// Indicates whether |socket| is connected to anything. Invalid sockets are not
-// connected.
-//
-// |socket|: The SbSocket to be checked.
-SB_EXPORT bool SbSocketIsConnected(SbSocket socket);
-
 // DEPRECATED with SB_API_VERSION 16
 //
 // Returns the last error set on |socket|. If |socket| is not valid, this

diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn
@@ -110,7 +110,6 @@ static_library("stub_sources") {
     "//starboard/shared/stub/socket_get_interface_address.cc",
     "//starboard/shared/stub/socket_get_last_error.cc",
     "//starboard/shared/stub/socket_get_local_address.cc",
-    "//starboard/shared/stub/socket_is_connected.cc",
     "//starboard/shared/stub/socket_is_ipv6_supported.cc",
     "//starboard/shared/stub/socket_listen.cc",
     "//starboard/shared/stub/socket_receive_from.cc",