commit 7eaf54d8e68bb4569ce62e5dab6e3a5fc95291e4
author Jason Molenda <jmolenda@apple.com> Fri Jan 18 01:20:12 2013 +0000
committer Jason Molenda <jmolenda@apple.com> Fri Jan 18 01:20:12 2013 +0000
tree bd942058e5d2988ea0474313b80186abed6c8813
parent 92c487d13ca845261e5d2fcfbc6fc2d131dcfa26

<rdar://problem/12243932> 
Change RNBSocket from using lockdown's lockdown_secure_checkin()
function to using lockdown's secure_lockdown_checkin() function.

llvm-svn: 172775

lldb/tools/debugserver/source/RNBSocket.cpp

diff --git a/lldb/tools/debugserver/source/RNBSocket.cpp b/lldb/tools/debugserver/source/RNBSocket.cpp
index 42bf36a..e6c669c 100644
--- a/lldb/tools/debugserver/source/RNBSocket.cpp
+++ b/lldb/tools/debugserver/source/RNBSocket.cpp
@@ -188,15 +188,18 @@
     DNBLog("Connecting to com.apple.%s service...", DEBUGSERVER_PROGRAM_NAME);
     // Disconnect from any previous connections
     Disconnect(false);
-
-    SSLContextRef ssl_ctx;
-    bzero(&ssl_ctx, sizeof(ssl_ctx));
-    if (::lockdown_secure_checkin (&m_fd, &ssl_ctx, NULL, NULL) != kLDESuccess)
+    if (::secure_lockdown_checkin (&m_ld_conn, NULL, NULL) != kLDESuccess)
     {
-        DNBLogThreadedIf(LOG_RNB_COMM, "::lockdown_secure_checkin(&m_fd, NULL, NULL, NULL) failed");
+        DNBLogThreadedIf(LOG_RNB_COMM, "::secure_lockdown_checkin(&m_fd, NULL, NULL) failed");
         m_fd = -1;
         return rnb_not_connected;
     }
+    m_fd = ::lockdown_get_socket (m_ld_conn);
+    if (m_fd == -1)
+    {
+        DNBLogThreadedIf(LOG_RNB_COMM, "::lockdown_get_socket() failed");
+        return rnb_not_connected;
+    }
     m_fd_from_lockdown = true;
     return rnb_success;
 }
@@ -238,7 +241,14 @@
 {
 #ifdef WITH_LOCKDOWN
     if (m_fd_from_lockdown)
+    {
         m_fd_from_lockdown = false;
+        m_fd = -1;
+        if (lockdown_deactivate (m_ld_conn) == 0)
+            return rnb_success;
+        else
+            return rnb_err;
+    }
 #endif
     return ClosePort (m_fd, save_errno);
 }

lldb/tools/debugserver/source/RNBSocket.h

diff --git a/lldb/tools/debugserver/source/RNBSocket.h b/lldb/tools/debugserver/source/RNBSocket.h
index 97fd632..be2199d 100644
--- a/lldb/tools/debugserver/source/RNBSocket.h
+++ b/lldb/tools/debugserver/source/RNBSocket.h
@@ -20,6 +20,10 @@
 #include <string>
 #include "DNBTimer.h"
 
+#ifdef WITH_LOCKDOWN
+#include "lockdown.h"
+#endif
+
 class RNBSocket
 {
 public:
@@ -29,6 +33,7 @@
         m_fd (-1),
 #ifdef WITH_LOCKDOWN
         m_fd_from_lockdown (false),
+        m_ld_conn (),
 #endif
         m_timer (true)      // Make a thread safe timer
     {
@@ -67,6 +72,7 @@
 
 #ifdef WITH_LOCKDOWN
     bool m_fd_from_lockdown;
+    lockdown_connection m_ld_conn;
 #endif
 
     DNBTimer m_timer;