[Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the…

remoting/host/daemon_process_win.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 "remoting/host/daemon_process.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 class WtsConsoleMonitor;
 
 class DaemonProcessWin : public DaemonProcess {
  public:
   DaemonProcessWin(
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
       const base::Closure& stopped_callback);
   virtual ~DaemonProcessWin();
 
-  // Sends an IPC message to the worker process. This method can be called only
-  // after successful Start() and until Stop() is called or an error occurred.
+  // WorkerProcessIpcDelegate implementation.
+  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+
+  // DaemonProcess overrides.
   virtual void SendToNetwork(IPC::Message* message) OVERRIDE;
+  virtual bool OnDesktopSessionAgentAttached(
+      int terminal_id,
+      base::ProcessHandle desktop_process,
+      IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
 
  protected:
   // Stoppable implementation.
   virtual void DoStop() OVERRIDE;
 
   // DaemonProcess implementation.
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id) OVERRIDE;
   virtual void LaunchNetworkProcess() OVERRIDE;
 
  private:
   scoped_ptr<WorkerProcessLauncher> network_launcher_;
 
+  // Handle of the network process.
+  ScopedHandle network_process_;
+
   DISALLOW_COPY_AND_ASSIGN(DaemonProcessWin);
 };
 
 DaemonProcessWin::DaemonProcessWin(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback)
     : DaemonProcess(caller_task_runner, io_task_runner, stopped_callback) {
 }
 
 DaemonProcessWin::~DaemonProcessWin() {
   // Make sure that the object is completely stopped. The same check exists
   // in Stoppable::~Stoppable() but this one helps us to fail early and
   // predictably.
   CHECK_EQ(stoppable_state(), Stoppable::kStopped);
 }
 
+void DaemonProcessWin::OnChannelConnected(int32 peer_pid) {
+  // Obtain the handle of the network process.
+  network_process_.Set(OpenProcess(PROCESS_DUP_HANDLE, false, peer_pid));
+  if (!network_process_.IsValid()) {
+    RestartNetworkProcess(FROM_HERE);
+    return;
+  }
+
+  DaemonProcess::OnChannelConnected(peer_pid);
+}
+
 void DaemonProcessWin::SendToNetwork(IPC::Message* message) {
   if (network_launcher_) {
     network_launcher_->Send(message);
   } else {
     delete message;
   }
 }
 
+bool DaemonProcessWin::OnDesktopSessionAgentAttached(

[Sergey Ulanov, 2012/10/24 20:12:01]

Did you mean to implement this method in DaemonProcess class?
If not then you don't need posix specific code in here.

[alexeypa (please no reviews), 2012/10/24 21:41:51]

Done.

+    int terminal_id,
+    base::ProcessHandle desktop_process,
+    IPC::PlatformFileForTransit desktop_pipe) {
+  // Prepare |desktop_process| handle for sending over to the network process.
+  IPC::PlatformFileForTransit desktop_process_for_transit =
+      IPC::GetFileHandleForProcess(desktop_process, network_process_, false);
+  if (desktop_process_for_transit == IPC::InvalidPlatformFileForTransit()) {
+    LOG(ERROR) << "Failed to duplicate the desktop process handle";
+    return false;
+  }
+
+  // Posix: |desktop_pipe| is an auto-close base::FileDescriptor. The IPC
+  //   subsystem will make sure that it is properly closed.
+  // Windows: |desktop_pipe| is a handle in the desktop process. It will be
+  //   duplicated directly from the desktop process by the network process.
+#if defined(OS_POSIX)
+  DCHECK(desktop_pipe.auto_close);
+#endif  // defined(OS_POSIX)
+
+  SendToNetwork(new ChromotingDaemonNetworkMsg_DesktopAttached(
+      terminal_id, desktop_process_for_transit, desktop_pipe));
+  return true;
+}
+
 void DaemonProcessWin::DoStop() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   network_launcher_.reset();
   DaemonProcess::DoStop();
 }
 
 scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
     int terminal_id) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
@@ skipping 26 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback) {
   scoped_ptr<DaemonProcessWin> daemon_process(
       new DaemonProcessWin(caller_task_runner, io_task_runner,
                            stopped_callback));
   daemon_process->Initialize();
   return daemon_process.PassAs<DaemonProcess>();
 }
 
 }  // namespace remoting