Clean up socket.h header (#4158)

b/369182833
youtube · Sep 30, 2024 · 4a475f3 · 4a475f3
1 parent 46be200
commit 4a475f3
Show file tree

Hide file tree

Showing 55 changed files with 24 additions and 3,400 deletions.
diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn
@@ -92,25 +92,14 @@ static_library("starboard_platform") {
     "//starboard/shared/posix/socket_connect.cc",
     "//starboard/shared/posix/socket_create.cc",
     "//starboard/shared/posix/socket_destroy.cc",
-    "//starboard/shared/posix/socket_free_resolution.cc",
     "//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_connected_and_idle.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",
-    "//starboard/shared/posix/socket_join_multicast_group.cc",
     "//starboard/shared/posix/socket_listen.cc",
     "//starboard/shared/posix/socket_receive_from.cc",
-    "//starboard/shared/posix/socket_resolve.cc",
     "//starboard/shared/posix/socket_send_to.cc",
-    "//starboard/shared/posix/socket_set_broadcast.cc",
-    "//starboard/shared/posix/socket_set_receive_buffer_size.cc",
     "//starboard/shared/posix/socket_set_reuse_address.cc",
-    "//starboard/shared/posix/socket_set_send_buffer_size.cc",
-    "//starboard/shared/posix/socket_set_tcp_keep_alive.cc",
-    "//starboard/shared/posix/socket_set_tcp_no_delay.cc",
-    "//starboard/shared/posix/socket_set_tcp_window_scaling.cc",
     "//starboard/shared/posix/storage_write_record.cc",
     "//starboard/shared/posix/system_break_into_debugger.cc",
     "//starboard/shared/posix/system_clear_last_error.cc",

diff --git a/starboard/common/socket.cc b/starboard/common/socket.cc
@@ -92,14 +92,6 @@ Socket* Socket::Accept() {
   return NULL;
 }
 
-bool Socket::IsConnected() {
-  return SbSocketIsConnected(socket_);
-}
-
-bool Socket::IsConnectedAndIdle() {
-  return SbSocketIsConnectedAndIdle(socket_);
-}
-
 bool Socket::IsPending() {
   return GetLastError() == kSbSocketPending;
 }
@@ -128,38 +120,10 @@ bool Socket::GetLocalAddress(SbSocketAddress* out_address) {
   return SbSocketGetLocalAddress(socket_, out_address);
 }
 
-bool Socket::SetBroadcast(bool value) {
-  return SbSocketSetBroadcast(socket_, value);
-}
-
 bool Socket::SetReuseAddress(bool value) {
   return SbSocketSetReuseAddress(socket_, value);
 }
 
-bool Socket::SetReceiveBufferSize(int32_t size) {
-  return SbSocketSetReceiveBufferSize(socket_, size);
-}
-
-bool Socket::SetSendBufferSize(int32_t size) {
-  return SbSocketSetSendBufferSize(socket_, size);
-}
-
-bool Socket::SetTcpKeepAlive(bool value, int64_t period) {
-  return SbSocketSetTcpKeepAlive(socket_, value, period);
-}
-
-bool Socket::SetTcpNoDelay(bool value) {
-  return SbSocketSetTcpNoDelay(socket_, value);
-}
-
-bool Socket::SetTcpWindowScaling(bool value) {
-  return SbSocketSetTcpWindowScaling(socket_, value);
-}
-
-bool Socket::JoinMulticastGroup(const SbSocketAddress* address) {
-  return SbSocketJoinMulticastGroup(socket_, address);
-}
-
 SbSocket Socket::socket() {
   return socket_;
 }

diff --git a/starboard/common/socket.h b/starboard/common/socket.h
@@ -71,7 +71,6 @@ class Socket {
   bool SetTcpKeepAlive(bool value, int64_t period);  // period in microseconds.
   bool SetTcpNoDelay(bool value);
   bool SetTcpWindowScaling(bool value);
-  bool JoinMulticastGroup(const SbSocketAddress* address);
 
   SbSocket socket();
 

diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc
@@ -153,25 +153,14 @@ ExportedSymbols::ExportedSymbols() {
   REGISTER_SYMBOL(SbSocketConnect);
   REGISTER_SYMBOL(SbSocketCreate);
   REGISTER_SYMBOL(SbSocketDestroy);
-  REGISTER_SYMBOL(SbSocketFreeResolution);
   REGISTER_SYMBOL(SbSocketGetInterfaceAddress);
   REGISTER_SYMBOL(SbSocketGetLastError);
   REGISTER_SYMBOL(SbSocketGetLocalAddress);
-  REGISTER_SYMBOL(SbSocketIsConnected);
-  REGISTER_SYMBOL(SbSocketIsConnectedAndIdle);
   REGISTER_SYMBOL(SbSocketIsIpv6Supported);
-  REGISTER_SYMBOL(SbSocketJoinMulticastGroup);
   REGISTER_SYMBOL(SbSocketListen);
   REGISTER_SYMBOL(SbSocketReceiveFrom);
-  REGISTER_SYMBOL(SbSocketResolve);
   REGISTER_SYMBOL(SbSocketSendTo);
-  REGISTER_SYMBOL(SbSocketSetBroadcast);
-  REGISTER_SYMBOL(SbSocketSetReceiveBufferSize);
   REGISTER_SYMBOL(SbSocketSetReuseAddress);
-  REGISTER_SYMBOL(SbSocketSetSendBufferSize);
-  REGISTER_SYMBOL(SbSocketSetTcpKeepAlive);
-  REGISTER_SYMBOL(SbSocketSetTcpNoDelay);
-  REGISTER_SYMBOL(SbSocketSetTcpWindowScaling);
   REGISTER_SYMBOL(SbSocketWaiterAdd);
   REGISTER_SYMBOL(SbSocketWaiterCreate);
   REGISTER_SYMBOL(SbSocketWaiterDestroy);

diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn
@@ -162,25 +162,14 @@ static_library("starboard_platform_sources") {
     "//starboard/shared/posix/socket_connect.cc",
     "//starboard/shared/posix/socket_create.cc",
     "//starboard/shared/posix/socket_destroy.cc",
-    "//starboard/shared/posix/socket_free_resolution.cc",
     "//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_connected_and_idle.cc",
     "//starboard/shared/posix/socket_is_ipv6_supported.cc",
-    "//starboard/shared/posix/socket_join_multicast_group.cc",
     "//starboard/shared/posix/socket_listen.cc",
     "//starboard/shared/posix/socket_receive_from.cc",
-    "//starboard/shared/posix/socket_resolve.cc",
     "//starboard/shared/posix/socket_send_to.cc",
-    "//starboard/shared/posix/socket_set_broadcast.cc",
-    "//starboard/shared/posix/socket_set_receive_buffer_size.cc",
     "//starboard/shared/posix/socket_set_reuse_address.cc",
-    "//starboard/shared/posix/socket_set_send_buffer_size.cc",
-    "//starboard/shared/posix/socket_set_tcp_keep_alive.cc",
-    "//starboard/shared/posix/socket_set_tcp_no_delay.cc",
-    "//starboard/shared/posix/socket_set_tcp_window_scaling.cc",
     "//starboard/shared/posix/storage_write_record.cc",
     "//starboard/shared/posix/system_break_into_debugger.cc",
     "//starboard/shared/posix/system_clear_last_error.cc",

diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn
@@ -177,30 +177,17 @@ target(gtest_target_type, "nplb") {
     "random_helpers.cc",
     "recursive_mutex_test.cc",
     "semaphore_test.cc",
-    "socket_accept_test.cc",
-    "socket_bind_test.cc",
     "socket_clear_last_error_test.cc",
-    "socket_connect_test.cc",
-    "socket_create_test.cc",
     "socket_destroy_test.cc",
     "socket_get_interface_address_test.cc",
     "socket_get_last_error_test.cc",
     "socket_get_local_address_test.cc",
     "socket_helpers.cc",
     "socket_is_connected_and_idle_test.cc",
     "socket_is_connected_test.cc",
-    "socket_join_multicast_group_test.cc",
-    "socket_listen_test.cc",
     "socket_receive_from_test.cc",
-    "socket_resolve_test.cc",
-    "socket_send_to_test.cc",
-    "socket_set_options_test.cc",
-    "socket_waiter_add_test.cc",
     "socket_waiter_create_test.cc",
     "socket_waiter_destroy_test.cc",
-    "socket_waiter_remove_test.cc",
-    "socket_waiter_wait_test.cc",
-    "socket_waiter_wait_timed_test.cc",
     "socket_waiter_wake_up_test.cc",
     "socket_wrapper_test.cc",
     "speech_synthesis_basic_test.cc",

diff --git a/starboard/nplb/socket_accept_test.cc b/starboard/nplb/socket_accept_test.cc
diff --git a/starboard/nplb/socket_bind_test.cc b/starboard/nplb/socket_bind_test.cc