wifi(implementation): Move set/getMacaddress to a util class
This is just a refactor to move the setMacAddress & getFactoryMacAddress
methods to a util class within the HAL. This can be then reused in AP
iface for mac randomization of SoftAp.
This also fixes a bug in the existing setMacAddress() method, the
current method always sets wlan0 up/down. STA interface could be wlan1
on some devices.
Bug: 78353419
Test: ./hardware/interfaces/wifi/1.3/default/tests/runtests.sh
Test: Manually verified STA MAC randomization still works.
Change-Id: I0bb8154f7e6dcae37c977454423c8c299762260e
diff --git a/wifi/1.3/default/wifi_sta_iface.cpp b/wifi/1.3/default/wifi_sta_iface.cpp
index f7157a3..17f3e3d 100644
--- a/wifi/1.3/default/wifi_sta_iface.cpp
+++ b/wifi/1.3/default/wifi_sta_iface.cpp
@@ -30,8 +30,12 @@
WifiStaIface::WifiStaIface(
const std::string& ifname,
- const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
- : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
+ const std::weak_ptr<iface_util::WifiIfaceUtil> iface_util)
+ : ifname_(ifname),
+ legacy_hal_(legacy_hal),
+ iface_util_(iface_util),
+ is_valid_(true) {
// Turn on DFS channel usage for STA iface.
legacy_hal::wifi_error legacy_status =
legacy_hal_.lock()->setDfsFlag(ifname_, true);
@@ -622,28 +626,17 @@
WifiStatus WifiStaIface::setMacAddressInternal(
const std::array<uint8_t, 6>& mac) {
- if (!iface_tool_.SetWifiUpState(false)) {
- LOG(ERROR) << "SetWifiUpState(false) failed.";
+ bool status = iface_util_.lock()->setMacAddress(ifname_, mac);
+ if (!status) {
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN);
}
-
- if (!iface_tool_.SetMacAddress(ifname_.c_str(), mac)) {
- LOG(ERROR) << "SetMacAddress failed.";
- return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN);
- }
-
- if (!iface_tool_.SetWifiUpState(true)) {
- LOG(ERROR) << "SetWifiUpState(true) failed.";
- return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN);
- }
- LOG(DEBUG) << "Successfully SetMacAddress.";
return createWifiStatus(WifiStatusCode::SUCCESS);
}
std::pair<WifiStatus, std::array<uint8_t, 6>>
WifiStaIface::getFactoryMacAddressInternal() {
std::array<uint8_t, 6> mac =
- iface_tool_.GetFactoryMacAddress(ifname_.c_str());
+ iface_util_.lock()->getFactoryMacAddress(ifname_);
return {createWifiStatus(WifiStatusCode::SUCCESS), mac};
}