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