Connect PPAPI IPC channels for non-SFI mode.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 The Chromium 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 "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #if defined(OS_POSIX)
@@ skipping 17 matching lines @@
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/trusted/validator/nacl_file_info.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
 #include "content/public/common/child_process_sandbox_support_linux.h"
+#include "ppapi/proxy/plugin_main_irt.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 
 #include "content/public/common/sandbox_init.h"
 #endif
 
 namespace {
@@ skipping 224 matching lines @@
     return;
   }
 
   struct NaClApp *nap = NaClAppCreate();
   if (nap == NULL) {
     LOG(ERROR) << "NaClAppCreate() failed";
     return;
   }
 
   if (params.enable_ipc_proxy) {
-    // Create the PPAPI IPC channels between the NaCl IRT and the hosts
-    // (browser/renderer) processes. The IRT uses these channels to communicate
-    // with the host and to initialize the IPC dispatchers.
     IPC::ChannelHandle browser_handle =
         IPC::Channel::GenerateVerifiedChannelID("nacl");
-    SetUpIPCAdapter(&browser_handle, io_thread_.message_loop_proxy(),
-                    nap, NACL_CHROME_DESC_BASE);
-
     IPC::ChannelHandle renderer_handle =
         IPC::Channel::GenerateVerifiedChannelID("nacl");
-    SetUpIPCAdapter(&renderer_handle, io_thread_.message_loop_proxy(),
-                    nap, NACL_CHROME_DESC_BASE + 1);
 
+#if defined(OS_LINUX)
+    if (params.enable_nonsfi_mode) {
+      // In non-SFI mode, we neither intercept nor rewrite the message by

[Mark Seaborn, 2014/02/19 17:00:30]

"by" -> "using"

[jln (very slow on Chromium), 2014/02/19 22:40:09]

This is key to what's happening in this CL. Could you make sure it's also
exposed in the commit message?

[hidehiko, 2014/02/20 18:50:01]

Done.

[hidehiko, 2014/02/20 18:50:01]

Updated the commit message.

+      // IPCAdapter, and the channels are connected between the plugin and

[Mark Seaborn, 2014/02/19 17:00:30]

"IPCAdapter" -> "NaClIPCAdapter" for clarity

[hidehiko, 2014/02/20 18:50:01]

Done.

+      // the hosts directly. So, the IPC::Channel instances will be created in
+      // the plugin side, because the IPC::Listener needs to live on the
+      // plugin's main thread. However, on initialization (i.e. before loading
+      // the plugin binary), the FD needs to be passed to the hosts. So, here
+      // we create raw FD pairs, and pass the clients side FDs to the hosts,

[Mark Seaborn, 2014/02/19 17:00:30]

"client side"

[hidehiko, 2014/02/20 18:50:01]

Done.

+      // and the server side FDs to the plugin.
+      int browser_server_ppapi_fd;
+      int browser_client_ppapi_fd;
+      int renderer_server_ppapi_fd;
+      int renderer_client_ppapi_fd;
+      if (!IPC::SocketPair(
+              &browser_server_ppapi_fd, &browser_client_ppapi_fd) ||
+          !IPC::SocketPair(
+              &renderer_server_ppapi_fd, &renderer_client_ppapi_fd)) {
+        LOG(ERROR) << "Failed to create sockets for IPC.";
+        return;
+      }
+
+      // Set the plugin IPC channel FD.

[Mark Seaborn, 2014/02/19 17:00:30]

"FDs"

[hidehiko, 2014/02/20 18:50:01]

Done.

+      SetIPCFileDescriptors(
+          browser_server_ppapi_fd, renderer_server_ppapi_fd);
+
+      // Send back to the client side IPC channel FD to the host.
+      browser_handle.socket =
+          base::FileDescriptor(browser_client_ppapi_fd, true);
+      renderer_handle.socket =
+          base::FileDescriptor(renderer_client_ppapi_fd, true);
+    } else {
+#endif
+      // Create the PPAPI IPC channels between the NaCl IRT and the hosts

[Mark Seaborn, 2014/02/19 17:00:30]

"host" (since this is adjectival)

[hidehiko, 2014/02/20 18:50:01]

Done.

+      // (browser/renderer) processes. The IRT uses these channels to
+      // communicate with the host and to initialize the IPC dispatchers.
+      SetUpIPCAdapter(&browser_handle, io_thread_.message_loop_proxy(),
+                      nap, NACL_CHROME_DESC_BASE);
+      SetUpIPCAdapter(&renderer_handle, io_thread_.message_loop_proxy(),
+                      nap, NACL_CHROME_DESC_BASE + 1);
+

[Mark Seaborn, 2014/02/19 17:00:30]

Nit: remove empty line to match start of block

[hidehiko, 2014/02/20 18:50:01]

Done.

+#if defined(OS_LINUX)
+    }
+#endif
     if (!Send(new NaClProcessHostMsg_PpapiChannelsCreated(
             browser_handle, renderer_handle)))
       LOG(ERROR) << "Failed to send IPC channel handle to NaClProcessHost.";
   }
 
   std::vector<nacl::FileDescriptor> handles = params.handles;
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->number_of_cores = number_of_cores_;
   args->create_memory_object_func = CreateMemoryObject;
@@ skipping 63 matching lines @@
 #if defined(OS_LINUX)
   if (params.enable_nonsfi_mode) {
     nacl::nonsfi::MainStart(args->imc_bootstrap_handle);
     NOTREACHED();
     return;
   }
 #endif
   NaClChromeMainStartApp(nap, args);
   NOTREACHED();
 }