Split secure command channel and untrusted application channel

src/trusted/service_runtime/sel_ldr.h

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  *
  * This loader can only process NaCl object files as produced using
@@ skipping 29 matching lines @@
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 #include "native_client/src/trusted/interval_multiset/nacl_interval_multiset.h"
 #include "native_client/src/trusted/interval_multiset/nacl_interval_range_tree.h"
 
 #include "native_client/src/trusted/service_runtime/dyn_array.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 #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"
 
 #include "native_client/src/trusted/service_runtime/name_service/name_service.h"
 
 #include "native_client/src/trusted/validator/cpufeatures.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
 EXTERN_C_BEGIN
 
 #define NACL_SERVICE_PORT_DESCRIPTOR    3
 #define NACL_SERVICE_ADDRESS_DESCRIPTOR 4
 
 #define NACL_DEFAULT_STACK_MAX  (16 << 20)  /* main thread stack */
 
 #define NACL_SANDBOX_CHROOT_FD  "SBX_D"
 
 struct NaClAppThread;
 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;
 
 struct NaClDebugCallbacks {
   void (*thread_create_hook)(struct NaClAppThread *natp);
   void (*thread_exit_hook)(struct NaClAppThread *natp);
   void (*process_exit_hook)(int exit_status);
 };
 
@@ skipping 154 matching lines @@
    * Name service must launch after mu, cv, vm_hole_may_exit,
    * threads_launching are initialized.
    */
   struct NaClNameService    *name_service;  /* default name server */
   struct NaClDesc           *name_service_conn_cap;
 
   struct NaClSecureService          *secure_service;
   struct NaClManifestProxy          *manifest_proxy;
   struct NaClKernelService          *kernel_service;
 
+  int                               num_secure_channel;
+
   struct NaClResourceNaClApp        resources;
   enum NaClResourcePhase            resource_phase;
 
   struct NaClSecureReverseClient    *reverse_client;
   enum NaClReverseChannelInitializationState {
     NACL_REVERSE_CHANNEL_UNINITIALIZED,
     NACL_REVERSE_CHANNEL_INITIALIZATION_STARTED,
     NACL_REVERSE_CHANNEL_INITIALIZED
   }                                 reverse_channel_initialization_state;
   struct NaClSrpcChannel            reverse_channel;
@@ skipping 335 matching lines @@
 
 void NaClAppDescriptorHookupCheck(struct NaClApp *nap);
 
 void NaClCreateServiceSocket(struct NaClApp *nap);
 
 void NaClSetUpBootstrapChannel(struct NaClApp  *nap,
                                NaClHandle      inherited_desc);
 
 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;
+void NaClSecureChannelCountIncr(struct NaClApp *nap);
+
+void NaClSecureChannelCountDecr(struct NaClApp *nap);
 
 NaClErrorCode NaClWaitForLoadModuleStatus(struct NaClApp *nap) NACL_WUR;
 
 NaClErrorCode NaClWaitForStartModuleCommand(struct NaClApp *nap) NACL_WUR;
 
 /*
  * NaClBlockIfCommandChannelExists is used during error exit.  If
  * there is a secure command channel, we sent an RPC reply with the
  * reason that the nexe was rejected.  If we exit immediately, that
  * reply may still be in-flight and the various channel closure (esp
@@ skipping 166 matching lines @@
   UNREFERENCED_PARAMETER(argc_p);
   UNREFERENCED_PARAMETER(argv_p);
 }
 #endif
 
 int NaClPostTestInjectionMain(int argc, char **argv);
 
 EXTERN_C_END
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ */