Connectivity Diagnostics API: chrome.diagnostics.sendPacket

chromeos/dbus/icmp_packet_sender.cc

+// Copyright (c) 2013 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 "icmp_packet_sender.h"
+
+#include "base/bind.h"
+#include "base/chromeos/chromeos_version.h"
+#include "base/json/json_reader.h"
+#include "base/memory/singleton.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
+
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/debug_daemon_client.h"
+#include "chromeos/dbus/permission_broker_client.h"
+
+using base::Value;
+
+namespace chromeos {
+
+ICMPPacketSender::ICMPPacketSender() {}
+
+ICMPPacketSender::~ICMPPacketSender() {}
+
+ICMPPacketSender* ICMPPacketSender::GetInstance() {
+  return Singleton<ICMPPacketSender>::get();

[stevenjb, 2013/06/17 17:24:24]

Avoid using Singleton<> in classes with an explicit dependency like
DBusThreadmanager. This can probably be owned by DBusThreadManager, or maybe
another appropriate class.

[Bei Zhang, 2013/06/18 18:00:41]

Done. Moved to the same directory containing the api implementation.

+}
+
+void ICMPPacketSender::Send(const std::string& ip,
+                            int* ttl, int* timeout, int* size,

[stevenjb, 2013/06/17 17:24:24]

one param per line

[Bei Zhang, 2013/06/18 18:00:41]

Done.

+                            const SendCallback& callback) {
+  chromeos::DebugDaemonClient* debugd_client =
+      chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
+  std::map<std::string, std::string> config;
+  config["count"] = "1";
+  if (ttl)
+    config["ttl"] = base::IntToString(*ttl);
+  if (timeout)
+    config["timeout"] = base::IntToString(*timeout);
+  if (size)
+    config["size"] = base::IntToString(*size);
+  debugd_client->TestICMPWithOptions(ip, config,
+                                     base::Bind(&ICMPPacketSender::OnSend,
+                                                base::Unretained(this),

[stevenjb, 2013/06/17 17:24:24]

Avoid Untretained with DBus calls. It looks like OnSend can be a non-member
function defined in an anonymous namespace which avoids the issue entirely.
Otherwise a WeakPtrFactory should be used.

[Bei Zhang, 2013/06/18 18:00:41]

Done.

+                                                callback));
+}
+
+void ICMPPacketSender::OnSend(const SendCallback& callback,
+                              bool succeeded, const std::string& status) {

[stevenjb, 2013/06/17 17:24:24]

One param per line.

[Bei Zhang, 2013/06/18 18:00:41]

Done.

+  if (succeeded) {

[stevenjb, 2013/06/17 17:24:24]

Early exit: 
if (!succeeded) {
  callback.Run(false, "", 0);
  return;
}

[Bei Zhang, 2013/06/18 18:00:41]

Done. Changed the signature of the callback to have an error message.

+    // Parses the result and returns IP and latency.
+    scoped_ptr<Value> parsed_value(base::JSONReader::Read(status));
+    base::DictionaryValue* result;
+    if (parsed_value.get() && parsed_value->GetAsDictionary(&result)) {
+      base::DictionaryValue::Iterator iterator(*result);
+      // Returns the first item.
+      if (!iterator.IsAtEnd()) {
+        std::string ip = iterator.key();
+        const base::DictionaryValue* info;
+        if (iterator.value().GetAsDictionary(&info)) {
+          double latency;
+          if (info->GetDouble("avg", &latency)) {
+            callback.Run(true, ip, latency);
+            return;
+          }
+        }
+      }
+    }
+  }
+
+  callback.Run(false, "", 0);
+}
+
+}  // namespace chromeos