Refactored after llvm#108188.

Author: slydiman

lldb/docs/man/lldb-server.rst

@@ -150,12 +150,6 @@ GDB-SERVER CONNECTIONS
  Define a port to be used for gdb-server connections. This port is used for
  multiple connections.
 
-.. option:: --port-offset <offset>
-
- Add the specified offset to port numbers returned by server. This is useful
- if the server is running behind a firewall, and a range of ports is redirected
- to it with an offset.
-
 EXAMPLES
 --------
 

lldb/include/lldb/Host/Socket.h

@@ -92,9 +92,9 @@ class Socket : public IOObject {
   static llvm::Error Initialize();
   static void Terminate();
 
-  static std::unique_ptr<Socket> Create(const SocketProtocol protocol,
-                                        bool child_processes_inherit,
-                                        Status &error);
+  static std::unique_ptr<Socket>
+  Create(const SocketProtocol protocol, bool child_processes_inherit,
+         Status &error, NativeSocket sockfd = kInvalidSocketValue);
 
   virtual Status Connect(llvm::StringRef name) = 0;
   virtual Status Listen(llvm::StringRef name, int backlog) = 0;
@@ -154,7 +154,7 @@ class Socket : public IOObject {
 
 protected:
   Socket(SocketProtocol protocol, bool should_close,
-         bool m_child_process_inherit);
+         bool child_processes_inherit);
 
   virtual size_t Send(const void *buf, const size_t num_bytes);
 

lldb/source/Host/common/Socket.cpp

@@ -215,30 +215,32 @@ void Socket::Terminate() {
 
 std::unique_ptr<Socket> Socket::Create(const SocketProtocol protocol,
                                        bool child_processes_inherit,
-                                       Status &error) {
+                                       Status &error, NativeSocket sockfd) {
   error.Clear();
 
   std::unique_ptr<Socket> socket_up;
   switch (protocol) {
   case ProtocolTcp:
     socket_up =
-        std::make_unique<TCPSocket>(true, child_processes_inherit);
+        std::make_unique<TCPSocket>(sockfd, true, child_processes_inherit);
     break;
   case ProtocolUdp:
+    assert(sockfd == kInvalidSocketValue);
     socket_up =
         std::make_unique<UDPSocket>(true, child_processes_inherit);
     break;
   case ProtocolUnixDomain:
 #if LLDB_ENABLE_POSIX
     socket_up =
-        std::make_unique<DomainSocket>(true, child_processes_inherit);
+        std::make_unique<DomainSocket>(sockfd, true, child_processes_inherit);
 #else
     error = Status::FromErrorString(
         "Unix domain sockets are not supported on this platform.");
 #endif
     break;
   case ProtocolUnixAbstract:
 #ifdef __linux__
+    assert(sockfd == kInvalidSocketValue);
     socket_up =
         std::make_unique<AbstractSocket>(child_processes_inherit);
 #else

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp

@@ -51,7 +51,7 @@ std::set<lldb::pid_t> GDBRemoteCommunicationServerPlatform::g_spawned_pids;
 GDBRemoteCommunicationServerPlatform::GDBRemoteCommunicationServerPlatform(
     const Socket::SocketProtocol socket_protocol, uint16_t gdbserver_port)
     : GDBRemoteCommunicationServerCommon(), m_socket_protocol(socket_protocol),
-      m_gdbserver_port(gdbserver_port), m_port_offset(0) {
+      m_gdbserver_port(gdbserver_port) {
 
   RegisterMemberFunctionHandler(
       StringExtractorGDBRemote::eServerPacketType_qC,
@@ -185,8 +185,7 @@ GDBRemoteCommunicationServerPlatform::Handle_qLaunchGDBServer(
 
   StreamGDBRemote response;
   uint16_t gdbserver_port = socket_name.empty() ? m_gdbserver_port : 0;
-  response.Printf("pid:%" PRIu64 ";port:%u;", debugserver_pid,
-                  gdbserver_port + m_port_offset);
+  response.Printf("pid:%" PRIu64 ";port:%u;", debugserver_pid, gdbserver_port);
   if (!socket_name.empty()) {
     response.PutCString("socket_name:");
     response.PutStringAsRawHex8(socket_name);
@@ -494,10 +493,6 @@ GDBRemoteCommunicationServerPlatform::GetDomainSocketPath(const char *prefix) {
   return FileSpec(socket_path.c_str());
 }
 
-void GDBRemoteCommunicationServerPlatform::SetPortOffset(uint16_t port_offset) {
-  m_port_offset = port_offset;
-}
-
 void GDBRemoteCommunicationServerPlatform::SetPendingGdbServer(
     const std::string &socket_name) {
   m_pending_gdb_server_socket_name = socket_name;

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h

@@ -32,8 +32,6 @@ class GDBRemoteCommunicationServerPlatform
 
   Status LaunchProcess() override;
 
-  void SetPortOffset(uint16_t port_offset);
-
   void SetInferiorArguments(const lldb_private::Args &args);
 
   Status LaunchGDBServer(const lldb_private::Args &args, lldb::pid_t &pid,
@@ -47,7 +45,6 @@ class GDBRemoteCommunicationServerPlatform
   static std::set<lldb::pid_t> g_spawned_pids;
 
   uint16_t m_gdbserver_port;
-  uint16_t m_port_offset;
   std::optional<std::string> m_pending_gdb_server_socket_name;
 
   PacketResult Handle_qLaunchGDBServer(StringExtractorGDBRemote &packet);