[Chromoting] Add platform data to heartbeats.

remoting/host/heartbeat_sender.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/heartbeat_sender.h"
 
 #include <math.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/constants.h"
+#include "remoting/host/server_log_entry.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
@@ skipping 195 matching lines @@
         (1 + base::RandDouble()) * kResendDelayMs;
     if (delay <= interval_ms_) {
       timer_resend_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(delay),
                           this, &HeartbeatSender::ResendStanza);
     }
   }
   sequence_id_was_set_ = true;
 }
 
 scoped_ptr<XmlElement> HeartbeatSender::CreateHeartbeatMessage() {
   scoped_ptr<XmlElement> query(new XmlElement(

[Wez, 2012/05/18 01:27:14]

Can you add a comment here to the effect of "Create heartbeat stanza"

[simonmorris, 2012/05/18 17:06:57]

Done.

       QName(kChromotingXmlNamespace, kHeartbeatQueryTag)));
   query->AddAttr(QName(kChromotingXmlNamespace, kHostIdAttr), host_id_);
   query->AddAttr(QName(kChromotingXmlNamespace, kSequenceIdAttr),
                  base::IntToString(sequence_id_));
   query->AddElement(CreateSignature().release());
+  scoped_ptr<XmlElement> log(ServerLogEntry::MakeLogStanza());

[Wez, 2012/05/18 01:27:14]

And one here to the effect of "Create heartbeat log stanza", and to note that
the log stanza's not signed?

[simonmorris, 2012/05/18 17:06:57]

Done.

+  scoped_ptr<ServerLogEntry> log_entry(ServerLogEntry::MakeHeartbeat());

[Wez, 2012/05/18 01:27:14]

ServerLogEntry::MakeHeartbeat() looks strange here; the 

[simonmorris, 2012/05/18 17:06:57]

Done.

+  log_entry->AddHostFields();
+  log->AddElement(log_entry->ToStanza().release());
+  query->AddElement(log.release());
   return query.Pass();
 }
 
 scoped_ptr<XmlElement> HeartbeatSender::CreateSignature() {
   scoped_ptr<XmlElement> signature_tag(new XmlElement(
       QName(kChromotingXmlNamespace, kHeartbeatSignatureTag)));
 
   std::string message = signal_strategy_->GetLocalJid() + ' ' +
       base::IntToString(sequence_id_);
   std::string signature(key_pair_->GetSignature(message));
   signature_tag->AddText(signature);
 
   return signature_tag.Pass();
 }
 
 }  // namespace remoting