Revert to getting a random port and sending that down to debugserver for iOS. The sandboxing is not letting debugserver reverse connect back to lldb.

<rdar://problem/15789865>

llvm-svn: 198963

1 files changed, 49 insertions, 25 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index 76817f5930d..b3ea8b481df 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -598,12 +598,12 @@ GDBRemoteCommunication::ListenThread (lldb::thread_arg_t arg)
 }
 
 Error
-GDBRemoteCommunication::StartDebugserverProcess (const char *host_and_port,
+GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
+                                                 uint16_t in_port,
                                                  lldb_private::ProcessLaunchInfo &launch_info,
-                                                 uint16_t &port)
+                                                 uint16_t &out_port)
 {
-    port = 0;
-
+    out_port = in_port;
     Error error;
     // If we locate debugserver, keep that located version around
     static FileSpec g_debugserver_file_spec;
@@ -651,8 +651,17 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *host_and_port,
         debugserver_args.AppendArgument(debugserver_path);
 
         // If a host and port is supplied then use it
-        if (host_and_port)
+        char host_and_port[128];
+        if (hostname)
+        {
+            snprintf (host_and_port, sizeof(host_and_port), "%s:%u", hostname, in_port);
             debugserver_args.AppendArgument(host_and_port);
+        }
+        else
+        {
+            host_and_port[0] = '\0';
+        }
+
         // use native registers, not the GDB registers
         debugserver_args.AppendArgument("--native-regs");   
         // make debugserver run in its own session so signals generated by 
@@ -661,34 +670,45 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *host_and_port,
 
         char named_pipe_path[PATH_MAX];
 
-        if (host_and_port)
+        bool listen = false;
+        if (host_and_port[0])
         {
             // Create a temporary file to get the stdout/stderr and redirect the
             // output of the command into this file. We will later read this file
             // if all goes well and fill the data into "command_output_ptr"
-            FileSpec tmpdir_file_spec;
-            if (Host::GetLLDBPath (ePathTypeLLDBTempSystemDir, tmpdir_file_spec))
-            {
-                tmpdir_file_spec.GetFilename().SetCString("debugserver-named-pipe.XXXXXX");
-                strncpy(named_pipe_path, tmpdir_file_spec.GetPath().c_str(), sizeof(named_pipe_path));
-            }
-            else
-            {
-                strncpy(named_pipe_path, "/tmp/debugserver-named-pipe.XXXXXX", sizeof(named_pipe_path));
-            }
 
-            if (::mktemp (named_pipe_path))
+            if (in_port == 0)
             {
-                if (::mkfifo(named_pipe_path, 0600) == 0)
+                // Binding to port zero, we need to figure out what port it ends up
+                // using using a named pipe...
+                FileSpec tmpdir_file_spec;
+                if (Host::GetLLDBPath (ePathTypeLLDBTempSystemDir, tmpdir_file_spec))
                 {
-                    debugserver_args.AppendArgument("--named-pipe");
-                    debugserver_args.AppendArgument(named_pipe_path);
+                    tmpdir_file_spec.GetFilename().SetCString("debugserver-named-pipe.XXXXXX");
+                    strncpy(named_pipe_path, tmpdir_file_spec.GetPath().c_str(), sizeof(named_pipe_path));
+                }
+                else
+                {
+                    strncpy(named_pipe_path, "/tmp/debugserver-named-pipe.XXXXXX", sizeof(named_pipe_path));
+                }
+
+                if (::mktemp (named_pipe_path))
+                {
+                    if (::mkfifo(named_pipe_path, 0600) == 0)
+                    {
+                        debugserver_args.AppendArgument("--named-pipe");
+                        debugserver_args.AppendArgument(named_pipe_path);
+                    }
+                    else
+                        named_pipe_path[0] = '\0';
                 }
                 else
                     named_pipe_path[0] = '\0';
             }
             else
-                named_pipe_path[0] = '\0';
+            {
+                listen = true;
+            }
         }
         else
         {
@@ -701,10 +721,10 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *host_and_port,
                 return error;
 
             ConnectionFileDescriptor *connection = (ConnectionFileDescriptor *)GetConnection ();
-            port = connection->GetBoundPort(3);
-            assert (port != 0);
+            out_port = connection->GetBoundPort(3);
+            assert (out_port != 0);
             char port_cstr[32];
-            snprintf(port_cstr, sizeof(port_cstr), "localhost:%i", port);
+            snprintf(port_cstr, sizeof(port_cstr), "localhost:%i", out_port);
             // Send the host and port down that debugserver and specify an option
             // so that it connects back to the port we are listening to in this process
             debugserver_args.AppendArgument("--reverse-connect");
@@ -746,11 +766,15 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *host_and_port,
                 error = name_pipe_file.Read(port_cstr, num_bytes);
                 assert (error.Success());
                 assert (num_bytes > 0 && port_cstr[num_bytes-1] == '\0');
-                port = Args::StringToUInt32(port_cstr, 0);
+                out_port = Args::StringToUInt32(port_cstr, 0);
                 name_pipe_file.Close();
             }
             Host::Unlink(named_pipe_path);
         }
+        else if (listen)
+        {
+            
+        }
         else
         {
             // Make sure we actually connect with the debugserver...