commit 445e72cb73f394ae4ce8d160b17642562a3ec987
author mukesh agrawal <quiche@chromium.org> Wed Jun 22 11:13:50 2011 -0700
committer mukesh agrawal <quiche@chromium.org> Thu Jun 23 10:43:53 2011 -0700
tree 66811f22db118a93b8af33c6b419f22f2c58e159
parent 3bd3c8c33917221d1074f1aa19272e45c0ce2793

shill: move D-Bus code out of WiFiService (into WiFi). this
reduces the number of objects that need to understand D-Bus.
(or, at least, understand it in depth.)

BUG=chromium-os:16837
TEST=manual: run shill on chromebook, use dbus-send
to initiate association, observe associated state

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

wifi.h

diff --git a/wifi.h b/wifi.h
index bdd4415..00d723e 100644
--- a/wifi.h
+++ b/wifi.h
@@ -17,6 +17,7 @@
 namespace shill {
 
 class WiFiEndpoint;
+class WiFiService;
 typedef scoped_refptr<const WiFiEndpoint> WiFiEndpointConstRefPtr;
 typedef scoped_refptr<WiFiEndpoint> WiFiEndpointRefPtr;
 
@@ -39,10 +40,8 @@
                 const std::map<std::string, ::DBus::Variant> &properties);
   void ScanDone();
 
-  // called by WiFiService, to effect changes to wpa_supplicant
-  ::DBus::Path AddNetwork(
-      const std::map<std::string, ::DBus::Variant> &args);
-  void SelectNetwork(const ::DBus::Path &network);
+  // called by WiFiService
+  void ConnectTo(const WiFiService &service);
 
  private:
   // SupplicantProcessProxy. provides access to wpa_supplicant's
@@ -105,6 +104,9 @@
   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 kSupplicantKeyModeNone[];
 
   void RealScanDone();