Expose NaClAppSetDesc() to Chromium for use at startup

src/public/chrome_main.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.
  */
 
 #ifndef NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_
 #define NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_ 1
 
 #include "native_client/src/include/nacl_base.h"
 #include "native_client/src/include/portability.h"
 /*
  * nacl_imc_c.h is used to define NaClHandle.  This should eventually
  * go away when Chromium's use of SRPC is removed
  * (http://crbug.com/239656).
  */
 #include "native_client/src/shared/imc/nacl_imc_c.h"
 
 EXTERN_C_BEGIN
 
+struct NaClApp;
 struct NaClValidationCache;
 
 
 /*
- * Descriptor number for initial_ipc_desc.  This is chosen so as not
- * to conflict with NACL_SERVICE_PORT_DESCRIPTOR,
- * NACL_SERVICE_ADDRESS_DESCRIPTOR and export_addr_to inside
- * NaClChromeMainStart().
+ * The old, deprecated interface usage is as follows:
+ *
+ *   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
+ *   // Now NaCl is partially initialized, so the following is allowed:
+ *   args->initial_ipc_fd = NaClDescMakeCustomDesc(...);
+ *   // Fill out more of args...
+ *   NaClChromeMainStart(args);
+ *
+ * The new, preferred interface usage is as follows:
+ *
+ *   #if OS_POSIX
+ *   NaClChromeMainSetUrandomFd(urandom_fd);
+ *   #endif
+ *   NaClChromeMainInit();
+ *   // The following may be done in any order:
+ *   struct NaClApp *nap = NaClAppCreate();
+ *   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
+ *   // Fill out args...
+ *   NaClAppSetDesc(nap, NACL_CHROME_DESC_BASE, NaClDescMakeCustomDesc(...));
+ *   NaClChromeMainStartApp(nap, args);
  */
-#define NACL_CHROME_INITIAL_IPC_DESC 6
+
+/*
+ * Embedders of NaCl may use descriptor numbers of
+ * NACL_CHROME_DESC_BASE and higher when setting up a NaClApp's
+ * initial descriptors using NaClAppSetDesc().
+ *
+ * This number is chosen so as not to conflict with
+ * NACL_SERVICE_PORT_DESCRIPTOR, NACL_SERVICE_ADDRESS_DESCRIPTOR and
+ * export_addr_to inside NaClChromeMainStart().
+ */
+#define NACL_CHROME_DESC_BASE 6
+
+/*
+ * Descriptor number for initial_ipc_desc.
+ *
+ * Deprecated: use NaClAppSetDesc() and NACL_CHROME_DESC_BASE instead.
+ */
+#define NACL_CHROME_INITIAL_IPC_DESC NACL_CHROME_DESC_BASE
 
 
 struct NaClChromeMainArgs {
   /*
    * Handle for bootstrapping a NaCl IMC connection to the trusted
    * PPAPI plugin.  Required.
    */
   NaClHandle imc_bootstrap_handle;
 
   /*
    * File descriptor for the NaCl integrated runtime (IRT) library.
    * Note that this is a file descriptor even on Windows (where file
    * descriptors are emulated by the C runtime library).
    * Optional; may be -1.  Optional when loading nexes that don't follow
    * NaCl's stable ABI, such as the PNaCl translator.
    */
   int irt_fd;
 
   /*
    * Descriptor to provide to untrusted code as descriptor number
    * NACL_CHROME_INITIAL_IPC_DESC.  For use by the Chrome-IPC-based
    * PPAPI proxy.  Optional; may be NULL.
+   *
+   * Deprecated: use NaClAppSetDesc() instead.
    */
   struct NaClDesc *initial_ipc_desc;
 
   /* Whether to enable untrusted hardware exception handling.  Boolean. */
   int enable_exception_handling;
 
   /* Whether to enable NaCl's built-in GDB RSP debug stub.  Boolean. */
   int enable_debug_stub;
 
   /* Whether to enable NaCl's dynamic code system calls.  Boolean. */
@@ skipping 46 matching lines @@
   int (*attach_debug_exception_handler_func)(const void *info,
                                              size_t info_size);
 #endif
 
 #if NACL_LINUX || NACL_OSX
   /*
    * File descriptor for /dev/urandom for reading random data.  This
    * takes ownership of the file descriptor.  In principle this is
    * optional and may be -1, although startup may fail if this is not
    * provided.
+   *
+   * Deprecated: use NaClChromeMainSetUrandomFd() instead.
    */
   int urandom_fd;
 
   /*
    * The result of sysconf(_SC_NPROCESSORS_ONLN).  The Chrome
    * outer-sandbox prevents the glibc implementation of sysconf from
    * working -- which just reads /proc/cpuinfo or similar file -- so
    * instead, the launcher should fill this in.  In principle this is
    * optional and may be -1, but this will make
    * sysconf(_SC_NPROCESSORS_ONLN) fail and result in some NaCl
@@ skipping 18 matching lines @@
   /*
    * Size of address space reserved at address zero onwards for the
    * sandbox.  This is optional and may be 0 if no address space has
    * been reserved, though some sandboxes (such as ARM) might fail in
    * that case.
    */
   size_t prereserved_sandbox_size;
 #endif
 };
 
+#if NACL_LINUX || NACL_OSX
+/*
+ * Sets a file descriptor for /dev/urandom for reading random data.
+ * This takes ownership of the file descriptor.  This is intended for
+ * use inside an outer sandbox where NaCl may not be able to open()
+ * /dev/urandom.
+ *
+ * If this is called, it must be called before NaClChromeMainInit(),
+ * otherwise NaClChromeMainInit() will try to open() /dev/urandom.
+ */
+void NaClChromeMainSetUrandomFd(int urandom_fd);
+#endif
+
+/* Initialize NaCl.  This must be called before NaClAppCreate(). */
+void NaClChromeMainInit(void);
+
 /* Create a new args struct containing default values. */
 struct NaClChromeMainArgs *NaClChromeMainArgsCreate(void);
 
-/* Launch NaCl. */
+/*
+ * Launch NaCl.  This does not return.
+ *
+ * Deprecated: use NaClAppCreate() and NaClChromeMainStartApp() instead.
+ */
 void NaClChromeMainStart(struct NaClChromeMainArgs *args);
 
+/* Launch NaCl.  This does not return. */
+void NaClChromeMainStartApp(struct NaClApp *nap,
+                            struct NaClChromeMainArgs *args);
+
 
 EXTERN_C_END
 
 #endif