Commit: 9f0fd68f7877ac8dc234eea35ab2e6e960a2b947 - system-connectivity-wificond (git)

system/connectivity/wificond

Commit MetaInfo

• Révision: 9f0fd68f7877ac8dc234eea35ab2e6e960a2b947 (tree)
• l'heure: 2017-03-17 10:03:31
• Auteur: Ningyuan Wang <nywang@goog...>
• Commiter: Ningyuan Wang

Message de Log

Add wificond API to expose number of associated stations

Bug: 31230864
Test: compile, unit tests, manual test
Change-Id: I28cc755a79c0fb3905a6684ea1281428a5bc2afc

Change Summary

• modified: aidl/android/net/wifi/IApInterface.aidl
• modified: ap_interface_binder.cpp
• modified: ap_interface_binder.h
• modified: ap_interface_impl.cpp
• modified: ap_interface_impl.h
• modified: tests/ap_interface_impl_unittest.cpp

Modification

--- a/aidl/android/net/wifi/IApInterface.aidl
+++ b/aidl/android/net/wifi/IApInterface.aidl
@@ -50,4 +50,8 @@ interface IApInterface {
   @utf8InCpp
   String getInterfaceName();
 
+  // @return Returns the number of associated devices to this hotspot.
+  // Returns -1 on failure.
+  int getNumberOfAssociatedStations();
+
 }

--- a/ap_interface_binder.cpp
+++ b/ap_interface_binder.cpp
@@ -96,5 +96,17 @@ binder::Status ApInterfaceBinder::getInterfaceName(std::string* out_name) {
   return binder::Status::ok();
 }
 
+binder::Status ApInterfaceBinder::getNumberOfAssociatedStations(
+    int* out_num_of_stations) {
+  if (!impl_) {
+    LOG(WARNING) << "Cannot get number of associated stations "
+                 << "from dead ApInterface";
+    *out_num_of_stations = -1;
+    return binder::Status::ok();
+  }
+  *out_num_of_stations = impl_->GetNumberOfAssociatedStations();
+  return binder::Status::ok();
+}
+
 }  // namespace wificond
 }  // namespace android

--- a/ap_interface_binder.h
+++ b/ap_interface_binder.h
@@ -45,6 +45,8 @@ class ApInterfaceBinder : public android::net::wifi::BnApInterface {
                                     const std::vector<uint8_t>& passphrase,
                                     bool* out_success) override;
   binder::Status getInterfaceName(std::string* out_name) override;
+  binder::Status getNumberOfAssociatedStations(
+      int* out_num_of_stations) override;
 
  private:
   ApInterfaceImpl* impl_;

--- a/ap_interface_impl.cpp
+++ b/ap_interface_impl.cpp
@@ -47,7 +47,8 @@ ApInterfaceImpl::ApInterfaceImpl(const string& interface_name,
       netlink_utils_(netlink_utils),
       if_tool_(if_tool),
       hostapd_manager_(hostapd_manager),
-      binder_(new ApInterfaceBinder(this)) {
+      binder_(new ApInterfaceBinder(this)),
+      number_of_associated_stations_(0) {
   // This log keeps compiler happy.
   LOG(DEBUG) << "Created ap interface " << interface_name_
              << " with index " << interface_index_;
@@ -120,12 +121,23 @@ void ApInterfaceImpl::OnStationEvent(StationEvent event,
     LOG(INFO) << "New station "
               << LoggingUtils::GetMacString(mac_address)
               << " associated with hotspot";
+    number_of_associated_stations_++;
   } else if (event == DEL_STATION) {
     LOG(INFO) << "Station "
               << LoggingUtils::GetMacString(mac_address)
               << " disassociated from hotspot";
+    if (number_of_associated_stations_ <= 0) {
+      LOG(ERROR) << "Received DEL_STATION event when station counter is: "
+                 << number_of_associated_stations_;
+    } else {
+      number_of_associated_stations_--;
+    }
   }
 }
 
+int ApInterfaceImpl::GetNumberOfAssociatedStations() const {
+  return number_of_associated_stations_;
+}
+
 }  // namespace wificond
 }  // namespace android

--- a/ap_interface_impl.h
+++ b/ap_interface_impl.h
@@ -59,6 +59,7 @@ class ApInterfaceImpl {
       wifi_system::HostapdManager::EncryptionType encryption_type,
       const std::vector<uint8_t>& passphrase);
   std::string GetInterfaceName() { return interface_name_; }
+  int GetNumberOfAssociatedStations() const;
 
  private:
   const std::string interface_name_;
@@ -68,6 +69,9 @@ class ApInterfaceImpl {
   wifi_system::HostapdManager* const hostapd_manager_;
   const android::sp<ApInterfaceBinder> binder_;
 
+  // Number of associated stations.
+  int number_of_associated_stations_;
+
   void OnStationEvent(StationEvent event,
                       const std::vector<uint8_t>& mac_address);
 

--- a/tests/ap_interface_impl_unittest.cpp
+++ b/tests/ap_interface_impl_unittest.cpp
@@ -30,9 +30,12 @@
 using android::wifi_system::HostapdManager;
 using android::wifi_system::MockHostapdManager;
 using android::wifi_system::MockInterfaceTool;
+using std::placeholders::_1;
+using std::placeholders::_2;
 using std::unique_ptr;
 using std::vector;
 using testing::NiceMock;
+using testing::Invoke;
 using testing::Return;
 using testing::Sequence;
 using testing::StrEq;
@@ -44,6 +47,14 @@ namespace {
 
 const char kTestInterfaceName[] = "testwifi0";
 const uint32_t kTestInterfaceIndex = 42;
+const uint8_t kFakeMacAddress[] = {0x45, 0x54, 0xad, 0x67, 0x98, 0xf6};
+
+void CaptureStationEventHandler(
+    OnStationEventHandler* out_handler,
+    uint32_t interface_index,
+    OnStationEventHandler handler) {
+  *out_handler = handler;
+}
 
 class ApInterfaceImplTest : public ::testing::Test {
  protected:
@@ -59,9 +70,6 @@ class ApInterfaceImplTest : public ::testing::Test {
   unique_ptr<ApInterfaceImpl> ap_interface_;
 
   void SetUp() override {
-    EXPECT_CALL(*netlink_utils_,
-                SubscribeStationEvent(kTestInterfaceIndex, _));
-
     ap_interface_.reset(new ApInterfaceImpl(
         kTestInterfaceName,
         kTestInterfaceIndex,
@@ -115,5 +123,29 @@ TEST_F(ApInterfaceImplTest, ShouldRejectInvalidConfig) {
         vector<uint8_t>()));
 }
 
+TEST_F(ApInterfaceImplTest, CanGetNumberOfAssociatedStations) {
+  OnStationEventHandler handler;
+  EXPECT_CALL(*netlink_utils_,
+      SubscribeStationEvent(kTestInterfaceIndex, _)).
+          WillOnce(Invoke(bind(CaptureStationEventHandler, &handler, _1, _2)));
+
+  ap_interface_.reset(new ApInterfaceImpl(
+        kTestInterfaceName,
+        kTestInterfaceIndex,
+        netlink_utils_.get(),
+        if_tool_.get(),
+        hostapd_manager_.get()));
+
+  vector<uint8_t> fake_mac_address(kFakeMacAddress,
+                                   kFakeMacAddress + sizeof(kFakeMacAddress));
+  EXPECT_EQ(0, ap_interface_->GetNumberOfAssociatedStations());
+  handler(NEW_STATION, fake_mac_address);
+  EXPECT_EQ(1, ap_interface_->GetNumberOfAssociatedStations());
+  handler(NEW_STATION, fake_mac_address);
+  EXPECT_EQ(2, ap_interface_->GetNumberOfAssociatedStations());
+  handler(DEL_STATION, fake_mac_address);
+  EXPECT_EQ(1, ap_interface_->GetNumberOfAssociatedStations());
+}
+
 }  // namespace wificond
 }  // namespace android