Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Side by Side Diff: chromeos_network.h

Issue 6293027: Handle new EAP fields and provide backwards compatibility for old (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cros.git@master
Patch Set: Make comma logic more readable. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chromeos_network.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_NETWORK_H_ 5 #ifndef CHROMEOS_NETWORK_H_
6 #define CHROMEOS_NETWORK_H_ 6 #define CHROMEOS_NETWORK_H_
7 7
8 #include <base/basictypes.h> 8 #include <base/basictypes.h>
9 #include <base/logging.h> 9 #include <base/logging.h>
10 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 const char* service_path; 186 const char* service_path;
187 const char* name; 187 const char* name;
188 ConnectionType type; 188 ConnectionType type;
189 ConnectionMode mode; 189 ConnectionMode mode;
190 ConnectionSecurity security; 190 ConnectionSecurity security;
191 ConnectionState state; 191 ConnectionState state;
192 ConnectionError error; 192 ConnectionError error;
193 bool passphrase_required; 193 bool passphrase_required;
194 const char* passphrase; 194 const char* passphrase;
195 const char* identity; 195 const char* identity;
196 const char* cert_path; 196 const char* cert_path; // DEPRECATED - use EAP fields below
197 int64 strength; 197 int64 strength;
198 bool favorite; 198 bool favorite;
199 bool auto_connect; 199 bool auto_connect;
200 const char* device_path; 200 const char* device_path;
201 const char* activation_state_dont_use; // DEPRECATED - use the enum below 201 const char* activation_state_dont_use; // DEPRECATED - use the enum below
202 ActivationState activation_state; 202 ActivationState activation_state;
203 NetworkTechnology network_technology; 203 NetworkTechnology network_technology;
204 NetworkRoamingState roaming_state; 204 NetworkRoamingState roaming_state;
205 bool restricted_pool; // DEPRECATED - use connectivity_state 205 bool restricted_pool; // DEPRECATED - use connectivity_state
206 CarrierInfo* carrier_info; // NULL unless TYPE_CELLULAR 206 CarrierInfo* carrier_info; // NULL unless TYPE_CELLULAR
207 DeviceInfo* device_info; // may point to a member of SystemInfo.devices 207 DeviceInfo* device_info; // may point to a member of SystemInfo.devices
208 bool is_active; 208 bool is_active;
209 bool connectable; 209 bool connectable;
210 ConnectivityState connectivity_state; 210 ConnectivityState connectivity_state;
211 // EAP fields (plus identity from above)
212 const char *eap;
213 const char *inner_eap;
214 const char *anonymous_identity;
215 const char *client_cert;
216 const char *cert_id;
217 const char *private_key;
218 const char *private_key_passwd;
219 const char *key_id;
220 const char *ca_cert;
221 const char *ca_cert_id;
222 const char *pin;
223 const char *password;
211 }; 224 };
212 225
213 struct SystemInfo { 226 struct SystemInfo {
214 bool online; // if Manager.State == "online" 227 bool online; // if Manager.State == "online"
215 int available_technologies; // bitwise OR of bit shifted by ConnectionType 228 int available_technologies; // bitwise OR of bit shifted by ConnectionType
216 int enabled_technologies; // bitwise OR of bit shifted by ConnectionType 229 int enabled_technologies; // bitwise OR of bit shifted by ConnectionType
217 int connected_technologies; // bitwise OR of bit shifted by ConnectionType 230 int connected_technologies; // bitwise OR of bit shifted by ConnectionType
218 ConnectionType default_technology; 231 ConnectionType default_technology;
219 bool offline_mode; 232 bool offline_mode;
220 int service_size; 233 int service_size;
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 extern DeviceNetworkList* (*GetDeviceNetworkList)(); 531 extern DeviceNetworkList* (*GetDeviceNetworkList)();
519 532
520 // Deletes a DeviceNetworkList type that was allocated in the ChromeOS dll. We 533 // Deletes a DeviceNetworkList type that was allocated in the ChromeOS dll. We
521 // need to do this to safely pass data over the dll boundary between our .so 534 // need to do this to safely pass data over the dll boundary between our .so
522 // and Chrome. 535 // and Chrome.
523 extern void (*FreeDeviceNetworkList)(DeviceNetworkList* network_list); 536 extern void (*FreeDeviceNetworkList)(DeviceNetworkList* network_list);
524 537
525 } // namespace chromeos 538 } // namespace chromeos
526 539
527 #endif // CHROMEOS_NETWORK_H_ 540 #endif // CHROMEOS_NETWORK_H_
OLDNEW
« no previous file with comments | « no previous file | chromeos_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698