Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: remoting/host/daemon_process.cc

Issue 11234034: Crash the network process when a fatal daemon-to-network protocol error encountered. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/daemon_process.cc
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index 2e693342d880b6be2253664fa7d24ff8ae9bb31e..727216cee399f81ec56cb8979618a828c4c0097e 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -78,7 +78,7 @@ void DaemonProcess::CloseDesktopSession(int terminal_id) {
// a protocol error and the network process will be restarted.
if (!IsTerminalIdKnown(terminal_id)) {
LOG(ERROR) << "An invalid terminal ID. terminal_id=" << terminal_id;
- RestartNetworkProcess();
+ RestartNetworkProcess(FROM_HERE);
DeleteAllDesktopSessions();
return;
}
@@ -148,7 +148,7 @@ void DaemonProcess::CreateDesktopSession(int terminal_id) {
// a protocol error and the network process will be restarted.
if (IsTerminalIdKnown(terminal_id)) {
LOG(ERROR) << "An invalid terminal ID. terminal_id=" << terminal_id;
- RestartNetworkProcess();
+ RestartNetworkProcess(FROM_HERE);
DeleteAllDesktopSessions();
return;
}
@@ -159,6 +159,12 @@ void DaemonProcess::CreateDesktopSession(int terminal_id) {
next_terminal_id_ = std::max(next_terminal_id_, terminal_id + 1);
}
+void DaemonProcess::RestartNetworkProcess(
Wez 2012/10/23 20:01:12 nit: CrashAndRestartNetworkProcess
alexeypa (please no reviews) 2012/10/23 20:13:27 It is CrashNetworkProcess() then. Because someone
+ const tracked_objects::Location& location) {
+ SendToNetwork(new ChromotingDaemonNetworkMsg_Crash(
+ location.function_name(), location.file_name(), location.line_number()));
+}
+
void DaemonProcess::DoStop() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());

Powered by Google App Engine
This is Rietveld 408576698