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

Unified Diff: remoting/host/simple_host_process.cc

Issue 10378110: Verify that xmpp_login specified in the config matches auth token. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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
« no previous file with comments | « remoting/host/signaling_connector.cc ('k') | remoting/jingle_glue/fake_signal_strategy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 114802bc01162d26c1b7b1e9976b43b3a811e8e4..e13ef7a2ba858ae3f7e9ba5147092853bfbd3a1f 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -35,6 +35,7 @@
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
+#include "remoting/host/constants.h"
#include "remoting/host/desktop_environment.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/heartbeat_sender.h"
@@ -94,7 +95,9 @@ class SimpleHost : public HeartbeatSender::Listener {
: message_loop_(MessageLoop::TYPE_UI),
context_(message_loop_.message_loop_proxy()),
fake_(false),
- is_it2me_(false) {
+ is_it2me_(false),
+ shutting_down_(false),
+ exit_code_(kSuccessExitCode) {
context_.Start();
network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
}
@@ -102,7 +105,7 @@ class SimpleHost : public HeartbeatSender::Listener {
// Overridden from HeartbeatSender::Listener
virtual void OnUnknownHostIdError() OVERRIDE {
LOG(ERROR) << "Host ID not found.";
- Shutdown();
+ Shutdown(kInvalidHostIdExitCode);
}
int Run() {
@@ -153,7 +156,7 @@ class SimpleHost : public HeartbeatSender::Listener {
message_loop_.MessageLoop::Run();
- return 0;
+ return exit_code_;
}
void set_config_path(const FilePath& config_path) {
@@ -214,7 +217,9 @@ class SimpleHost : public HeartbeatSender::Listener {
signal_strategy_.reset(
new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_,
xmpp_auth_token_, xmpp_auth_service_));
- signaling_connector_.reset(new SignalingConnector(signal_strategy_.get()));
+ signaling_connector_.reset(new SignalingConnector(
+ signal_strategy_.get(),
+ base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
if (fake_) {
scoped_ptr<Capturer> capturer(new CapturerFake());
@@ -265,7 +270,32 @@ class SimpleHost : public HeartbeatSender::Listener {
}
}
- void Shutdown() {
+ void OnAuthFailed() {
+ Shutdown(kInvalidOauthCredentialsExitCode);
+ }
+
+ void Shutdown(int exit_code) {
+ DCHECK(context_.network_message_loop()->BelongsToCurrentThread());
+
+ if (shutting_down_)
+ return;
+
+ shutting_down_ = true;
+ exit_code_ = exit_code;
+ host_->Shutdown(base::Bind(
+ &SimpleHost::OnShutdownFinished, base::Unretained(this)));
+ }
+
+ void OnShutdownFinished() {
+ DCHECK(context_.network_message_loop()->BelongsToCurrentThread());
+
+ // Destroy networking objects while we are on the network thread.
+ host_ = NULL;
+ log_to_server_.reset();
+ heartbeat_sender_.reset();
+ signaling_connector_.reset();
+ signal_strategy_.reset();
+
message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
}
@@ -295,6 +325,9 @@ class SimpleHost : public HeartbeatSender::Listener {
scoped_ptr<HeartbeatSender> heartbeat_sender_;
scoped_refptr<ChromotingHost> host_;
+
+ bool shutting_down_;
+ int exit_code_;
};
} // namespace remoting
« no previous file with comments | « remoting/host/signaling_connector.cc ('k') | remoting/jingle_glue/fake_signal_strategy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698