From 37a743217803f8335911beb1072e7df34a652159 Mon Sep 17 00:00:00 2001
From: Wiktor Garbacz <wiktorg@google.com>
Date: Tue, 26 Sep 2023 05:44:21 -0700
Subject: [PATCH] Remove deprecated comms functions

PiperOrigin-RevId: 568510723
Change-Id: I517d739e44cb61eec8b0fd9fe6aa473e1bb8ec06
---
 sandboxed_api/sandbox2/comms.cc      | 54 ----------------------------
 sandboxed_api/sandbox2/comms.h       | 20 -----------
 sandboxed_api/sandbox2/comms_test.cc |  8 -----
 3 files changed, 82 deletions(-)

diff --git a/sandboxed_api/sandbox2/comms.cc b/sandboxed_api/sandbox2/comms.cc
index 79cab93..522d0d6 100644
--- a/sandboxed_api/sandbox2/comms.cc
+++ b/sandboxed_api/sandbox2/comms.cc
@@ -109,9 +109,6 @@ socklen_t CreateSockaddrUn(const std::string& socket_name, bool abstract_uds,
 }
 }  // namespace
 
-Comms::Comms(const std::string& socket_name, bool abstract_uds)
-    : name_(socket_name), abstract_uds_(abstract_uds) {}
-
 Comms::Comms(int fd, absl::string_view name) : connection_fd_(fd) {
   // Generate a unique and meaningful socket name for this FD.
   // Note: getpid()/gettid() are non-blocking syscalls.
@@ -163,23 +160,6 @@ absl::Status ListeningComms::Listen() {
   return absl::OkStatus();
 }
 
-bool Comms::Listen() {
-  if (IsConnected()) {
-    return true;
-  }
-
-  absl::StatusOr<ListeningComms> listening_comms =
-      ListeningComms::Create(name_, abstract_uds_);
-  if (!listening_comms.ok()) {
-    SAPI_RAW_LOG(ERROR, "Listening failed: %s",
-                 std::string(listening_comms.status().message()).c_str());
-    return false;
-  }
-  listening_comms_ =
-      std::make_unique<ListeningComms>(*std::move(listening_comms));
-  return true;
-}
-
 absl::StatusOr<Comms> ListeningComms::Accept() {
   sockaddr_un suc;
   socklen_t len = sizeof(suc);
@@ -197,25 +177,6 @@ absl::StatusOr<Comms> ListeningComms::Accept() {
   return Comms(connection_fd, socket_name_);
 }
 
-bool Comms::Accept() {
-  if (IsConnected()) {
-    return true;
-  }
-
-  if (listening_comms_ == nullptr) {
-    SAPI_RAW_LOG(ERROR, "Comms::Listen needs to be called first");
-    return false;
-  }
-
-  absl::StatusOr<Comms> comms = listening_comms_->Accept();
-  if (!comms.ok()) {
-    SAPI_RAW_LOG(ERROR, "%s", std::string(comms.status().message()).c_str());
-    return false;
-  }
-  *this = *std::move(comms);
-  return true;
-}
-
 absl::StatusOr<Comms> Comms::Connect(const std::string& socket_name,
                                      bool abstract_uds) {
   FDCloser connection_fd(socket(AF_UNIX, SOCK_STREAM, 0));  // Non-blocking
@@ -240,21 +201,6 @@ absl::StatusOr<Comms> Comms::Connect(const std::string& socket_name,
   return Comms(connection_fd.Release(), socket_name);
 }
 
-bool Comms::Connect() {
-  if (IsConnected()) {
-    return true;
-  }
-
-  absl::StatusOr<Comms> connected = Connect(name_, abstract_uds_);
-  if (!connected.ok()) {
-    SAPI_RAW_LOG(ERROR, "%s",
-                 std::string(connected.status().message()).c_str());
-    return false;
-  }
-  *this = *std::move(connected);
-  return true;
-}
-
 void Comms::Terminate() {
   state_ = State::kTerminated;
 
diff --git a/sandboxed_api/sandbox2/comms.h b/sandboxed_api/sandbox2/comms.h
index 39f29ef..adfe5be 100644
--- a/sandboxed_api/sandbox2/comms.h
+++ b/sandboxed_api/sandbox2/comms.h
@@ -98,12 +98,6 @@ class Comms {
   static absl::StatusOr<Comms> Connect(const std::string& socket_name,
                                        bool abstract_uds = true);
 
-  // This object will have to be connected later on.
-  // When not specified the constructor uses abstract unix domain sockets.
-  ABSL_DEPRECATED(
-      "Use ListeningComms or absl::StatusOr<Comms> Connect() instead")
-  explicit Comms(const std::string& socket_name, bool abstract_uds = true);
-
   Comms(Comms&& other) { *this = std::move(other); }
   Comms& operator=(Comms&& other) {
     if (this != &other) {
@@ -126,20 +120,6 @@ class Comms {
 
   ~Comms();
 
-  // Binds to an address and make it listen to connections.
-  ABSL_DEPRECATED("Use ListeningComms::Create() instead")
-  bool Listen();
-
-  // Accepts the connection.
-  ABSL_DEPRECATED("Use ListeningComms::Accept() instead")
-  bool Accept();
-
-  // Connects to a remote socket.
-  ABSL_DEPRECATED(
-      "Use absl::StatusOr<Comms> Comms::Connect(std::string& socket_name, bool "
-      "abstract_uds) instead")
-  bool Connect();
-
   // Terminates all underlying file descriptors, and sets the status of the
   // Comms object to TERMINATED.
   void Terminate();
diff --git a/sandboxed_api/sandbox2/comms_test.cc b/sandboxed_api/sandbox2/comms_test.cc
index 4e5dacc..970ba3a 100644
--- a/sandboxed_api/sandbox2/comms_test.cc
+++ b/sandboxed_api/sandbox2/comms_test.cc
@@ -371,12 +371,4 @@ TEST(CommsTest, TestSendRecvBytes) {
   HandleCommunication(a, b);
 }
 
-// We cannot test this in the Client or Server tests, as the endpoint needs to
-// be unconnected.
-TEST(CommsTest, TestMsgSize) {
-  // There will be no actual connection to this socket.
-  const std::string socket_name = "sandbox2_comms_msg_size_test";
-  Comms c(socket_name);
-}
-
 }  // namespace sandbox2