commit 4a66cc5e91ad82743ab196257438e3a0c313aab7
author Darin Petkov <petkov@chromium.org> Fri Jun 15 10:08:29 2012 +0200
committer Gerrit <chrome-bot@google.com> Fri Jun 15 14:34:56 2012 -0700
tree b1fe924a547da88430cc3283a92b4e61eab2ca0d
parent 3a4100c44c9676f17829de5bcb23e883bd970ef7

shill: wifi: Disable or reduce frequency of background scan.

For details, see corresponding flimflam patch:

https://gerrit.chromium.org/gerrit/#change,24960

Also, rename per style and fix a bug in NumEndpoints (returning bool
rather than an int) and add more unit tests.

BUG=chromium-os:31715
TEST=unit tests

Change-Id: I9b0c6f1abc660a44a43f34b1dec2230c6cf6cfde
Reviewed-on: https://gerrit.chromium.org/gerrit/25376
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

wifi.h

diff --git a/wifi.h b/wifi.h
index be6a055..ae9db3d 100644
--- a/wifi.h
+++ b/wifi.h
@@ -156,6 +156,7 @@
  private:
   friend class WiFiObjectTest;  // access to supplicant_*_proxy_, link_up_
   friend class WiFiScanTest;  // kNumFastScanAttempts, kFastScanIntervalSeconds
+  FRIEND_TEST(WiFiMainTest, AppendBgscan);
   FRIEND_TEST(WiFiMainTest, FlushBSSOnResume);  // kMaxBSSResumeAgeSeconds
   FRIEND_TEST(WiFiMainTest, InitialSupplicantState);  // kInterfaceStateUnknown
   FRIEND_TEST(WiFiMainTest, ScanResults);             // EndpointMap
@@ -164,7 +165,7 @@
   FRIEND_TEST(WiFiMainTest, SuspectCredentialsOpen);  // SuspectCredentials
   FRIEND_TEST(WiFiMainTest, SuspectCredentialsWPANeverConnected);  // as above
   FRIEND_TEST(WiFiMainTest, SuspectCredentialsWPAPreviouslyConnected);  // ""
-  FRIEND_TEST(WiFiPropertyTest, ClearDerivedProperty);  // bgscan_method_
+  FRIEND_TEST(WiFiPropertyTest, BgscanMethodProperty);  // bgscan_method_
   FRIEND_TEST(WiFiScanTest, FastRescan);  // kFastScanIntervalSeconds
 
   typedef std::map<const std::string, WiFiEndpointRefPtr> EndpointMap;
@@ -174,6 +175,7 @@
   static const uint16 kDefaultBgscanShortIntervalSeconds;
   static const int32 kDefaultBgscanSignalThresholdDbm;
   static const uint16 kDefaultScanIntervalSeconds;
+  static const uint16 kBackgroundScanIntervalSeconds;
   static const char kManagerErrorSSIDTooLong[];
   static const char kManagerErrorSSIDTooShort[];
   static const char kManagerErrorSSIDRequired[];
@@ -187,8 +189,9 @@
   static const int kNumFastScanAttempts;
   static const int kFastScanIntervalSeconds;
 
-  std::string CreateBgscanConfigString();
-  std::string GetBgscanMethod(Error */* error */) { return bgscan_method_; }
+  void AppendBgscan(WiFiService *service,
+                    std::map<std::string, DBus::Variant> *service_params) const;
+  std::string GetBgscanMethod(const int &argument, Error *error);
   uint16 GetBgscanShortInterval(Error */* error */) {
     return bgscan_short_interval_seconds_;
   }
@@ -196,10 +199,12 @@
     return bgscan_signal_threshold_dbm_;
   }
   uint16 GetScanInterval(Error */* error */) { return scan_interval_seconds_; }
-  void SetBgscanMethod(const std::string &method, Error *error);
+  void SetBgscanMethod(
+      const int &argument, const std::string &method, Error *error);
   void SetBgscanShortInterval(const uint16 &seconds, Error *error);
   void SetBgscanSignalThreshold(const int32 &dbm, Error *error);
   void SetScanInterval(const uint16 &seconds, Error *error);
+  void ClearBgscanMethod(const int &argument, Error *error);
 
   WiFiServiceRefPtr CreateServiceForEndpoint(
       const WiFiEndpoint &endpoint, bool hidden_ssid);
@@ -232,11 +237,6 @@
       const std::string &name,
       int32(WiFi::*get)(Error *error),
       void(WiFi::*set)(const int32 &value, Error *error));
-  void HelpRegisterDerivedString(
-      PropertyStore *store,
-      const std::string &name,
-      std::string(WiFi::*get)(Error *error),
-      void(WiFi::*set)(const std::string &value, Error *error));
   void HelpRegisterDerivedUint16(
       PropertyStore *store,
       const std::string &name,