mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 1 | // Copyright (c) 2012 The Chromium OS Authors. All rights reserved. |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -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 | |
| 5 | #include "shill/wifi_service.h" |
| 6 | |
| 7 | #include <string> |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 8 | #include <utility> |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 9 | |
| 10 | #include <base/logging.h> |
Chris Masone | 34af218 | 2011-08-22 11:59:36 -0700 | [diff] [blame] | 11 | #include <base/stringprintf.h> |
| 12 | #include <base/string_number_conversions.h> |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 13 | #include <base/string_split.h> |
Chris Masone | 34af218 | 2011-08-22 11:59:36 -0700 | [diff] [blame] | 14 | #include <base/string_util.h> |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 15 | #include <chromeos/dbus/service_constants.h> |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 16 | #include <dbus/dbus.h> |
mukesh agrawal | d835b20 | 2011-10-07 15:26:47 -0700 | [diff] [blame] | 17 | #include <glib.h> |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 18 | |
| 19 | #include "shill/control_interface.h" |
| 20 | #include "shill/device.h" |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 21 | #include "shill/error.h" |
Paul Stewart | 26b327e | 2011-10-19 11:38:09 -0700 | [diff] [blame] | 22 | #include "shill/event_dispatcher.h" |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 23 | #include "shill/ieee80211.h" |
Thieu Le | 48e6d6d | 2011-12-06 00:40:27 +0000 | [diff] [blame] | 24 | #include "shill/metrics.h" |
Thieu Le | f770945 | 2011-11-15 01:13:19 +0000 | [diff] [blame] | 25 | #include "shill/property_accessor.h" |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 26 | #include "shill/store_interface.h" |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 27 | #include "shill/wifi.h" |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 28 | #include "shill/wifi_endpoint.h" |
| 29 | #include "shill/wpa_supplicant.h" |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 30 | |
mukesh agrawal | 261daca | 2011-12-02 18:56:56 +0000 | [diff] [blame] | 31 | using std::set; |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 32 | using std::string; |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 33 | using std::vector; |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 34 | |
| 35 | namespace shill { |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 36 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 37 | const char WiFiService::kStorageHiddenSSID[] = "WiFi.HiddenSSID"; |
Paul Stewart | 2706aaf | 2011-12-14 16:44:04 -0800 | [diff] [blame] | 38 | const char WiFiService::kStorageMode[] = "WiFi.Mode"; |
| 39 | const char WiFiService::kStoragePassphrase[] = "Passphrase"; |
| 40 | const char WiFiService::kStorageSecurity[] = "WiFi.Security"; |
| 41 | const char WiFiService::kStorageSSID[] = "SSID"; |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 42 | |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 43 | WiFiService::WiFiService(ControlInterface *control_interface, |
| 44 | EventDispatcher *dispatcher, |
Thieu Le | 3426c8f | 2012-01-11 17:35:11 -0800 | [diff] [blame] | 45 | Metrics *metrics, |
Chris Masone | 6791a43 | 2011-07-12 13:23:19 -0700 | [diff] [blame] | 46 | Manager *manager, |
Chris Masone | 2b10554 | 2011-06-22 10:58:09 -0700 | [diff] [blame] | 47 | const WiFiRefPtr &device, |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 48 | const vector<uint8_t> &ssid, |
| 49 | const string &mode, |
| 50 | const string &security, |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 51 | bool hidden_ssid) |
Thieu Le | 3426c8f | 2012-01-11 17:35:11 -0800 | [diff] [blame] | 52 | : Service(control_interface, dispatcher, metrics, manager, |
| 53 | Technology::kWifi), |
Chris Masone | 7561230 | 2011-10-12 16:31:21 -0700 | [diff] [blame] | 54 | need_passphrase_(false), |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 55 | security_(security), |
Chris Masone | 092df3e | 2011-08-22 09:41:39 -0700 | [diff] [blame] | 56 | mode_(mode), |
Paul Stewart | ced6a0b | 2011-11-08 15:32:04 -0800 | [diff] [blame] | 57 | hidden_ssid_(hidden_ssid), |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 58 | task_factory_(this), |
| 59 | wifi_(device), |
Chris Masone | 092df3e | 2011-08-22 09:41:39 -0700 | [diff] [blame] | 60 | ssid_(ssid) { |
mukesh agrawal | de29fa8 | 2011-09-16 16:16:36 -0700 | [diff] [blame] | 61 | PropertyStore *store = this->mutable_store(); |
Paul Stewart | ac4ac00 | 2011-08-26 12:04:26 -0700 | [diff] [blame] | 62 | store->RegisterConstString(flimflam::kModeProperty, &mode_); |
Thieu Le | f770945 | 2011-11-15 01:13:19 +0000 | [diff] [blame] | 63 | HelpRegisterDerivedString(store, |
| 64 | flimflam::kPassphraseProperty, |
| 65 | NULL, |
| 66 | &WiFiService::SetPassphrase); |
Paul Stewart | ac4ac00 | 2011-08-26 12:04:26 -0700 | [diff] [blame] | 67 | store->RegisterBool(flimflam::kPassphraseRequiredProperty, &need_passphrase_); |
| 68 | store->RegisterConstString(flimflam::kSecurityProperty, &security_); |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 69 | |
Paul Stewart | ac4ac00 | 2011-08-26 12:04:26 -0700 | [diff] [blame] | 70 | store->RegisterConstString(flimflam::kWifiAuthMode, &auth_mode_); |
| 71 | store->RegisterConstBool(flimflam::kWifiHiddenSsid, &hidden_ssid_); |
| 72 | store->RegisterConstUint16(flimflam::kWifiFrequency, &frequency_); |
| 73 | store->RegisterConstUint16(flimflam::kWifiPhyMode, &physical_mode_); |
mukesh agrawal | 3239932 | 2011-09-01 10:53:43 -0700 | [diff] [blame] | 74 | |
mukesh agrawal | d835b20 | 2011-10-07 15:26:47 -0700 | [diff] [blame] | 75 | hex_ssid_ = base::HexEncode(ssid_.data(), ssid_.size()); |
| 76 | string ssid_string( |
| 77 | reinterpret_cast<const char *>(ssid_.data()), ssid_.size()); |
| 78 | if (SanitizeSSID(&ssid_string)) { |
| 79 | // WifiHexSsid property should only be present if Name property |
| 80 | // has been munged. |
| 81 | store->RegisterConstString(flimflam::kWifiHexSsid, &hex_ssid_); |
| 82 | } |
| 83 | set_friendly_name(ssid_string); |
Chris Masone | 9d77993 | 2011-08-25 16:33:41 -0700 | [diff] [blame] | 84 | |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 85 | // TODO(quiche): determine if it is okay to set EAP.KeyManagement for |
| 86 | // a service that is not 802.1x. |
Gaurav Shah | 29d6888 | 2012-01-30 19:06:42 -0800 | [diff] [blame^] | 87 | if (Is8021x()) { |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 88 | // Passphrases are not mandatory for 802.1X. |
| 89 | need_passphrase_ = false; |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 90 | } else if (security_ == flimflam::kSecurityPsk) { |
| 91 | SetEAPKeyManagement("WPA-PSK"); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 92 | } else if (security_ == flimflam::kSecurityRsn) { |
| 93 | SetEAPKeyManagement("WPA-PSK"); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 94 | } else if (security_ == flimflam::kSecurityWpa) { |
| 95 | SetEAPKeyManagement("WPA-PSK"); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 96 | } else if (security_ == flimflam::kSecurityWep) { |
| 97 | SetEAPKeyManagement("NONE"); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 98 | } else if (security_ == flimflam::kSecurityNone) { |
| 99 | SetEAPKeyManagement("NONE"); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 100 | } else { |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 101 | LOG(ERROR) << "Unsupported security method " << security_; |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 102 | } |
| 103 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 104 | // Until we know better (at Profile load time), use the generic name. |
| 105 | storage_identifier_ = GetGenericStorageIdentifier(); |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 106 | UpdateConnectable(); |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 107 | } |
| 108 | |
| 109 | WiFiService::~WiFiService() { |
| 110 | LOG(INFO) << __func__; |
| 111 | } |
| 112 | |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 113 | void WiFiService::AutoConnect() { |
| 114 | if (IsAutoConnectable()) { |
| 115 | // Execute immediately, for two reasons: |
| 116 | // |
| 117 | // 1. We need IsAutoConnectable to return the correct value for |
| 118 | // other WiFiServices, and that depends on WiFi's state. |
| 119 | // |
| 120 | // 2. We should probably limit the extent to which we queue up |
| 121 | // actions (such as AutoConnect) which depend on current state. |
| 122 | // If we queued AutoConnects, we could build a long queue of |
| 123 | // useless work (one AutoConnect per Service), which blocks |
| 124 | // more timely work. |
| 125 | ConnectTask(); |
mukesh agrawal | 592516d | 2012-01-12 14:01:00 -0800 | [diff] [blame] | 126 | } else { |
| 127 | LOG(INFO) << "Suppressed autoconnect to " << friendly_name(); |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 128 | } |
| 129 | } |
| 130 | |
mukesh agrawal | 1830fa1 | 2011-09-26 14:31:40 -0700 | [diff] [blame] | 131 | void WiFiService::Connect(Error */*error*/) { |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 132 | LOG(INFO) << "In " << __func__ << "():"; |
mukesh agrawal | 0ed0f2e | 2011-12-05 20:36:17 +0000 | [diff] [blame] | 133 | // Defer handling, since dbus-c++ does not permit us to send an |
| 134 | // outbound request while processing an inbound one. |
Paul Stewart | ac4ac00 | 2011-08-26 12:04:26 -0700 | [diff] [blame] | 135 | dispatcher()->PostTask( |
mukesh agrawal | dc42bb3 | 2011-07-28 10:40:26 -0700 | [diff] [blame] | 136 | task_factory_.NewRunnableMethod(&WiFiService::ConnectTask)); |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 137 | } |
| 138 | |
mukesh agrawal | adb6848 | 2012-01-17 16:31:51 -0800 | [diff] [blame] | 139 | void WiFiService::Disconnect(Error *error) { |
mukesh agrawal | 0ed0f2e | 2011-12-05 20:36:17 +0000 | [diff] [blame] | 140 | LOG(INFO) << __func__; |
mukesh agrawal | adb6848 | 2012-01-17 16:31:51 -0800 | [diff] [blame] | 141 | Service::Disconnect(error); |
mukesh agrawal | 0ed0f2e | 2011-12-05 20:36:17 +0000 | [diff] [blame] | 142 | // Defer handling, since dbus-c++ does not permit us to send an |
| 143 | // outbound request while processing an inbound one. |
| 144 | dispatcher()->PostTask( |
| 145 | task_factory_.NewRunnableMethod(&WiFiService::DisconnectTask)); |
Chris Masone | 3bd3c8c | 2011-06-13 08:20:26 -0700 | [diff] [blame] | 146 | } |
| 147 | |
Paul Stewart | 22aa71b | 2011-09-16 12:15:11 -0700 | [diff] [blame] | 148 | bool WiFiService::TechnologyIs(const Technology::Identifier type) const { |
| 149 | return wifi_->TechnologyIs(type); |
| 150 | } |
| 151 | |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 152 | bool WiFiService::IsAutoConnectable() const { |
mukesh agrawal | adb6848 | 2012-01-17 16:31:51 -0800 | [diff] [blame] | 153 | return Service::IsAutoConnectable() && |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 154 | // Only auto-connect to Services which have visible Endpoints. |
| 155 | // (Needed because hidden Services may remain registered with |
| 156 | // Manager even without visible Endpoints.) |
mukesh agrawal | adb6848 | 2012-01-17 16:31:51 -0800 | [diff] [blame] | 157 | HasEndpoints() && |
mukesh agrawal | 76d1388 | 2012-01-12 15:23:11 -0800 | [diff] [blame] | 158 | // Do not preempt an existing connection (whether pending, or |
| 159 | // connected, and whether to this service, or another). |
mukesh agrawal | adb6848 | 2012-01-17 16:31:51 -0800 | [diff] [blame] | 160 | wifi_->IsIdle(); |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 161 | } |
| 162 | |
| 163 | bool WiFiService::IsConnecting() const { |
| 164 | // WiFi does not move us into the associating state until it gets |
| 165 | // feedback from wpa_supplicant. So, to answer whether or |
| 166 | // not we're connecting, we consult with |wifi_|. |
| 167 | return wifi_->IsConnectingTo(*this); |
Paul Stewart | 3d9bcf5 | 2011-12-12 15:02:22 -0800 | [diff] [blame] | 168 | } |
| 169 | |
mukesh agrawal | 261daca | 2011-12-02 18:56:56 +0000 | [diff] [blame] | 170 | void WiFiService::AddEndpoint(WiFiEndpointConstRefPtr endpoint) { |
| 171 | DCHECK(endpoint->ssid() == ssid()); |
| 172 | endpoints_.insert(endpoint); |
| 173 | } |
| 174 | |
| 175 | void WiFiService::RemoveEndpoint(WiFiEndpointConstRefPtr endpoint) { |
| 176 | set<WiFiEndpointConstRefPtr>::iterator i = endpoints_.find(endpoint); |
| 177 | DCHECK(i != endpoints_.end()); |
| 178 | if (i == endpoints_.end()) { |
| 179 | LOG(WARNING) << "In " << __func__ << "(): " |
| 180 | << "ignorning non-existent endpoint " |
| 181 | << endpoint->bssid_string(); |
| 182 | return; |
| 183 | } |
| 184 | endpoints_.erase(i); |
| 185 | } |
| 186 | |
Chris Masone | 6515aab | 2011-10-12 16:19:09 -0700 | [diff] [blame] | 187 | string WiFiService::GetStorageIdentifier() const { |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 188 | return storage_identifier_; |
Chris Masone | 34af218 | 2011-08-22 11:59:36 -0700 | [diff] [blame] | 189 | } |
mukesh agrawal | 445e72c | 2011-06-22 11:13:50 -0700 | [diff] [blame] | 190 | |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 191 | void WiFiService::SetPassphrase(const string &passphrase, Error *error) { |
| 192 | if (security_ == flimflam::kSecurityWep) { |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 193 | ValidateWEPPassphrase(passphrase, error); |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 194 | } else if (security_ == flimflam::kSecurityPsk || |
| 195 | security_ == flimflam::kSecurityWpa || |
| 196 | security_ == flimflam::kSecurityRsn) { |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 197 | ValidateWPAPassphrase(passphrase, error); |
| 198 | } else { |
| 199 | error->Populate(Error::kNotSupported); |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 200 | } |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 201 | |
Paul Stewart | 2706aaf | 2011-12-14 16:44:04 -0800 | [diff] [blame] | 202 | if (error->IsSuccess()) { |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 203 | passphrase_ = passphrase; |
Paul Stewart | 2706aaf | 2011-12-14 16:44:04 -0800 | [diff] [blame] | 204 | } |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 205 | |
| 206 | UpdateConnectable(); |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 207 | } |
| 208 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 209 | bool WiFiService::IsLoadableFrom(StoreInterface *storage) const { |
| 210 | return storage->ContainsGroup(GetGenericStorageIdentifier()) || |
| 211 | storage->ContainsGroup(GetSpecificStorageIdentifier()); |
| 212 | } |
| 213 | |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 214 | bool WiFiService::IsVisible() const { |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 215 | // WiFi Services should be displayed only if they are in range (have |
| 216 | // endpoints that have shown up in a scan) or if the service is actively |
| 217 | // being connected. |
mukesh agrawal | 8a3188d | 2011-12-01 20:56:44 +0000 | [diff] [blame] | 218 | return HasEndpoints() || IsConnected() || IsConnecting(); |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 219 | } |
| 220 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 221 | bool WiFiService::Load(StoreInterface *storage) { |
| 222 | // First find out which storage identifier is available in priority order |
| 223 | // of specific, generic. |
| 224 | string id = GetSpecificStorageIdentifier(); |
| 225 | if (!storage->ContainsGroup(id)) { |
| 226 | id = GetGenericStorageIdentifier(); |
| 227 | if (!storage->ContainsGroup(id)) { |
| 228 | LOG(WARNING) << "Service is not available in the persistent store: " |
| 229 | << id; |
| 230 | return false; |
| 231 | } |
| 232 | } |
| 233 | |
| 234 | // Set our storage identifier to match the storage name in the Profile. |
| 235 | storage_identifier_ = id; |
| 236 | |
| 237 | // Load properties common to all Services. |
| 238 | if (!Service::Load(storage)) { |
| 239 | return false; |
| 240 | } |
| 241 | |
| 242 | // Load properties specific to WiFi services. |
| 243 | storage->GetBool(id, kStorageHiddenSSID, &hidden_ssid_); |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 244 | |
Paul Stewart | 2706aaf | 2011-12-14 16:44:04 -0800 | [diff] [blame] | 245 | // NB: mode, security and ssid parameters are never read in from |
| 246 | // Load() as they are provided from the scan. |
| 247 | |
| 248 | string passphrase; |
| 249 | if (storage->GetCryptedString(id, kStoragePassphrase, &passphrase)) { |
| 250 | Error error; |
| 251 | SetPassphrase(passphrase, &error); |
| 252 | if (!error.IsSuccess()) { |
| 253 | LOG(ERROR) << "Passphrase could not be set: " |
| 254 | << Error::GetName(error.type()); |
| 255 | } |
| 256 | } |
| 257 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 258 | return true; |
| 259 | } |
| 260 | |
| 261 | bool WiFiService::Save(StoreInterface *storage) { |
| 262 | // Save properties common to all Services. |
| 263 | if (!Service::Save(storage)) { |
| 264 | return false; |
| 265 | } |
| 266 | |
| 267 | // Save properties specific to WiFi services. |
| 268 | const string id = GetStorageIdentifier(); |
Paul Stewart | 2706aaf | 2011-12-14 16:44:04 -0800 | [diff] [blame] | 269 | storage->SetBool(id, kStorageHiddenSSID, hidden_ssid_); |
| 270 | storage->SetString(id, kStorageMode, mode_); |
| 271 | storage->SetCryptedString(id, kStoragePassphrase, passphrase_); |
| 272 | storage->SetString(id, kStorageSecurity, security_); |
| 273 | storage->SetString(id, kStorageSSID, hex_ssid_); |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 274 | |
| 275 | // TODO(quiche): Save Passphrase property. (crosbug.com/23467) |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 276 | return true; |
| 277 | } |
| 278 | |
Paul Stewart | d8ad3c4 | 2012-01-09 12:39:38 -0800 | [diff] [blame] | 279 | void WiFiService::Unload() { |
| 280 | Service::Unload(); |
| 281 | hidden_ssid_ = false; |
| 282 | passphrase_ = ""; |
| 283 | UpdateConnectable(); |
| 284 | } |
| 285 | |
Paul Stewart | 6ab23a9 | 2011-11-09 17:17:47 -0800 | [diff] [blame] | 286 | bool WiFiService::IsSecurityMatch(const string &security) const { |
| 287 | return GetSecurityClass(security) == GetSecurityClass(security_); |
| 288 | } |
| 289 | |
Thieu Le | 48e6d6d | 2011-12-06 00:40:27 +0000 | [diff] [blame] | 290 | void WiFiService::InitializeCustomMetrics() const { |
| 291 | string histogram = metrics()->GetFullMetricName( |
| 292 | Metrics::kMetricTimeToJoinMilliseconds, |
| 293 | technology()); |
| 294 | metrics()->AddServiceStateTransitionTimer(this, |
| 295 | histogram, |
| 296 | Service::kStateAssociating, |
| 297 | Service::kStateConfiguring); |
| 298 | } |
| 299 | |
| 300 | void WiFiService::SendPostReadyStateMetrics() const { |
| 301 | // TODO(thieule): Send physical mode and security metrics. |
| 302 | // crosbug.com/24441 |
| 303 | metrics()->SendEnumToUMA( |
| 304 | metrics()->GetFullMetricName(Metrics::kMetricNetworkChannel, |
| 305 | technology()), |
| 306 | Metrics::WiFiFrequencyToChannel(frequency_), |
| 307 | Metrics::kMetricNetworkChannelMax); |
Thieu Le | ad1ec2c | 2012-01-05 23:39:48 +0000 | [diff] [blame] | 308 | |
| 309 | DCHECK(physical_mode_ < Metrics::kWiFiNetworkPhyModeMax); |
| 310 | metrics()->SendEnumToUMA( |
| 311 | metrics()->GetFullMetricName(Metrics::kMetricNetworkPhyMode, |
| 312 | technology()), |
| 313 | static_cast<Metrics::WiFiNetworkPhyMode>(physical_mode_), |
| 314 | Metrics::kWiFiNetworkPhyModeMax); |
| 315 | |
| 316 | Metrics::WiFiSecurity security_uma = |
| 317 | Metrics::WiFiSecurityStringToEnum(security_); |
| 318 | DCHECK(security_uma != Metrics::kWiFiSecurityUnknown); |
| 319 | metrics()->SendEnumToUMA( |
| 320 | metrics()->GetFullMetricName(Metrics::kMetricNetworkSecurity, |
| 321 | technology()), |
| 322 | security_uma, |
| 323 | Metrics::kMetricNetworkSecurityMax); |
Thieu Le | 48e6d6d | 2011-12-06 00:40:27 +0000 | [diff] [blame] | 324 | } |
| 325 | |
mukesh agrawal | 3239932 | 2011-09-01 10:53:43 -0700 | [diff] [blame] | 326 | // private methods |
Thieu Le | f770945 | 2011-11-15 01:13:19 +0000 | [diff] [blame] | 327 | void WiFiService::HelpRegisterDerivedString( |
| 328 | PropertyStore *store, |
| 329 | const std::string &name, |
| 330 | std::string(WiFiService::*get)(Error *), |
| 331 | void(WiFiService::*set)(const std::string&, Error *)) { |
| 332 | store->RegisterDerivedString( |
| 333 | name, |
| 334 | StringAccessor(new CustomAccessor<WiFiService, string>(this, get, set))); |
| 335 | } |
| 336 | |
mukesh agrawal | dc42bb3 | 2011-07-28 10:40:26 -0700 | [diff] [blame] | 337 | void WiFiService::ConnectTask() { |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 338 | std::map<string, DBus::Variant> params; |
| 339 | DBus::MessageIter writer; |
| 340 | |
| 341 | params[wpa_supplicant::kNetworkPropertyMode].writer(). |
| 342 | append_uint32(WiFiEndpoint::ModeStringToUint(mode_)); |
| 343 | |
Gaurav Shah | 29d6888 | 2012-01-30 19:06:42 -0800 | [diff] [blame^] | 344 | if (Is8021x()) { |
| 345 | // Is EAP key management is not set, set to a default. |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 346 | if (GetEAPKeyManagement().empty()) |
| 347 | SetEAPKeyManagement("WPA-EAP"); |
| 348 | Populate8021xProperties(¶ms); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 349 | } else if (security_ == flimflam::kSecurityPsk) { |
Gaurav Shah | f8721ee | 2011-11-07 09:12:46 -0800 | [diff] [blame] | 350 | const string psk_proto = StringPrintf("%s %s", |
| 351 | wpa_supplicant::kSecurityModeWPA, |
| 352 | wpa_supplicant::kSecurityModeRSN); |
| 353 | params[wpa_supplicant::kPropertySecurityProtocol].writer(). |
| 354 | append_string(psk_proto.c_str()); |
| 355 | params[wpa_supplicant::kPropertyPreSharedKey].writer(). |
| 356 | append_string(passphrase_.c_str()); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 357 | } else if (security_ == flimflam::kSecurityRsn) { |
mukesh agrawal | f2fd745 | 2011-10-03 16:38:47 -0700 | [diff] [blame] | 358 | params[wpa_supplicant::kPropertySecurityProtocol].writer(). |
| 359 | append_string(wpa_supplicant::kSecurityModeRSN); |
| 360 | params[wpa_supplicant::kPropertyPreSharedKey].writer(). |
| 361 | append_string(passphrase_.c_str()); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 362 | } else if (security_ == flimflam::kSecurityWpa) { |
| 363 | params[wpa_supplicant::kPropertySecurityProtocol].writer(). |
| 364 | append_string(wpa_supplicant::kSecurityModeWPA); |
| 365 | params[wpa_supplicant::kPropertyPreSharedKey].writer(). |
| 366 | append_string(passphrase_.c_str()); |
| 367 | } else if (security_ == flimflam::kSecurityWep) { |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 368 | params[wpa_supplicant::kPropertyAuthAlg].writer(). |
| 369 | append_string(wpa_supplicant::kSecurityAuthAlg); |
| 370 | Error error; |
| 371 | int key_index; |
| 372 | std::vector<uint8> password_bytes; |
| 373 | ParseWEPPassphrase(passphrase_, &key_index, &password_bytes, &error); |
| 374 | writer = params[wpa_supplicant::kPropertyWEPKey + |
| 375 | base::IntToString(key_index)].writer(); |
| 376 | writer << password_bytes; |
| 377 | params[wpa_supplicant::kPropertyWEPTxKeyIndex].writer(). |
| 378 | append_uint32(key_index); |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 379 | } else if (security_ == flimflam::kSecurityNone) { |
Gaurav Shah | f8721ee | 2011-11-07 09:12:46 -0800 | [diff] [blame] | 380 | // Nothing special to do here. |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 381 | } else { |
Gaurav Shah | f8721ee | 2011-11-07 09:12:46 -0800 | [diff] [blame] | 382 | LOG(ERROR) << "Can't connect. Unsupported security method " << security_; |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 383 | } |
| 384 | |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 385 | params[wpa_supplicant::kNetworkPropertyEapKeyManagement].writer(). |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 386 | append_string(key_management().c_str()); |
Gaurav Shah | 7ad8e53 | 2011-11-11 17:14:49 -0800 | [diff] [blame] | 387 | |
| 388 | // See note in dbus_adaptor.cc on why we need to use a local. |
mukesh agrawal | 6e27777 | 2011-09-29 15:04:23 -0700 | [diff] [blame] | 389 | writer = params[wpa_supplicant::kNetworkPropertySSID].writer(); |
| 390 | writer << ssid_; |
| 391 | |
| 392 | wifi_->ConnectTo(this, params); |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 393 | } |
| 394 | |
mukesh agrawal | 0ed0f2e | 2011-12-05 20:36:17 +0000 | [diff] [blame] | 395 | void WiFiService::DisconnectTask() { |
| 396 | wifi_->DisconnectFrom(this); |
| 397 | } |
| 398 | |
Gaurav Shah | 1b7a616 | 2011-11-09 11:41:01 -0800 | [diff] [blame] | 399 | string WiFiService::GetDeviceRpcId(Error */*error*/) { |
Chris Masone | 95207da | 2011-06-29 16:50:49 -0700 | [diff] [blame] | 400 | return wifi_->GetRpcIdentifier(); |
| 401 | } |
| 402 | |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 403 | void WiFiService::UpdateConnectable() { |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 404 | bool is_connectable = false; |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 405 | if (security_ == flimflam::kSecurityNone) { |
| 406 | DCHECK(passphrase_.empty()); |
Paul Stewart | d8ad3c4 | 2012-01-09 12:39:38 -0800 | [diff] [blame] | 407 | need_passphrase_ = false; |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 408 | is_connectable = true; |
Gaurav Shah | 29d6888 | 2012-01-30 19:06:42 -0800 | [diff] [blame^] | 409 | } else if (Is8021x()) { |
| 410 | is_connectable = Is8021xConnectable(); |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 411 | } else if (security_ == flimflam::kSecurityWep || |
| 412 | security_ == flimflam::kSecurityWpa || |
| 413 | security_ == flimflam::kSecurityPsk || |
| 414 | security_ == flimflam::kSecurityRsn) { |
Paul Stewart | d8ad3c4 | 2012-01-09 12:39:38 -0800 | [diff] [blame] | 415 | need_passphrase_ = passphrase_.empty(); |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 416 | is_connectable = !need_passphrase_; |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 417 | } |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 418 | set_connectable(is_connectable); |
mukesh agrawal | 29c13a1 | 2011-11-24 00:09:19 +0000 | [diff] [blame] | 419 | } |
| 420 | |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 421 | // static |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 422 | void WiFiService::ValidateWEPPassphrase(const std::string &passphrase, |
| 423 | Error *error) { |
| 424 | ParseWEPPassphrase(passphrase, NULL, NULL, error); |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 425 | } |
| 426 | |
| 427 | // static |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 428 | void WiFiService::ValidateWPAPassphrase(const std::string &passphrase, |
| 429 | Error *error) { |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 430 | unsigned int length = passphrase.length(); |
| 431 | vector<uint8> passphrase_bytes; |
| 432 | |
| 433 | if (base::HexStringToBytes(passphrase, &passphrase_bytes)) { |
| 434 | if (length != IEEE_80211::kWPAHexLen && |
| 435 | (length < IEEE_80211::kWPAAsciiMinLen || |
| 436 | length > IEEE_80211::kWPAAsciiMaxLen)) { |
| 437 | error->Populate(Error::kInvalidPassphrase); |
| 438 | } |
| 439 | } else { |
| 440 | if (length < IEEE_80211::kWPAAsciiMinLen || |
| 441 | length > IEEE_80211::kWPAAsciiMaxLen) { |
| 442 | error->Populate(Error::kInvalidPassphrase); |
| 443 | } |
| 444 | } |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 445 | } |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 446 | |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 447 | // static |
| 448 | void WiFiService::ParseWEPPassphrase(const string &passphrase, |
| 449 | int *key_index, |
| 450 | std::vector<uint8> *password_bytes, |
| 451 | Error *error) { |
| 452 | unsigned int length = passphrase.length(); |
| 453 | int key_index_local; |
| 454 | std::string password_text; |
| 455 | bool is_hex = false; |
| 456 | |
| 457 | switch (length) { |
| 458 | case IEEE_80211::kWEP40AsciiLen: |
| 459 | case IEEE_80211::kWEP104AsciiLen: |
| 460 | key_index_local = 0; |
| 461 | password_text = passphrase; |
| 462 | break; |
| 463 | case IEEE_80211::kWEP40AsciiLen + 2: |
| 464 | case IEEE_80211::kWEP104AsciiLen + 2: |
| 465 | if (CheckWEPKeyIndex(passphrase, error)) { |
| 466 | base::StringToInt(passphrase.substr(0,1), &key_index_local); |
| 467 | password_text = passphrase.substr(2); |
| 468 | } |
| 469 | break; |
| 470 | case IEEE_80211::kWEP40HexLen: |
| 471 | case IEEE_80211::kWEP104HexLen: |
| 472 | if (CheckWEPIsHex(passphrase, error)) { |
| 473 | key_index_local = 0; |
| 474 | password_text = passphrase; |
| 475 | is_hex = true; |
| 476 | } |
| 477 | break; |
| 478 | case IEEE_80211::kWEP40HexLen + 2: |
| 479 | case IEEE_80211::kWEP104HexLen + 2: |
| 480 | if(CheckWEPKeyIndex(passphrase, error) && |
| 481 | CheckWEPIsHex(passphrase.substr(2), error)) { |
| 482 | base::StringToInt(passphrase.substr(0,1), &key_index_local); |
| 483 | password_text = passphrase.substr(2); |
| 484 | is_hex = true; |
| 485 | } else if (CheckWEPPrefix(passphrase, error) && |
| 486 | CheckWEPIsHex(passphrase.substr(2), error)) { |
| 487 | key_index_local = 0; |
| 488 | password_text = passphrase.substr(2); |
| 489 | is_hex = true; |
| 490 | } |
| 491 | break; |
| 492 | case IEEE_80211::kWEP40HexLen + 4: |
| 493 | case IEEE_80211::kWEP104HexLen + 4: |
| 494 | if (CheckWEPKeyIndex(passphrase, error) && |
| 495 | CheckWEPPrefix(passphrase.substr(2), error) && |
| 496 | CheckWEPIsHex(passphrase.substr(4), error)) { |
| 497 | base::StringToInt(passphrase.substr(0,1), &key_index_local); |
| 498 | password_text = passphrase.substr(4); |
| 499 | is_hex = true; |
| 500 | } |
| 501 | break; |
| 502 | default: |
| 503 | error->Populate(Error::kInvalidPassphrase); |
| 504 | break; |
| 505 | } |
| 506 | |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 507 | if (error->IsSuccess()) { |
Thieu Le | f4cbda9 | 2011-11-10 23:41:24 +0000 | [diff] [blame] | 508 | if (key_index) |
| 509 | *key_index = key_index_local; |
| 510 | if (password_bytes) { |
| 511 | if (is_hex) |
| 512 | base::HexStringToBytes(password_text, password_bytes); |
| 513 | else |
| 514 | password_bytes->insert(password_bytes->end(), |
| 515 | password_text.begin(), |
| 516 | password_text.end()); |
| 517 | } |
mukesh agrawal | 1a05626 | 2011-10-05 14:36:54 -0700 | [diff] [blame] | 518 | } |
| 519 | } |
| 520 | |
| 521 | // static |
| 522 | bool WiFiService::CheckWEPIsHex(const string &passphrase, Error *error) { |
| 523 | vector<uint8> passphrase_bytes; |
| 524 | if (base::HexStringToBytes(passphrase, &passphrase_bytes)) { |
| 525 | return true; |
| 526 | } else { |
| 527 | error->Populate(Error::kInvalidPassphrase); |
| 528 | return false; |
| 529 | } |
| 530 | } |
| 531 | |
| 532 | // static |
| 533 | bool WiFiService::CheckWEPKeyIndex(const string &passphrase, Error *error) { |
| 534 | if (StartsWithASCII(passphrase, "0:", false) || |
| 535 | StartsWithASCII(passphrase, "1:", false) || |
| 536 | StartsWithASCII(passphrase, "2:", false) || |
| 537 | StartsWithASCII(passphrase, "3:", false)) { |
| 538 | return true; |
| 539 | } else { |
| 540 | error->Populate(Error::kInvalidPassphrase); |
| 541 | return false; |
| 542 | } |
| 543 | } |
| 544 | |
| 545 | // static |
| 546 | bool WiFiService::CheckWEPPrefix(const string &passphrase, Error *error) { |
| 547 | if (StartsWithASCII(passphrase, "0x", false)) { |
| 548 | return true; |
| 549 | } else { |
| 550 | error->Populate(Error::kInvalidPassphrase); |
| 551 | return false; |
| 552 | } |
| 553 | } |
| 554 | |
Paul Stewart | 6ab23a9 | 2011-11-09 17:17:47 -0800 | [diff] [blame] | 555 | // static |
mukesh agrawal | d835b20 | 2011-10-07 15:26:47 -0700 | [diff] [blame] | 556 | bool WiFiService::SanitizeSSID(string *ssid) { |
| 557 | CHECK(ssid); |
| 558 | |
| 559 | size_t ssid_len = ssid->length(); |
| 560 | size_t i; |
| 561 | bool changed = false; |
| 562 | |
| 563 | for (i=0; i < ssid_len; ++i) { |
| 564 | if (!g_ascii_isprint((*ssid)[i])) { |
| 565 | (*ssid)[i] = '?'; |
| 566 | changed = true; |
| 567 | } |
| 568 | } |
| 569 | |
| 570 | return changed; |
| 571 | } |
| 572 | |
Paul Stewart | 6ab23a9 | 2011-11-09 17:17:47 -0800 | [diff] [blame] | 573 | // static |
| 574 | string WiFiService::GetSecurityClass(const string &security) { |
| 575 | if (security == flimflam::kSecurityRsn || |
| 576 | security == flimflam::kSecurityWpa) { |
| 577 | return flimflam::kSecurityPsk; |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 578 | } else { |
Paul Stewart | 6ab23a9 | 2011-11-09 17:17:47 -0800 | [diff] [blame] | 579 | return security; |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 580 | } |
| 581 | } |
| 582 | |
Paul Stewart | a41e38d | 2011-11-11 07:47:29 -0800 | [diff] [blame] | 583 | // static |
| 584 | bool WiFiService::ParseStorageIdentifier(const string &storage_name, |
| 585 | string *address, |
| 586 | string *mode, |
| 587 | string *security) { |
| 588 | vector<string> wifi_parts; |
| 589 | base::SplitString(storage_name, '_', &wifi_parts); |
| 590 | if (wifi_parts.size() != 5 || wifi_parts[0] != flimflam::kTypeWifi) { |
| 591 | return false; |
| 592 | } |
| 593 | *address = wifi_parts[1]; |
| 594 | *mode = wifi_parts[3]; |
| 595 | *security = wifi_parts[4]; |
| 596 | return true; |
| 597 | } |
| 598 | |
Paul Stewart | 6ab23a9 | 2011-11-09 17:17:47 -0800 | [diff] [blame] | 599 | string WiFiService::GetGenericStorageIdentifier() const { |
| 600 | return GetStorageIdentifierForSecurity(GetSecurityClass(security_)); |
| 601 | } |
| 602 | |
Paul Stewart | d08f443 | 2011-11-04 07:48:20 -0700 | [diff] [blame] | 603 | string WiFiService::GetSpecificStorageIdentifier() const { |
| 604 | return GetStorageIdentifierForSecurity(security_); |
| 605 | } |
| 606 | |
| 607 | string WiFiService::GetStorageIdentifierForSecurity( |
| 608 | const string &security) const { |
| 609 | return StringToLowerASCII(base::StringPrintf("%s_%s_%s_%s_%s", |
| 610 | flimflam::kTypeWifi, |
| 611 | wifi_->address().c_str(), |
| 612 | hex_ssid_.c_str(), |
| 613 | mode_.c_str(), |
| 614 | security.c_str())); |
| 615 | } |
| 616 | |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 617 | void WiFiService::set_eap(const EapCredentials &eap) { |
| 618 | Service::set_eap(eap); |
| 619 | UpdateConnectable(); |
| 620 | } |
| 621 | |
Gaurav Shah | 29d6888 | 2012-01-30 19:06:42 -0800 | [diff] [blame^] | 622 | bool WiFiService::Is8021x() const { |
| 623 | if (security_ == flimflam::kSecurity8021x) |
| 624 | return true; |
| 625 | |
| 626 | // Dynamic WEP + 802.1x. |
| 627 | if (security_ == flimflam::kSecurityWep && |
| 628 | GetEAPKeyManagement() == "IEEE8021X") |
| 629 | return true; |
| 630 | return false; |
| 631 | } |
| 632 | |
Gaurav Shah | 10109f2 | 2011-11-11 20:16:22 -0800 | [diff] [blame] | 633 | void WiFiService::Populate8021xProperties( |
| 634 | std::map<string, DBus::Variant> *params) { |
| 635 | typedef std::pair<const char *, const char *> KeyVal; |
| 636 | KeyVal propertyvals[] = { |
| 637 | KeyVal(wpa_supplicant::kNetworkPropertyEapIdentity, eap().identity.c_str()), |
| 638 | KeyVal(wpa_supplicant::kNetworkPropertyEapEap, eap().eap.c_str()), |
| 639 | KeyVal(wpa_supplicant::kNetworkPropertyEapInnerEap, |
| 640 | eap().inner_eap.c_str()), |
| 641 | KeyVal(wpa_supplicant::kNetworkPropertyEapAnonymousIdentity, |
| 642 | eap().anonymous_identity.c_str()), |
| 643 | KeyVal(wpa_supplicant::kNetworkPropertyEapClientCert, |
| 644 | eap().client_cert.c_str()), |
| 645 | KeyVal(wpa_supplicant::kNetworkPropertyEapPrivateKey, |
| 646 | eap().private_key.c_str()), |
| 647 | KeyVal(wpa_supplicant::kNetworkPropertyEapPrivateKeyPassword, |
| 648 | eap().private_key_password.c_str()), |
| 649 | KeyVal(wpa_supplicant::kNetworkPropertyEapCaCert, eap().ca_cert.c_str()), |
| 650 | KeyVal(wpa_supplicant::kNetworkPropertyEapCaPassword, |
| 651 | eap().password.c_str()), |
| 652 | KeyVal(wpa_supplicant::kNetworkPropertyEapCertId, eap().cert_id.c_str()), |
| 653 | KeyVal(wpa_supplicant::kNetworkPropertyEapKeyId, eap().key_id.c_str()), |
| 654 | KeyVal(wpa_supplicant::kNetworkPropertyEapCaCertId, |
| 655 | eap().ca_cert_id.c_str()), |
| 656 | KeyVal(wpa_supplicant::kNetworkPropertyEapPin, eap().pin.c_str()), |
| 657 | // TODO(gauravsh): Support getting CA certificates out of the NSS certdb. |
| 658 | // crosbug.com/25663 |
| 659 | KeyVal(wpa_supplicant::kNetworkPropertyCaPath, wpa_supplicant::kCaPath) |
| 660 | }; |
| 661 | |
| 662 | DBus::MessageIter writer; |
| 663 | for (size_t i = 0; i < arraysize(propertyvals); ++i) { |
| 664 | if (strlen(propertyvals[i].second) > 0) { |
| 665 | (*params)[propertyvals[i].first].writer(). |
| 666 | append_string(propertyvals[i].second); |
| 667 | } |
| 668 | } |
| 669 | } |
| 670 | |
mukesh agrawal | b54601c | 2011-06-07 17:39:22 -0700 | [diff] [blame] | 671 | } // namespace shill |