Chromoting: stopping the service if the host ID is permanently not recognized by the could.

remoting/host/wts_session_process_launcher_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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/wts_session_process_launcher_win.h"
 
 #include <windows.h>
 #include <sddl.h>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/string16.h"
 #include "base/stringize_macros.h"
 #include "base/stringprintf.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
-
+#include "remoting/host/constants.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/sas_injector.h"
 #include "remoting/host/wts_console_monitor_win.h"
 
 using base::win::ScopedHandle;
 using base::TimeDelta;
 
 namespace {
 
-// The exit code returned by the host process when its configuration is not
-// valid.
-const int kInvalidHostConfigurationExitCode = 1;
+// The range of host exit codes that should be interpreted as a permanent error
+// condition.
+enum {
+  kHostPermanentErrorMin = remoting::kInvalidHostConfigurationExitCode,
+  kHostPermanentErrorMax = remoting::kInvalidOauthCredentialsExitCode
+};

[simonmorris, 2012/04/17 19:52:30]

It would be safer to define these alongside the exit codes, in cross-platform
code.

[alexeypa (please no reviews), 2012/04/17 20:01:05]

Done.

 
 // The minimum and maximum delays between attempts to inject host process into
 // a session.
 const int kMaxLaunchDelaySeconds = 60;
 const int kMinLaunchDelaySeconds = 1;
 
 // Name of the default session desktop.
 char16 kDefaultDesktopName[] = TO_L_STRING("winsta0\\default");
 
 // Match the pipe name prefix used by Chrome IPC channels.
@@ skipping 291 matching lines @@
     return;
   }
 
   DCHECK(!timer_.IsRunning());
   DCHECK(process_.handle() != NULL);
   DCHECK(process_watcher_.GetWatchedObject() == NULL);
   DCHECK(chromoting_channel_.get() != NULL);
 
   // Stop trying to restart the host if its process exited due to
   // misconfiguration.
-  DWORD exit_code;
-  bool stop_trying = GetExitCodeProcess(process_.handle(), &exit_code) &&
-                     exit_code == kInvalidHostConfigurationExitCode;
+  int exit_code;
+  bool stop_trying =
+      base::WaitForExitCodeWithTimeout(process_.handle(), &exit_code, 0) &&
+      kHostPermanentErrorMin <= exit_code &&
+      exit_code <= kHostPermanentErrorMax;
 
   // The host process has been terminated for some reason. The handle can now be
   // closed.
   process_.Close();
   chromoting_channel_.reset();
   state_ = StateStarting;
 
   if (stop_trying) {
     OnSessionDetached();
 
@@ skipping 122 matching lines @@
       process_watcher_.StopWatching();
       process_.Terminate(0);
       process_.Close();
       chromoting_channel_.reset();
       state_ = StateDetached;
       break;
   }
 }
 
 } // namespace remoting