commit f2fd745d303a73a5820caad7f98d739fef12bb49
author mukesh agrawal <quiche@chromium.org> Mon Oct 03 16:38:47 2011 -0700
committer mukesh agrawal <quiche@chromium.org> Wed Oct 05 10:50:40 2011 -0700
tree 17350acdca3a910ea95b8984ddf7d86f9650d341
parent 8ede052be929e07a8fa5d46af1996242bf5f7fc8

shill: add support for connecting to RSN networks

BUG=chromium-os:20897
TEST=unittests and some autotests

the following autotests now pass, at least in the wifi_vm_config:
- network_WiFiManager.000_SSID_Length_Limit
- network_WiFiManager.021CheckWPA_BadPassphraseLength
- network_WiFiSecMat.010CheckWPA_TKIP
* network_WiFiSecMat.011CheckWPA_AES
- network_WiFiSecMat.012CheckWPA_Multi
* network_WiFiSecMat.013CheckWPA_Mixed
* network_WiFiSecMat.015CheckWPA_PTK_Rekey
* network_WiFiSecMat.016CheckWPA_GTK_Rekey
- network_WiFiSecMat.018CheckWPA_CounterMeasures
* network_WiFiSecMat.020CheckRSN

'*' denotes a newly passing test

Change-Id: I5ed6e7267fa2ee26c4e76a53a935b0662865f962
Reviewed-on: http://gerrit.chromium.org/gerrit/8709
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

wifi_service.cc

diff --git a/wifi_service.cc b/wifi_service.cc
index 861e969..daeb80f 100644
--- a/wifi_service.cc
+++ b/wifi_service.cc
@@ -139,7 +139,10 @@
   } else if (security_ == flimflam::kSecurityPsk) {
     NOTIMPLEMENTED();
   } else if (security_ == flimflam::kSecurityRsn) {
-    NOTIMPLEMENTED();
+    params[wpa_supplicant::kPropertySecurityProtocol].writer().
+        append_string(wpa_supplicant::kSecurityModeRSN);
+    params[wpa_supplicant::kPropertyPreSharedKey].writer().
+        append_string(passphrase_.c_str());
   } else if (security_ == flimflam::kSecurityWpa) {
     params[wpa_supplicant::kPropertySecurityProtocol].writer().
         append_string(wpa_supplicant::kSecurityModeWPA);

wifi_service.h

diff --git a/wifi_service.h b/wifi_service.h
index a6e7aa6..a68d3b7 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -44,7 +44,8 @@
   const std::vector<uint8_t> &ssid() const;
 
  private:
-  FRIEND_TEST(WiFiServiceTest, ConnectTask);
+  FRIEND_TEST(WiFiServiceTest, ConnectTaskRSN);
+  FRIEND_TEST(WiFiServiceTest, ConnectTaskWPA);
 
   void ConnectTask();
 

wifi_service_unittest.cc

diff --git a/wifi_service_unittest.cc b/wifi_service_unittest.cc
index cd68eca..e6ec165 100644
--- a/wifi_service_unittest.cc
+++ b/wifi_service_unittest.cc
@@ -79,7 +79,7 @@
   EXPECT_NE(id.find(string(flimflam::kModeManaged), mac_pos), string::npos);
 }
 
-TEST_F(WiFiServiceTest, ConnectTask) {
+TEST_F(WiFiServiceTest, ConnectTaskWPA) {
   vector<uint8_t> ssid(5, 0);
   WiFiServiceRefPtr wifi_service = new WiFiService(control_interface(),
                                                    dispatcher(),
@@ -93,4 +93,18 @@
   wifi_service->ConnectTask();
 }
 
+TEST_F(WiFiServiceTest, ConnectTaskRSN) {
+  vector<uint8_t> ssid(5, 0);
+  WiFiServiceRefPtr wifi_service = new WiFiService(control_interface(),
+                                                   dispatcher(),
+                                                   manager(),
+                                                   wifi(),
+                                                   ssid,
+                                                   flimflam::kModeManaged,
+                                                   flimflam::kSecurityRsn);
+  EXPECT_CALL(*wifi(),
+              ConnectTo(wifi_service.get(), WPASecurityArgs()));
+  wifi_service->ConnectTask();
+}
+
 }  // namespace shill