shill: add support for connecting to WPA-PSK networks
BUG=chromium-os:20897
TEST=unittests, some autotests (see below)
the following autotests now pass, at least in the wifi_vm_config:
- network_WiFiManager.000_SSID_Length_Limit
- network_WiFiSecMat.010CheckWPA_TKIP
- network_WiFiSecMat.011CheckWPA_AES
- network_WiFiSecMat.012CheckWPA_Multi
- network_WiFiSecMat.018CheckWPA_CounterMeasures
Change-Id: Ie7499fd87f661ceef3ef0aae348a08bd43c305f4
Reviewed-on: http://gerrit.chromium.org/gerrit/8586
Tested-by: mukesh agrawal <quiche@google.com>
Reviewed-by: Paul Stewart <pstew@chromium.org>
diff --git a/wifi.h b/wifi.h
index 7687215..919891f 100644
--- a/wifi.h
+++ b/wifi.h
@@ -47,7 +47,9 @@
void ScanDone();
// called by WiFiService
- void ConnectTo(WiFiService *service);
+ virtual void ConnectTo(
+ WiFiService *service,
+ const std::map<std::string, ::DBus::Variant> &service_params);
// called by Manager
virtual WiFiServiceRefPtr GetService(const KeyValueStore &args, Error *error);
@@ -64,16 +66,6 @@
static const char kManagerErrorUnsupportedSecurityMode[];
static const char kManagerErrorUnsupportedServiceType[];
static const char kManagerErrorUnsupportedServiceMode[];
- static const char kSupplicantPath[];
- static const char kSupplicantDBusAddr[];
- static const char kSupplicantWiFiDriver[];
- static const char kSupplicantErrorInterfaceExists[];
- static const char kSupplicantPropertySSID[];
- static const char kSupplicantPropertyNetworkMode[];
- static const char kSupplicantPropertyKeyMode[];
- static const char kSupplicantPropertyScanType[];
- static const char kSupplicantKeyModeNone[];
- static const char kSupplicantScanTypeActive[];
void ScanDoneTask();
void ScanTask();