Darin Petkov | 63138a9 | 2012-02-06 14:09:15 +0100 | [diff] [blame] | 1 | // Copyright (c) 2012 The Chromium OS Authors. All rights reserved. |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 2 | // Use of this source code is governed by a BSD-style license that can be |
| 3 | // found in the LICENSE file. |
| 4 | |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 5 | #include <map> |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 6 | #include <string> |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 7 | #include <vector> |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 8 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 9 | #include <base/bind.h> |
| 10 | #include <base/callback.h> |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 11 | #include <dbus-c++/dbus.h> |
| 12 | |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 13 | #include "shill/accessor_interface.h" |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 14 | #include "shill/dbus_adaptor.h" |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 15 | #include "shill/error.h" |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 16 | #include "shill/key_value_store.h" |
Christopher Wiley | b691efd | 2012-08-09 13:51:51 -0700 | [diff] [blame] | 17 | #include "shill/logging.h" |
Chris Masone | b925cc8 | 2011-06-22 15:39:57 -0700 | [diff] [blame] | 18 | #include "shill/property_store.h" |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 19 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 20 | using base::Bind; |
| 21 | using base::Owned; |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 22 | using std::map; |
| 23 | using std::string; |
| 24 | using std::vector; |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 25 | |
| 26 | namespace shill { |
| 27 | |
mukesh agrawal | cbfb34e | 2013-04-17 19:33:25 -0700 | [diff] [blame] | 28 | // public static |
| 29 | const char DBusAdaptor::kNullPath[] = "/"; |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 30 | |
| 31 | DBusAdaptor::DBusAdaptor(DBus::Connection* conn, const string &object_path) |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 32 | : DBus::ObjectAdaptor(*conn, object_path) { |
Ben Chan | fad4a0b | 2012-04-18 15:49:59 -0700 | [diff] [blame] | 33 | SLOG(DBus, 2) << "DBusAdaptor: " << object_path; |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 34 | } |
| 35 | |
| 36 | DBusAdaptor::~DBusAdaptor() {} |
| 37 | |
| 38 | // static |
mukesh agrawal | 6bb9e7c | 2012-01-30 14:57:54 -0800 | [diff] [blame] | 39 | bool DBusAdaptor::SetProperty(PropertyStore *store, |
| 40 | const string &name, |
| 41 | const ::DBus::Variant &value, |
| 42 | ::DBus::Error *error) { |
mukesh agrawal | ffa3d04 | 2011-10-06 15:26:10 -0700 | [diff] [blame] | 43 | Error e; |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 44 | bool ret; |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 45 | |
| 46 | if (DBusAdaptor::IsBool(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 47 | ret = store->SetBoolProperty(name, value.reader().get_bool(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 48 | else if (DBusAdaptor::IsByte(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 49 | ret = store->SetUint8Property(name, value.reader().get_byte(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 50 | else if (DBusAdaptor::IsInt16(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 51 | ret = store->SetInt16Property(name, value.reader().get_int16(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 52 | else if (DBusAdaptor::IsInt32(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 53 | ret = store->SetInt32Property(name, value.reader().get_int32(), &e); |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 54 | else if (DBusAdaptor::IsPath(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 55 | ret = store->SetStringProperty(name, value.reader().get_path(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 56 | else if (DBusAdaptor::IsString(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 57 | ret = store->SetStringProperty(name, value.reader().get_string(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 58 | else if (DBusAdaptor::IsStringmap(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 59 | ret = store->SetStringmapProperty(name, |
| 60 | value.operator map<string, string>(), |
| 61 | &e); |
mukesh agrawal | ffa3d04 | 2011-10-06 15:26:10 -0700 | [diff] [blame] | 62 | else if (DBusAdaptor::IsStringmaps(value.signature())) { |
Ben Chan | fad4a0b | 2012-04-18 15:49:59 -0700 | [diff] [blame] | 63 | SLOG(DBus, 1) << " can't yet handle setting type " << value.signature(); |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 64 | ret = false; |
mukesh agrawal | ffa3d04 | 2011-10-06 15:26:10 -0700 | [diff] [blame] | 65 | e.Populate(Error::kInternalError); |
| 66 | } else if (DBusAdaptor::IsStrings(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 67 | ret = store->SetStringsProperty(name, value.operator vector<string>(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 68 | else if (DBusAdaptor::IsUint16(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 69 | ret = store->SetUint16Property(name, value.reader().get_uint16(), &e); |
mukesh agrawal | e7c7e65 | 2013-06-18 17:19:39 -0700 | [diff] [blame] | 70 | else if (DBusAdaptor::IsUint16s(value.signature())) |
| 71 | ret = store->SetUint16sProperty(name, value.operator vector<uint16>(), &e); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 72 | else if (DBusAdaptor::IsUint32(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 73 | ret = store->SetUint32Property(name, value.reader().get_uint32(), &e); |
Paul Stewart | e18c33b | 2012-07-10 20:48:44 -0700 | [diff] [blame] | 74 | else if (DBusAdaptor::IsUint64(value.signature())) |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 75 | ret = store->SetUint64Property(name, value.reader().get_uint64(), &e); |
Eric Shienbrood | b23d4b9 | 2012-02-16 12:32:42 -0500 | [diff] [blame] | 76 | else if (DBusAdaptor::IsKeyValueStore(value.signature())) { |
Ben Chan | fad4a0b | 2012-04-18 15:49:59 -0700 | [diff] [blame] | 77 | SLOG(DBus, 1) << " can't yet handle setting type " << value.signature(); |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 78 | ret = false; |
Eric Shienbrood | b23d4b9 | 2012-02-16 12:32:42 -0500 | [diff] [blame] | 79 | e.Populate(Error::kInternalError); |
| 80 | } else { |
Chris Masone | 27c4aa5 | 2011-07-02 13:10:14 -0700 | [diff] [blame] | 81 | NOTREACHED() << " unknown type: " << value.signature(); |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 82 | ret = false; |
mukesh agrawal | ffa3d04 | 2011-10-06 15:26:10 -0700 | [diff] [blame] | 83 | e.Populate(Error::kInternalError); |
Chris Masone | 27c4aa5 | 2011-07-02 13:10:14 -0700 | [diff] [blame] | 84 | } |
mukesh agrawal | ffa3d04 | 2011-10-06 15:26:10 -0700 | [diff] [blame] | 85 | |
| 86 | if (error != NULL) { |
| 87 | e.ToDBusError(error); |
| 88 | } |
| 89 | |
mukesh agrawal | bebf1b8 | 2013-04-23 15:06:33 -0700 | [diff] [blame] | 90 | return ret; |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 91 | } |
| 92 | |
| 93 | // static |
mukesh agrawal | de29fa8 | 2011-09-16 16:16:36 -0700 | [diff] [blame] | 94 | bool DBusAdaptor::GetProperties(const PropertyStore &store, |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 95 | map<string, ::DBus::Variant> *out, |
mukesh agrawal | 1830fa1 | 2011-09-26 14:31:40 -0700 | [diff] [blame] | 96 | ::DBus::Error */*error*/) { |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 97 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 98 | ReadablePropertyConstIterator<bool> it = store.GetBoolPropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 99 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 100 | (*out)[it.Key()] = BoolToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 101 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 102 | } |
| 103 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 104 | ReadablePropertyConstIterator<int16> it = store.GetInt16PropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 105 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 106 | (*out)[it.Key()] = Int16ToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 107 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 108 | } |
| 109 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 110 | ReadablePropertyConstIterator<int32> it = store.GetInt32PropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 111 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 112 | (*out)[it.Key()] = Int32ToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 113 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 114 | } |
| 115 | { |
Darin Petkov | 63138a9 | 2012-02-06 14:09:15 +0100 | [diff] [blame] | 116 | ReadablePropertyConstIterator<KeyValueStore> it = |
| 117 | store.GetKeyValueStorePropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 118 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 119 | (*out)[it.Key()] = KeyValueStoreToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 120 | } |
Darin Petkov | 63138a9 | 2012-02-06 14:09:15 +0100 | [diff] [blame] | 121 | } |
| 122 | { |
mukesh agrawal | 2366eed | 2012-03-20 18:21:50 -0700 | [diff] [blame] | 123 | ReadablePropertyConstIterator<RpcIdentifiers> it = |
| 124 | store.GetRpcIdentifiersPropertiesIter(); |
| 125 | for ( ; !it.AtEnd(); it.Advance()) { |
mukesh agrawal | 2366eed | 2012-03-20 18:21:50 -0700 | [diff] [blame] | 126 | vector < ::DBus::Path> rpc_identifiers_as_paths; |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 127 | for (const auto &path : it.value()) { |
| 128 | rpc_identifiers_as_paths.push_back(path); |
mukesh agrawal | 2366eed | 2012-03-20 18:21:50 -0700 | [diff] [blame] | 129 | } |
| 130 | (*out)[it.Key()] = PathsToVariant(rpc_identifiers_as_paths); |
| 131 | } |
| 132 | } |
| 133 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 134 | ReadablePropertyConstIterator<string> it = store.GetStringPropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 135 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 136 | (*out)[it.Key()] = StringToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 137 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 138 | } |
| 139 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 140 | ReadablePropertyConstIterator<Stringmap> it = |
| 141 | store.GetStringmapPropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 142 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 143 | (*out)[it.Key()]= StringmapToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 144 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 145 | } |
| 146 | { |
Eric Shienbrood | 30bc0ec | 2012-03-21 18:19:46 -0400 | [diff] [blame] | 147 | ReadablePropertyConstIterator<Stringmaps> it = |
| 148 | store.GetStringmapsPropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 149 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 150 | (*out)[it.Key()]= StringmapsToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 151 | } |
Eric Shienbrood | 30bc0ec | 2012-03-21 18:19:46 -0400 | [diff] [blame] | 152 | } |
| 153 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 154 | ReadablePropertyConstIterator<Strings> it = |
| 155 | store.GetStringsPropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 156 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 157 | (*out)[it.Key()] = StringsToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 158 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 159 | } |
| 160 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 161 | ReadablePropertyConstIterator<uint8> it = store.GetUint8PropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 162 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 163 | (*out)[it.Key()] = ByteToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 164 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 165 | } |
| 166 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 167 | ReadablePropertyConstIterator<uint16> it = store.GetUint16PropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 168 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 169 | (*out)[it.Key()] = Uint16ToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 170 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 171 | } |
| 172 | { |
mukesh agrawal | e7c7e65 | 2013-06-18 17:19:39 -0700 | [diff] [blame] | 173 | ReadablePropertyConstIterator<Uint16s> it = |
| 174 | store.GetUint16sPropertiesIter(); |
| 175 | for ( ; !it.AtEnd(); it.Advance()) { |
| 176 | (*out)[it.Key()] = Uint16sToVariant(it.value()); |
| 177 | } |
| 178 | } |
| 179 | { |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 180 | ReadablePropertyConstIterator<uint32> it = store.GetUint32PropertiesIter(); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 181 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 182 | (*out)[it.Key()] = Uint32ToVariant(it.value()); |
mukesh agrawal | 465331c | 2012-05-30 11:26:11 -0700 | [diff] [blame] | 183 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 184 | } |
Jason Glasgow | acdc11f | 2012-03-30 14:12:22 -0400 | [diff] [blame] | 185 | { |
Paul Stewart | e18c33b | 2012-07-10 20:48:44 -0700 | [diff] [blame] | 186 | ReadablePropertyConstIterator<uint64> it = store.GetUint64PropertiesIter(); |
| 187 | for ( ; !it.AtEnd(); it.Advance()) { |
Paul Stewart | e18c33b | 2012-07-10 20:48:44 -0700 | [diff] [blame] | 188 | (*out)[it.Key()] = Uint64ToVariant(it.value()); |
| 189 | } |
| 190 | } |
| 191 | { |
Jason Glasgow | acdc11f | 2012-03-30 14:12:22 -0400 | [diff] [blame] | 192 | ReadablePropertyConstIterator<RpcIdentifier> it = |
| 193 | store.GetRpcIdentifierPropertiesIter(); |
| 194 | for ( ; !it.AtEnd(); it.Advance()) { |
Darin Petkov | 4682aa8 | 2012-05-31 16:24:11 +0200 | [diff] [blame] | 195 | (*out)[it.Key()] = PathToVariant(it.value()); |
Jason Glasgow | acdc11f | 2012-03-30 14:12:22 -0400 | [diff] [blame] | 196 | } |
| 197 | } |
Chris Masone | a8a2c25 | 2011-06-27 22:16:30 -0700 | [diff] [blame] | 198 | return true; |
| 199 | } |
| 200 | |
| 201 | // static |
mukesh agrawal | 8abd2f6 | 2012-01-30 14:56:14 -0800 | [diff] [blame] | 202 | bool DBusAdaptor::ClearProperty(PropertyStore *store, |
| 203 | const string &name, |
| 204 | ::DBus::Error *error) { |
| 205 | Error e; |
| 206 | store->ClearProperty(name, &e); |
| 207 | |
| 208 | if (error != NULL) { |
| 209 | e.ToDBusError(error); |
| 210 | } |
| 211 | |
| 212 | return e.IsSuccess(); |
| 213 | } |
| 214 | |
| 215 | // static |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 216 | void DBusAdaptor::ArgsToKeyValueStore( |
| 217 | const map<string, ::DBus::Variant> &args, |
| 218 | KeyValueStore *out, |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 219 | Error *error) { // TODO(quiche): Should be ::DBus::Error? |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 220 | for (const auto &key_value_pair : args) { |
| 221 | string key = key_value_pair.first; |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 222 | DBus::type<string> string_type; |
| 223 | DBus::type<bool> bool_type; |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 224 | DBus::type<int32> int32_type; |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 225 | |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 226 | if (key_value_pair.second.signature() == bool_type.sig()) { |
mukesh agrawal | 06175d7 | 2012-04-23 16:46:01 -0700 | [diff] [blame] | 227 | SLOG(DBus, 5) << "Got bool property " << key; |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 228 | out->SetBool(key, key_value_pair.second.reader().get_bool()); |
| 229 | } else if (key_value_pair.second.signature() == int32_type.sig()) { |
| 230 | SLOG(DBus, 5) << "Got int32 property " << key; |
| 231 | out->SetInt(key, key_value_pair.second.reader().get_int32()); |
| 232 | } else if (key_value_pair.second.signature() == string_type.sig()) { |
| 233 | SLOG(DBus, 5) << "Got string property " << key; |
| 234 | out->SetString(key, key_value_pair.second.reader().get_string()); |
| 235 | } else if (DBusAdaptor::IsStrings(key_value_pair.second.signature())) { |
Paul Stewart | 99dc9f3 | 2013-06-27 07:39:25 -0700 | [diff] [blame] | 236 | SLOG(DBus, 5) << "Got strings property " << key; |
Paul Stewart | 4823183 | 2013-07-17 15:46:19 -0700 | [diff] [blame] | 237 | out->SetStrings(key, key_value_pair.second.operator vector<string>()); |
Arman Uguray | 631c7e4 | 2013-07-30 16:41:12 -0700 | [diff] [blame] | 238 | } else if (DBusAdaptor::IsStringmap(key_value_pair.second.signature())) { |
| 239 | SLOG(DBus, 5) << "Got stringmap property " << key; |
| 240 | out->SetStringmap( |
| 241 | key, key_value_pair.second.operator map<string, string>()); |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 242 | } else { |
mukesh agrawal | 06175d7 | 2012-04-23 16:46:01 -0700 | [diff] [blame] | 243 | Error::PopulateAndLog(error, Error::kInternalError, |
| 244 | "unsupported type for property " + key); |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 245 | return; // Skip remaining args after error. |
mukesh agrawal | 7a4e400 | 2011-09-06 11:26:05 -0700 | [diff] [blame] | 246 | } |
| 247 | } |
| 248 | } |
| 249 | |
| 250 | // static |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 251 | ::DBus::Variant DBusAdaptor::BoolToVariant(bool value) { |
| 252 | ::DBus::Variant v; |
| 253 | v.writer().append_bool(value); |
| 254 | return v; |
| 255 | } |
| 256 | |
| 257 | // static |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 258 | ::DBus::Variant DBusAdaptor::ByteArraysToVariant(const ByteArrays &value) { |
| 259 | ::DBus::MessageIter writer; |
| 260 | ::DBus::Variant v; |
| 261 | |
Gaurav Shah | 7ad8e53 | 2011-11-11 17:14:49 -0800 | [diff] [blame] | 262 | |
| 263 | // We have to use a local because the operator<< needs a reference |
| 264 | // to work on (the lhs) but writer() returns by-value. C++ prohibits |
| 265 | // initializing non-const references from a temporary. |
| 266 | // So: |
| 267 | // v.writer() << value; |
| 268 | // would NOT automagically promote the returned value of v.writer() to |
| 269 | // a non-const reference (if you think about it, that's almost always not what |
| 270 | // you'd want. see: http://gcc.gnu.org/ml/gcc-help/2006-04/msg00075.html). |
| 271 | // |
| 272 | // One could consider changing writer() to return a reference, but then it |
| 273 | // changes writer() semantics as it can not be a const reference. writer() |
| 274 | // currently doesn't modify the original object on which it's called. |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 275 | writer = v.writer(); |
| 276 | writer << value; |
| 277 | return v; |
| 278 | } |
| 279 | |
| 280 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 281 | ::DBus::Variant DBusAdaptor::ByteToVariant(uint8 value) { |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 282 | ::DBus::Variant v; |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 283 | v.writer().append_byte(value); |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 284 | return v; |
| 285 | } |
| 286 | |
| 287 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 288 | ::DBus::Variant DBusAdaptor::Int16ToVariant(int16 value) { |
| 289 | ::DBus::Variant v; |
| 290 | v.writer().append_int16(value); |
| 291 | return v; |
| 292 | } |
| 293 | |
| 294 | // static |
| 295 | ::DBus::Variant DBusAdaptor::Int32ToVariant(int32 value) { |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 296 | ::DBus::Variant v; |
| 297 | v.writer().append_int32(value); |
| 298 | return v; |
| 299 | } |
| 300 | |
| 301 | // static |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 302 | ::DBus::Variant DBusAdaptor::PathToVariant(const ::DBus::Path &value) { |
| 303 | ::DBus::Variant v; |
| 304 | v.writer().append_path(value.c_str()); |
| 305 | return v; |
| 306 | } |
| 307 | |
| 308 | // static |
mukesh agrawal | 2366eed | 2012-03-20 18:21:50 -0700 | [diff] [blame] | 309 | ::DBus::Variant DBusAdaptor::PathsToVariant( |
mukesh agrawal | 3239932 | 2011-09-01 10:53:43 -0700 | [diff] [blame] | 310 | const vector< ::DBus::Path> &value) { |
| 311 | ::DBus::MessageIter writer; |
| 312 | ::DBus::Variant v; |
| 313 | |
Gaurav Shah | 7ad8e53 | 2011-11-11 17:14:49 -0800 | [diff] [blame] | 314 | // See note above on why we need to use a local. |
mukesh agrawal | 3239932 | 2011-09-01 10:53:43 -0700 | [diff] [blame] | 315 | writer = v.writer(); |
| 316 | writer << value; |
| 317 | return v; |
| 318 | } |
| 319 | |
| 320 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 321 | ::DBus::Variant DBusAdaptor::StringToVariant(const string &value) { |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 322 | ::DBus::Variant v; |
| 323 | v.writer().append_string(value.c_str()); |
| 324 | return v; |
| 325 | } |
| 326 | |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 327 | // static |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 328 | ::DBus::Variant DBusAdaptor::StringmapToVariant(const Stringmap &value) { |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 329 | ::DBus::Variant v; |
| 330 | ::DBus::MessageIter writer = v.writer(); |
| 331 | writer << value; |
| 332 | return v; |
| 333 | } |
| 334 | |
| 335 | // static |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 336 | ::DBus::Variant DBusAdaptor::StringmapsToVariant(const Stringmaps &value) { |
Chris Masone | b925cc8 | 2011-06-22 15:39:57 -0700 | [diff] [blame] | 337 | ::DBus::Variant v; |
| 338 | ::DBus::MessageIter writer = v.writer(); |
| 339 | writer << value; |
| 340 | return v; |
| 341 | } |
| 342 | |
| 343 | // static |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 344 | ::DBus::Variant DBusAdaptor::StringsToVariant(const Strings &value) { |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 345 | ::DBus::Variant v; |
| 346 | ::DBus::MessageIter writer = v.writer(); |
| 347 | writer << value; |
| 348 | return v; |
| 349 | } |
| 350 | |
| 351 | // static |
Darin Petkov | 63138a9 | 2012-02-06 14:09:15 +0100 | [diff] [blame] | 352 | ::DBus::Variant DBusAdaptor::KeyValueStoreToVariant( |
| 353 | const KeyValueStore &value) { |
Darin Petkov | 25665aa | 2012-05-21 14:08:12 +0200 | [diff] [blame] | 354 | DBusPropertiesMap props; |
| 355 | DBusProperties::ConvertKeyValueStoreToMap(value, &props); |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 356 | ::DBus::Variant v; |
| 357 | ::DBus::MessageIter writer = v.writer(); |
Eric Shienbrood | b23d4b9 | 2012-02-16 12:32:42 -0500 | [diff] [blame] | 358 | writer << props; |
Chris Masone | 889666b | 2011-07-03 12:58:50 -0700 | [diff] [blame] | 359 | return v; |
| 360 | } |
| 361 | |
| 362 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 363 | ::DBus::Variant DBusAdaptor::Uint16ToVariant(uint16 value) { |
| 364 | ::DBus::Variant v; |
| 365 | v.writer().append_uint16(value); |
| 366 | return v; |
| 367 | } |
| 368 | |
| 369 | // static |
mukesh agrawal | e7c7e65 | 2013-06-18 17:19:39 -0700 | [diff] [blame] | 370 | ::DBus::Variant DBusAdaptor::Uint16sToVariant(const Uint16s &value) { |
| 371 | ::DBus::Variant v; |
| 372 | ::DBus::MessageIter writer = v.writer(); |
| 373 | writer << value; |
| 374 | return v; |
| 375 | } |
| 376 | |
| 377 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 378 | ::DBus::Variant DBusAdaptor::Uint32ToVariant(uint32 value) { |
| 379 | ::DBus::Variant v; |
| 380 | v.writer().append_uint32(value); |
| 381 | return v; |
| 382 | } |
| 383 | |
| 384 | // static |
Paul Stewart | e18c33b | 2012-07-10 20:48:44 -0700 | [diff] [blame] | 385 | ::DBus::Variant DBusAdaptor::Uint64ToVariant(uint64 value) { |
| 386 | ::DBus::Variant v; |
| 387 | v.writer().append_uint64(value); |
| 388 | return v; |
| 389 | } |
| 390 | |
| 391 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 392 | bool DBusAdaptor::IsBool(::DBus::Signature signature) { |
| 393 | return signature == ::DBus::type<bool>::sig(); |
| 394 | } |
| 395 | |
| 396 | // static |
| 397 | bool DBusAdaptor::IsByte(::DBus::Signature signature) { |
| 398 | return signature == ::DBus::type<uint8>::sig(); |
| 399 | } |
| 400 | |
| 401 | // static |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 402 | bool DBusAdaptor::IsByteArrays(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 403 | return signature == ::DBus::type<ByteArrays>::sig(); |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 404 | } |
| 405 | |
| 406 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 407 | bool DBusAdaptor::IsInt16(::DBus::Signature signature) { |
| 408 | return signature == ::DBus::type<int16>::sig(); |
| 409 | } |
| 410 | |
| 411 | // static |
| 412 | bool DBusAdaptor::IsInt32(::DBus::Signature signature) { |
| 413 | return signature == ::DBus::type<int32>::sig(); |
| 414 | } |
| 415 | |
| 416 | // static |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 417 | bool DBusAdaptor::IsPath(::DBus::Signature signature) { |
| 418 | return signature == ::DBus::type< ::DBus::Path >::sig(); |
| 419 | } |
| 420 | |
| 421 | // static |
mukesh agrawal | 2366eed | 2012-03-20 18:21:50 -0700 | [diff] [blame] | 422 | bool DBusAdaptor::IsPaths(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 423 | return signature == ::DBus::type<vector< ::DBus::Path >>::sig(); |
mukesh agrawal | 3239932 | 2011-09-01 10:53:43 -0700 | [diff] [blame] | 424 | } |
| 425 | |
| 426 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 427 | bool DBusAdaptor::IsString(::DBus::Signature signature) { |
| 428 | return signature == ::DBus::type<string>::sig(); |
| 429 | } |
| 430 | |
| 431 | // static |
| 432 | bool DBusAdaptor::IsStringmap(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 433 | return signature == ::DBus::type<Stringmap>::sig(); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 434 | } |
| 435 | |
| 436 | // static |
Chris Masone | 27c4aa5 | 2011-07-02 13:10:14 -0700 | [diff] [blame] | 437 | bool DBusAdaptor::IsStringmaps(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 438 | return signature == ::DBus::type<Stringmaps>::sig(); |
Chris Masone | 27c4aa5 | 2011-07-02 13:10:14 -0700 | [diff] [blame] | 439 | } |
| 440 | |
| 441 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 442 | bool DBusAdaptor::IsStrings(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 443 | return signature == ::DBus::type<Strings>::sig(); |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 444 | } |
| 445 | |
| 446 | // static |
| 447 | bool DBusAdaptor::IsUint16(::DBus::Signature signature) { |
| 448 | return signature == ::DBus::type<uint16>::sig(); |
| 449 | } |
| 450 | |
| 451 | // static |
mukesh agrawal | e7c7e65 | 2013-06-18 17:19:39 -0700 | [diff] [blame] | 452 | bool DBusAdaptor::IsUint16s(::DBus::Signature signature) { |
mukesh agrawal | 97ede7b | 2013-11-21 15:28:14 -0800 | [diff] [blame^] | 453 | return signature == ::DBus::type<Uint16s>::sig(); |
mukesh agrawal | e7c7e65 | 2013-06-18 17:19:39 -0700 | [diff] [blame] | 454 | } |
| 455 | |
| 456 | // static |
Chris Masone | 8fe2c7e | 2011-06-09 15:51:19 -0700 | [diff] [blame] | 457 | bool DBusAdaptor::IsUint32(::DBus::Signature signature) { |
| 458 | return signature == ::DBus::type<uint32>::sig(); |
| 459 | } |
| 460 | |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 461 | // static |
Paul Stewart | e18c33b | 2012-07-10 20:48:44 -0700 | [diff] [blame] | 462 | bool DBusAdaptor::IsUint64(::DBus::Signature signature) { |
| 463 | return signature == ::DBus::type<uint64>::sig(); |
| 464 | } |
| 465 | |
| 466 | // static |
Eric Shienbrood | b23d4b9 | 2012-02-16 12:32:42 -0500 | [diff] [blame] | 467 | bool DBusAdaptor::IsKeyValueStore(::DBus::Signature signature) { |
| 468 | return signature == ::DBus::type<map<string, ::DBus::Variant> >::sig(); |
| 469 | } |
| 470 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 471 | void DBusAdaptor::DeferReply(const DBus::Tag *tag) { |
| 472 | return_later(tag); |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 473 | } |
| 474 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 475 | void DBusAdaptor::ReplyNow(const DBus::Tag *tag) { |
| 476 | Continuation *cont = find_continuation(tag); |
mukesh agrawal | 46c27cc | 2013-07-10 16:39:10 -0700 | [diff] [blame] | 477 | CHECK(cont) << "Failed to find continuation."; |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 478 | return_now(cont); |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 479 | } |
| 480 | |
Christopher Wiley | 0d9cf0c | 2013-02-19 19:24:57 -0800 | [diff] [blame] | 481 | template <typename T> |
| 482 | void DBusAdaptor::TypedReplyNow(const DBus::Tag *tag, const T &value) { |
| 483 | Continuation *cont = find_continuation(tag); |
mukesh agrawal | 46c27cc | 2013-07-10 16:39:10 -0700 | [diff] [blame] | 484 | CHECK(cont) << "Failed to find continuation."; |
Christopher Wiley | 0d9cf0c | 2013-02-19 19:24:57 -0800 | [diff] [blame] | 485 | cont->writer() << value; |
| 486 | return_now(cont); |
| 487 | } |
| 488 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 489 | void DBusAdaptor::ReplyNowWithError(const DBus::Tag *tag, |
| 490 | const DBus::Error &error) { |
| 491 | Continuation *cont = find_continuation(tag); |
mukesh agrawal | 46c27cc | 2013-07-10 16:39:10 -0700 | [diff] [blame] | 492 | CHECK(cont) << "Failed to find continuation."; |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 493 | return_error(cont, error); |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 494 | } |
| 495 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 496 | ResultCallback DBusAdaptor::GetMethodReplyCallback( |
| 497 | const DBus::Tag *tag) { |
| 498 | return Bind(&DBusAdaptor::MethodReplyCallback, AsWeakPtr(), Owned(tag)); |
| 499 | } |
| 500 | |
Christopher Wiley | 0d9cf0c | 2013-02-19 19:24:57 -0800 | [diff] [blame] | 501 | ResultStringCallback DBusAdaptor::GetStringMethodReplyCallback( |
| 502 | const DBus::Tag *tag) { |
| 503 | return Bind(&DBusAdaptor::StringMethodReplyCallback, AsWeakPtr(), Owned(tag)); |
| 504 | } |
| 505 | |
| 506 | ResultBoolCallback DBusAdaptor::GetBoolMethodReplyCallback( |
| 507 | const DBus::Tag *tag) { |
| 508 | return Bind(&DBusAdaptor::BoolMethodReplyCallback, AsWeakPtr(), Owned(tag)); |
| 509 | } |
| 510 | |
| 511 | template<typename T> |
| 512 | void DBusAdaptor::TypedMethodReplyCallback(const DBus::Tag *tag, |
| 513 | const Error &error, |
| 514 | const T &returned) { |
| 515 | if (error.IsFailure()) { |
| 516 | DBus::Error dberror; |
| 517 | error.ToDBusError(&dberror); |
| 518 | ReplyNowWithError(tag, dberror); |
| 519 | } else { |
| 520 | TypedReplyNow(tag, returned); |
| 521 | } |
| 522 | } |
| 523 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 524 | void DBusAdaptor::ReturnResultOrDefer(const DBus::Tag *tag, |
| 525 | const Error &error, |
| 526 | DBus::Error *dberror) { |
| 527 | if (error.IsOngoing()) { |
| 528 | DeferReply(tag); |
| 529 | } else if (error.IsFailure()) { |
| 530 | error.ToDBusError(dberror); |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 531 | } |
| 532 | } |
| 533 | |
Eric Shienbrood | 9a24553 | 2012-03-07 14:20:39 -0500 | [diff] [blame] | 534 | void DBusAdaptor::MethodReplyCallback(const DBus::Tag *tag, |
| 535 | const Error &error) { |
| 536 | if (error.IsFailure()) { |
| 537 | DBus::Error dberror; |
| 538 | error.ToDBusError(&dberror); |
| 539 | ReplyNowWithError(tag, dberror); |
| 540 | } else { |
| 541 | ReplyNow(tag); |
Darin Petkov | e5bc2cb | 2011-12-07 14:47:32 +0100 | [diff] [blame] | 542 | } |
| 543 | } |
| 544 | |
Christopher Wiley | 0d9cf0c | 2013-02-19 19:24:57 -0800 | [diff] [blame] | 545 | void DBusAdaptor::StringMethodReplyCallback(const DBus::Tag *tag, |
| 546 | const Error &error, |
| 547 | const string &returned) { |
| 548 | TypedMethodReplyCallback(tag, error, returned); |
| 549 | } |
| 550 | |
| 551 | void DBusAdaptor::BoolMethodReplyCallback(const DBus::Tag *tag, |
| 552 | const Error &error, |
| 553 | bool returned) { |
| 554 | TypedMethodReplyCallback(tag, error, returned); |
| 555 | } |
| 556 | |
Chris Masone | d0ceb8c | 2011-06-02 10:05:39 -0700 | [diff] [blame] | 557 | } // namespace shill |