1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
// 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 "chromeos/network/network_handler_callbacks.h"
#include "base/logging.h"
#include "base/values.h"
#include "chromeos/network/network_event_log.h"
namespace chromeos {
namespace network_handler {
// None of these messages are user-facing, they should only appear in logs.
const char kDBusFailedError[] = "Error.DBusFailed";
const char kDBusFailedErrorMessage[] = "DBus call failed.";
// These are names of fields in the error data dictionary for ErrorCallback.
const char kErrorName[] = "errorName";
const char kErrorDetail[] = "errorDetail";
const char kDbusErrorName[] = "dbusErrorName";
const char kDbusErrorMessage[] = "dbusErrorMessage";
const char kPath[] = "path";
base::DictionaryValue* CreateErrorData(const std::string& service_path,
const std::string& error_name,
const std::string& error_detail) {
return CreateDBusErrorData(service_path, error_name, error_detail, "", "");
}
base::DictionaryValue* CreateDBusErrorData(
const std::string& path,
const std::string& error_name,
const std::string& error_detail,
const std::string& dbus_error_name,
const std::string& dbus_error_message) {
base::DictionaryValue* error_data(new base::DictionaryValue);
error_data->SetString(kErrorName, error_name);
error_data->SetString(kErrorDetail, error_detail);
error_data->SetString(kDbusErrorName, dbus_error_name);
error_data->SetString(kDbusErrorMessage, dbus_error_message);
if (!path.empty())
error_data->SetString(kPath, path);
return error_data;
}
void ShillErrorCallbackFunction(const std::string& error_name,
const std::string& path,
const ErrorCallback& error_callback,
const std::string& dbus_error_name,
const std::string& dbus_error_message) {
std::string detail;
if (!path.empty())
detail += path + ": ";
detail += dbus_error_name;
if (!dbus_error_message.empty())
detail += ": " + dbus_error_message;
NET_LOG_ERROR(error_name, detail);
if (error_callback.is_null())
return;
scoped_ptr<base::DictionaryValue> error_data(
CreateDBusErrorData(path, error_name, detail,
dbus_error_name, dbus_error_message));
error_callback.Run(error_name, error_data.Pass());
}
void GetPropertiesCallback(
const network_handler::DictionaryResultCallback& callback,
const network_handler::ErrorCallback& error_callback,
const std::string& path,
DBusMethodCallStatus call_status,
const base::DictionaryValue& value) {
if (call_status != DBUS_METHOD_CALL_SUCCESS) {
scoped_ptr<base::DictionaryValue> error_data(
network_handler::CreateErrorData(path,
kDBusFailedError,
kDBusFailedErrorMessage));
// Because network services are added and removed frequently, we will see
// these failures regularly, so log as events not errors.
NET_LOG_EVENT(base::StringPrintf("GetProperties failed: %d", call_status),
path);
if (!error_callback.is_null())
error_callback.Run(kDBusFailedError, error_data.Pass());
} else if (!callback.is_null()) {
callback.Run(path, value);
}
}
} // namespace network_handler
} // namespace chromeos
|
