Split secure command channel and untrusted application channel

src/trusted/service_runtime/sel_ldr.h

Index: src/trusted/service_runtime/sel_ldr.h
diff --git a/src/trusted/service_runtime/sel_ldr.h b/src/trusted/service_runtime/sel_ldr.h
index 027cf4125afe464cb4f6819aa719e2eea65fea32..51f5e6e8b46a431506a4304fef3ecdd1468b90bf 100644
--- a/src/trusted/service_runtime/sel_ldr.h
+++ b/src/trusted/service_runtime/sel_ldr.h
@@ -47,6 +47,8 @@
 #include "native_client/src/trusted/service_runtime/nacl_kernel_service.h"
 #include "native_client/src/trusted/service_runtime/nacl_resource.h"
 
+#include "native_client/src/trusted/service_runtime/nacl_secure_service.h"
+
 #include "native_client/src/trusted/service_runtime/sel_mem.h"
 #include "native_client/src/trusted/service_runtime/sel_util.h"
 #include "native_client/src/trusted/service_runtime/sel_rt.h"
@@ -70,8 +72,6 @@ struct NaClDesc;  /* see native_client/src/trusted/desc/nacl_desc_base.h */
 struct NaClDynamicRegion;
 struct NaClManifestProxy;
 struct NaClReverseQuotaInterface;
-struct NaClSecureService;
-struct NaClSecureReverseService;
 struct NaClSignalContext;
 struct NaClThreadInterface;  /* see sel_ldr_thread_interface.h */
 struct NaClValidationCache;
@@ -207,6 +207,9 @@ struct NaClApp {
   struct NaClDesc           *service_port;
   struct NaClDesc           *service_address;
 
+  struct NaClDesc           *secure_service_port;
+  struct NaClDesc           *secure_service_address;
+
   struct NaClDesc           *bootstrap_channel;
 
   struct NaClMutex          mu;
@@ -601,14 +604,6 @@ void NaClSetUpBootstrapChannel(struct NaClApp  *nap,
 
 void NaClSecureCommandChannel(struct NaClApp  *nap);
 
-int NaClSecureReverseClientInsertHandler(
-    struct NaClSecureReverseClient  *self,
-    void                            (*handler)(
-        void                                   *handler_state,
-        struct NaClThreadInterface             *thread_if,
-        struct NaClDesc                        *new_conn),
-    void                            *handler_state) NACL_WUR;
-
 NaClErrorCode NaClWaitForLoadModuleStatus(struct NaClApp *nap) NACL_WUR;
 
 NaClErrorCode NaClWaitForStartModuleCommand(struct NaClApp *nap) NACL_WUR;