commit d13249c35eb0c5281c422a3c17a252b5cc8c865d
author Peter Qiu <zqiu@google.com> Tue Oct 27 14:42:32 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 05 21:49:02 2015 +0000
tree e8768147afc8b44be55559002aa8192834003230
parent 15d5431798155cc83a3fcb8abe0d1a2d5128f7b6

Restore interface mode back to station when AP mode setter vanished

This allows shill to manage the WiFi interface when AP mode setter
(apmanager) crashed.

While there, hide the code under WiFi compiler flag as well. Since
these two APIs are only applicable when WiFi is enabled.

Bug: 25111635
TEST=Manual test on Brillo devices:
TEST=1. bootup device in WiFi bootstrapping mode (interface in AP mode)
TEST=2. kill apmanager, verify WiFi interface is set to station mode
TEST=newly added unit tests

Change-Id: I83a8d3916eb6cb006631a607957aff34ed5809ff

manager.h

diff --git a/manager.h b/manager.h
index 77001fa..7baf598 100644
--- a/manager.h
+++ b/manager.h
@@ -66,6 +66,10 @@
 
 #if !defined(DISABLE_WIFI)
 class WiFiProvider;
+#if defined(__BRILLO__)
+class RPCServiceWatcherInterface;
+class WiFiDriverHal;
+#endif  // __BRILLO__
 #endif  // DISABLE_WIFI
 
 #if !defined(DISABLE_WIRED_8021X)
@@ -240,8 +244,12 @@
   // Setup an AP mode interface using WiFi driver HAL.  The driver
   // may or may not teardown the station mode interface as a result
   // of this call.  This behavior will be driver specific.
+  // Service watcher will be set up for the requester |sender_name|, and
+  // restore back to station mode if the requester vanished.
   // Returns true and sets |interface_name| on success, false otherwise.
-  bool SetupApModeInterface(std::string* out_interface_name, Error* error);
+  bool SetupApModeInterface(const std::string& sender_name,
+                            std::string* out_interface_name,
+                            Error* error);
 
   // Setup a station mode interface using WiFi driver HAL.  The driver
   // may or may not teardown the AP mode interface as a result of this
@@ -583,6 +591,7 @@
   FRIEND_TEST(ManagerTest, LinkMonitorEnabled);
   FRIEND_TEST(ManagerTest, MoveService);
   FRIEND_TEST(ManagerTest, NotifyDefaultServiceChanged);
+  FRIEND_TEST(ManagerTest, OnApModeSetterVanished);
   FRIEND_TEST(ManagerTest, OnDeviceClaimerAppeared);
   FRIEND_TEST(ManagerTest, PopProfileWithUnload);
   FRIEND_TEST(ManagerTest, RegisterKnownService);
@@ -590,6 +599,8 @@
   FRIEND_TEST(ManagerTest, ReleaseDevice);
   FRIEND_TEST(ManagerTest, RunTerminationActions);
   FRIEND_TEST(ManagerTest, ServiceRegistration);
+  FRIEND_TEST(ManagerTest, SetupApModeInterface);
+  FRIEND_TEST(ManagerTest, SetupStationModeInterface);
   FRIEND_TEST(ManagerTest, SortServicesWithConnection);
   FRIEND_TEST(ManagerTest, StartupPortalList);
   FRIEND_TEST(ServiceTest, IsAutoConnectable);
@@ -740,6 +751,10 @@
   void VerifyToEncryptLink(std::string public_key, std::string data,
                            ResultStringCallback cb, const Error& error,
                            bool success);
+
+#if defined(__BRILLO__)
+  void OnApModeSetterVanished();
+#endif  // __BRILLO__
 #endif  // DISABLE_WIFI
 
   // Return true if wifi device is enabled with no existing connection (pending
@@ -783,6 +798,10 @@
   std::unique_ptr<VPNProvider> vpn_provider_;
 #if !defined(DISABLE_WIFI)
   std::unique_ptr<WiFiProvider> wifi_provider_;
+#if defined(__BRILLO__)
+  WiFiDriverHal* wifi_driver_hal_;
+  std::unique_ptr<RPCServiceWatcherInterface> watcher_for_ap_mode_setter_;
+#endif  // __BRILLO__
 #endif  // DISABLE_WIFI
 #if !defined(DISABLE_WIMAX)
   std::unique_ptr<WiMaxProvider> wimax_provider_;