Pass the client end handle of the network-to-daemon IPC channel via handle inheritance.

remoting/host/remoting_me2me_host.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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_native_library.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringize_macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "crypto/nss_util.h"
 #include "google_apis/google_api_keys.h"
 #include "ipc/ipc_channel.h"
@@ skipping 26 matching lines @@
 #include "remoting/host/resizing_host_observer.h"
 #include "remoting/host/session_manager_factory.h"
 #include "remoting/host/signaling_connector.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/video_frame_capturer.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
+#include "base/file_descriptor_posix.h"
 #include "remoting/host/posix/signal_handler.h"
 #endif  // defined(OS_POSIX)
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_LINUX)
 #include "remoting/host/audio_capturer_linux.h"
 #endif  // defined(OS_LINUX)
 
 // N.B. OS_WIN is defined by including src/base headers.
 #if defined(OS_WIN)
 #include <commctrl.h>
+#include "base/win/scoped_handle.h"
 #include "remoting/host/win/session_desktop_environment_factory.h"
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif  // defined(TOOLKIT_GTK)
 
 namespace {
 
 // This is used for tagging system event logs.
 const char kApplicationName[] = "chromoting";
 
-// The command line switch specifying the name of the daemon IPC endpoint.
-const char kDaemonIpcSwitchName[] = "daemon-pipe";
+// The command line switches specifying the daemon IPC endpoint.

[simonmorris, 2012/10/12 16:31:13]

switches -> switch?

[alexeypa (please no reviews), 2012/10/12 18:44:39]

Done.

+const char kDaemonPipeSwitchName[] = "daemon-pipe";
 
 // The command line switch used to get version of the daemon.
 const char kVersionSwitchName[] = "version";
 
 // The command line switch used to pass name of the pipe to capture audio on
 // linux.
 const char kAudioPipeSwitchName[] = "audio-pipe-name";
 
 const char kUnofficialOAuth2ClientId[] =
     "440925447803-2pi3v45bff6tp1rde2f7q6lgbor3o5uj.apps.googleusercontent.com";
@@ skipping 28 matching lines @@
         desktop_resizer_(DesktopResizer::Create()),
         exit_code_(kSuccessExitCode) {
     network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
     curtain_ = CurtainMode::Create(
         base::Bind(&HostProcess::OnDisconnectRequested,
                    base::Unretained(this)),
         base::Bind(&HostProcess::OnDisconnectRequested,
                    base::Unretained(this)));
 }
 
+#if defined(REMOTING_MULTI_PROCESS)
+
+  bool InitWithCommandLine(const CommandLine* cmd_line) {
+    // Parse the handle value and convert it to a handle/file descriptor.
+    std::string channel_name =
+        cmd_line->GetSwitchValueASCII(kDaemonPipeSwitchName);
+
+    int pipe_handle = 0;
+    if (channel_name.empty() ||
+        !base::StringToInt(channel_name, &pipe_handle)) {
+      LOG(ERROR) << "Invalid '" << kDaemonPipeSwitchName
+                 << "' value: " << channel_name;
+      return false;
+    }
+
+#if defined(OS_WIN)
+    base::win::ScopedHandle pipe(reinterpret_cast<HANDLE>(pipe_handle));
+    IPC::ChannelHandle channel_handle(pipe);
+#elif defined(OS_POSIX)
+    base::FileDescriptor pipe(pipe_handle, true);
+    IPC::ChannelHandle channel_handle(channel_name, pipe);
+#endif  // defined(OS_POSIX)
+
+    // Connect to the daemon process.
+    daemon_channel_.reset(new IPC::ChannelProxy(
+        channel_handle,
+        IPC::Channel::MODE_CLIENT,
+        this,
+        context_->network_task_runner()));
+
+    return true;
+  }
+
+#else  // !defined(REMOTING_MULTI_PROCESS)
+
   bool InitWithCommandLine(const CommandLine* cmd_line) {
     // Connect to the daemon process.
     std::string channel_name =
-        cmd_line->GetSwitchValueASCII(kDaemonIpcSwitchName);
-
-#if defined(REMOTING_MULTI_PROCESS)
-    if (channel_name.empty())
-      return false;
-#endif  // defined(REMOTING_MULTI_PROCESS)
-
+        cmd_line->GetSwitchValueASCII(kDaemonPipeSwitchName);
     if (!channel_name.empty()) {
       daemon_channel_.reset(new IPC::ChannelProxy(
           channel_name, IPC::Channel::MODE_CLIENT, this,
           context_->network_task_runner()));
     }
 
-#if !defined(REMOTING_MULTI_PROCESS)
     FilePath default_config_dir = remoting::GetConfigDir();
     host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile);
     if (cmd_line->HasSwitch(kHostConfigSwitchName)) {
       host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName);
     }
-#endif  // !defined(REMOTING_MULTI_PROCESS)
 
     return true;
   }
 
+#endif  // !defined(REMOTING_MULTI_PROCESS)
+
 #if defined(OS_POSIX)
   void SigTermHandler(int signal_number) {
     DCHECK(signal_number == SIGTERM);
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
     LOG(INFO) << "Caught SIGTERM: Shutting down...";
     Shutdown(kSuccessExitCode);
   }
 #endif
 
   virtual void OnConfigUpdated(const std::string& serialized_config) OVERRIDE {
@@ skipping 620 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)