Added HostKeyPair class, signatures for heartbeat messages.

remoting/host/chromoting_host.cc

 // Copyright (c) 2010 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/chromoting_host.h"
 
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
@@ skipping 121 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////
 // JingleClient::Callback implementations
 void ChromotingHost::OnStateChange(JingleClient* jingle_client,
                                    JingleClient::State state) {
   if (state == JingleClient::CONNECTED) {
     DCHECK_EQ(jingle_client_.get(), jingle_client);
     LOG(INFO) << "Host connected as "
               << jingle_client->GetFullJid() << "." << std::endl;
 
-    // Start heartbeating after we connected
-    heartbeat_sender_ = new HeartbeatSender();
-    heartbeat_sender_->Start(config_, jingle_client_.get());
+    // Start heartbeating after we've connected.
+    heartbeat_sender_->Start();
   } else if (state == JingleClient::CLOSED) {
     LOG(INFO) << "Host disconnected from talk network." << std::endl;
-    heartbeat_sender_ = NULL;
+
+    // Stop heartbeating.
+    heartbeat_sender_->Stop();
 
     // TODO(sergeyu): We should try reconnecting here instead of terminating
     // the host.
     // Post a shutdown task to properly shutdown the chromoting host.
     context_->main_message_loop()->PostTask(
         FROM_HERE, NewRunnableMethod(this, &ChromotingHost::DoShutdown));
   }
 }
 
 bool ChromotingHost::OnAcceptConnection(
@@ skipping 54 matching lines @@
   if (!config_->GetString(kXmppLoginConfigPath, &xmpp_login) ||
       !config_->GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token)) {
     LOG(ERROR) << "XMMP credentials are not defined in config.";
     return;
   }
 
   // Connect to the talk network with a JingleClient.
   jingle_client_ = new JingleClient(context_->jingle_thread());
   jingle_client_->Init(xmpp_login, xmpp_auth_token,
                        kChromotingTokenServiceName, this);
+
+  heartbeat_sender_ = new HeartbeatSender();
+  if (!heartbeat_sender_->Init(config_, jingle_client_.get())) {
+    LOG(ERROR) << "Failed to initialize HeartbeatSender.";
+    return;
+  }
 }
 
 void ChromotingHost::DoShutdown() {
   DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
 
   // No-op if this object is not started yet.
   {
     AutoLock auto_lock(lock_);
     if (state_ != kStarted)
       return;
@@ skipping 16 matching lines @@
     jingle_client_->Close();
   }
 
   // Lastly call the shutdown task.
   if (shutdown_task_.get()) {
     shutdown_task_->Run();
   }
 }
 
 }  // namespace remoting