Add an IPC channel between the NaCl loader process and the renderer.

chrome/nacl/nacl_listener.cc

 // Copyright (c) 2012 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 "chrome/nacl/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/nacl/nacl_validation_db.h"
 #include "chrome/nacl/nacl_validation_query.h"
+#include "ipc/ipc_channel_handle.h"
+#include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
-#include "ipc/ipc_switches.h"
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 
 #if defined(OS_LINUX)
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 
@@ skipping 105 matching lines @@
 
  private:
   // The listener never dies, otherwise this might be a dangling reference.
   NaClListener* listener_;
 };
 
 
 NaClListener::NaClListener() : shutdown_event_(true, false),
                                io_thread_("NaCl_IOThread"),
                                main_loop_(NULL),
+                               nacl_ppapi_channel_(NULL),
                                debug_enabled_(false) {
   io_thread_.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0));
+  nacl_ipc_manager_.Init(io_thread_.message_loop_proxy());
 #if defined(OS_WIN)
   DCHECK(g_listener == NULL);
   g_listener = this;
 #endif
 }
 
 NaClListener::~NaClListener() {
   NOTREACHED();
   shutdown_event_.Signal();
 #if defined(OS_WIN)
@@ skipping 34 matching lines @@
   return handled;
 }
 
 void NaClListener::OnMsgStart(const nacl::NaClStartParams& params) {
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNaClIPCProxy)) {

[Mark Seaborn, 2012/05/11 22:45:30]

There are two problems with this in the nacl_helper process on Linux:
 * this doesn't link (switches::kEnableNaClIPCProxy isn't defined at link time).
 * this flag does not get passed through to the nacl_helper process, so this
returns false even if I use the string "enable-nacl-ipc-proxy" directly.

[bbudge, 2012/05/15 15:44:01]

Changed to use a bool sent from the browser.

+    // Create the server side of the channel and notify the process host so it
+    // can reply to the renderer, which will then try to connect as client.
+    IPC::ChannelHandle channel_handle =
+        IPC::Channel::GenerateVerifiedChannelID("nacl");
+    nacl_ppapi_channel_ = nacl_ipc_manager_.CreateChannel(channel_handle);
+
+    Send(new NaClProcessHostMsg_PpapiChannelCreated(channel_handle));
+  }
+
   std::vector<nacl::FileDescriptor> handles = params.handles;
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->create_memory_object_func = CreateMemoryObject;
 # if defined(OS_MACOSX)
   CHECK(handles.size() >= 1);
   g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
   handles.pop_back();
 # endif
 #endif
@@ skipping 25 matching lines @@
   args->imc_bootstrap_handle = nacl::ToNativeHandle(handles[0]);
   args->enable_exception_handling = params.enable_exception_handling;
   args->enable_debug_stub = debug_enabled_;
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
   args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
 #endif
   NaClChromeMainStart(args);
   NOTREACHED();
 }