Split secure command channel and untrusted application channel

src/trusted/manifest_name_service_proxy/manifest_proxy.c

 /*
  * 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.
  */
 
 #include <string.h>
 
 #include "native_client/src/trusted/manifest_name_service_proxy/manifest_proxy.h"
 
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/reverse_service/manifest_rpc.h"
 #include "native_client/src/trusted/reverse_service/reverse_control_rpc.h"
 #include "native_client/src/trusted/service_runtime/include/sys/errno.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_name_service.h"
-#include "native_client/src/trusted/service_runtime/sel_ldr.h"
+#include "native_client/src/trusted/service_runtime/nacl_secure_service.h"
 
 static void NaClManifestWaitForChannel_yield_mu(
     struct NaClManifestProxyConnection *self) {
   NaClLog(4, "Entered NaClManifestWaitForChannel_yield_mu\n");
   NaClXMutexLock(&self->mu);
   NaClLog(4, "NaClManifestWaitForChannel_yield_mu: checking channel\n");
   while (!self->channel_initialized) {
     NaClLog(4, "NaClManifestWaitForChannel_yield_mu: waiting\n");
     NaClXCondVarWait(&self->cv, &self->mu);
   }
@@ skipping 313 matching lines @@
   NaClLog(4, "NaClManifestProxyConnectionFactory: locking reverse channel\n");
   NaClLog(4, "NaClManifestProxyConnectionFactory: nap 0x%"NACL_PRIxPTR"\n",
           (uintptr_t) nap);
   NaClXMutexLock(&nap->mu);
   if (NACL_REVERSE_CHANNEL_INITIALIZED !=
       nap->reverse_channel_initialization_state) {
     NaClLog(LOG_FATAL,
             "NaClManifestProxyConnectionFactory invoked w/o reverse channel\n");
   }
   NaClLog(4, "NaClManifestProxyConnectionFactory: inserting handler\n");
-  if (!NaClSecureReverseClientInsertHandler(nap->reverse_client,
-                                            NaClManifestReverseClientCallback,
-                                            (void *) mconn)) {
-    NaClLog(LOG_FATAL,
+  if (!(*NACL_VTBL(NaClSecureReverseClient, nap->reverse_client)->
+        InsertHandler)(nap->reverse_client,
+                       NaClManifestReverseClientCallback,
+                       (void *) mconn)) {
+     NaClLog(LOG_FATAL,
             ("NaClManifestProxyConnectionFactory:"
              " NaClSecureReverseClientInsertHandler failed\n"));
   }
   /*
    * NaClSrpcInvokeBySignature(""); tell plugin to connect and create
    * a reverse channel
    */
   NaClLog(4,
           ("NaClManifestProxyConnectionFactory: making RPC"
            " to set up connection\n"));
@@ skipping 23 matching lines @@
   /*
    * The NaClManifestProxyConnectionFactory creates a subclass of a
    * NaClSimpleServiceConnectionFactory object that uses the reverse
    * connection object nap->reverse_client to obtain a new RPC channel
    * with each manifest connection.
    */
   NaClSimpleServiceAcceptConnection,
   NaClSimpleServiceAcceptAndSpawnHandler,
   NaClSimpleServiceRpcHandler,
 };