Merge "Support for Wi-Fi Direct R2" into main
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..e9ea3dd
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "postsubmit": [
+ {
+ "name": "libhostapd_aidl_bp_unittest"
+ }
+ ]
+}
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index d5d1190..680c572 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1209,7 +1209,7 @@
endif
ifeq ($(HOSTAPD_USE_AIDL), y)
LOCAL_SHARED_LIBRARIES += android.hardware.wifi.hostapd-V3-ndk
-LOCAL_SHARED_LIBRARIES += android.hardware.wifi.common-V1-ndk
+LOCAL_SHARED_LIBRARIES += android.hardware.wifi.common-V2-ndk
LOCAL_SHARED_LIBRARIES += libbase libutils
LOCAL_SHARED_LIBRARIES += libbinder_ndk
LOCAL_STATIC_LIBRARIES += libhostapd_aidl
@@ -1264,7 +1264,7 @@
aidl/hostapd.cpp
LOCAL_SHARED_LIBRARIES := \
android.hardware.wifi.hostapd-V3-ndk \
- android.hardware.wifi.common-V1-ndk \
+ android.hardware.wifi.common-V2-ndk \
libbinder_ndk \
libbase \
libutils \
diff --git a/hostapd/aidl/hostapd.cpp b/hostapd/aidl/hostapd.cpp
index ce32564..d58b1ed 100644
--- a/hostapd/aidl/hostapd.cpp
+++ b/hostapd/aidl/hostapd.cpp
@@ -35,6 +35,31 @@
#include "drivers/linux_ioctl.h"
}
+// don't use hostapd's wpa_printf for unit testing. It won't compile otherwise
+#ifdef ANDROID_HOSTAPD_UNITTEST
+#include <android-base/logging.h>
+constexpr size_t logbuf_size = 8192;
+static ::android::base::LogSeverity wpa_to_android_level(int level)
+{
+ if (level == MSG_ERROR)
+ return ::android::base::ERROR;
+ if (level == MSG_WARNING)
+ return ::android::base::WARNING;
+ if (level == MSG_INFO)
+ return ::android::base::INFO;
+ return ::android::base::DEBUG;
+}
+void wpa_printf(int level, const char *fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ char buffer[logbuf_size];
+ int res = snprintf(buffer, logbuf_size, fmt, ap);
+ if (res > 0 && res < logbuf_size) {
+ LOG(wpa_to_android_level(level)) << buffer;
+ }
+}
+#endif
+
// The AIDL implementation for hostapd creates a hostapd.conf dynamically for
// each interface. This file can then be used to hook onto the normal config
// file parsing logic in hostapd code. Helps us to avoid duplication of code
@@ -861,23 +886,39 @@
}
}
+std::optional<struct sta_info*> getStaInfoByMacAddr(const struct hostapd_data* iface_hapd,
+ const u8 *mac_addr) {
+ if (iface_hapd == nullptr || mac_addr == nullptr){
+ wpa_printf(MSG_ERROR, "nullptr passsed to getStaInfoByMacAddr!");
+ return std::nullopt;
+ }
+
+ for (struct sta_info* sta_ptr = iface_hapd->sta_list; sta_ptr; sta_ptr = sta_ptr->next) {
+ int res;
+ res = memcmp(sta_ptr->addr, mac_addr, ETH_ALEN);
+ if (res == 0) {
+ return sta_ptr;
+ }
+ }
+ return std::nullopt;
+}
+
bool forceStaDisconnection(struct hostapd_data* hapd,
const std::vector<uint8_t>& client_address,
const uint16_t reason_code) {
- struct sta_info *sta;
if (client_address.size() != ETH_ALEN) {
return false;
}
- for (sta = hapd->sta_list; sta; sta = sta->next) {
- int res;
- res = memcmp(sta->addr, client_address.data(), ETH_ALEN);
- if (res == 0) {
- wpa_printf(MSG_INFO, "Force client:" MACSTR " disconnect with reason: %d",
- MAC2STR(client_address.data()), reason_code);
- ap_sta_disconnect(hapd, sta, sta->addr, reason_code);
- return true;
- }
+
+ auto sta_ptr_optional = getStaInfoByMacAddr(hapd, client_address.data());
+ if (sta_ptr_optional.has_value()) {
+ wpa_printf(MSG_INFO, "Force client:" MACSTR " disconnect with reason: %d",
+ MAC2STR(client_address.data()), reason_code);
+ ap_sta_disconnect(hapd, sta_ptr_optional.value(), sta_ptr_optional.value()->addr,
+ reason_code);
+ return true;
}
+
return false;
}
@@ -1266,6 +1307,15 @@
info.apIfaceInstance = instanceName;
info.clientAddress.assign(mac_addr, mac_addr + ETH_ALEN);
info.isConnected = authorized;
+ if(isAidlServiceVersionAtLeast(3) && !authorized) {
+ u16 disconnect_reason_code = WLAN_REASON_UNSPECIFIED;
+ auto sta_ptr_optional = getStaInfoByMacAddr(iface_hapd, mac_addr);
+ if (sta_ptr_optional.has_value()){
+ disconnect_reason_code = sta_ptr_optional.value()->deauth_reason;
+ }
+ info.disconnectReasonCode =
+ static_cast<common::DeauthenticationReasonCode>(disconnect_reason_code);
+ }
for (const auto &callback : callbacks_) {
auto status = callback->onConnectedClientsChanged(info);
if (!status.isOk()) {
diff --git a/hostapd/aidl/tests/Android.bp b/hostapd/aidl/tests/Android.bp
new file mode 100644
index 0000000..51444d2
--- /dev/null
+++ b/hostapd/aidl/tests/Android.bp
@@ -0,0 +1,56 @@
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ default_team: "trendy_team_fwk_wifi_hal",
+ default_applicable_licenses: [
+ "external_wpa_supplicant_8_license",
+ "external_wpa_supplicant_8_hostapd_license",
+ ],
+}
+
+cc_test {
+ name: "libhostapd_aidl_bp_unittest",
+ defaults: [
+ "hostapd_cflags_defaults",
+ ],
+ require_root: true,
+ soc_specific: true,
+ srcs: [
+ "unittests.cpp",
+ ],
+ shared_libs: [
+ "android.hardware.wifi.hostapd-V3-ndk",
+ "libbinder_ndk",
+ "libbase",
+ "libutils",
+ "liblog",
+ ],
+ static_libs: [
+ "libgtest",
+ ],
+ header_libs: [
+ "hostapd_headers",
+ "libhostapd_aidl_headers",
+ ],
+ cppflags: [
+ "-DANDROID_HOSTAPD_UNITTEST",
+ ],
+ test_options: {
+ unit_test: true,
+ },
+ test_suites: [
+ "general-tests",
+ ],
+}
diff --git a/hostapd/aidl/tests/unittests.cpp b/hostapd/aidl/tests/unittests.cpp
new file mode 100644
index 0000000..900f043
--- /dev/null
+++ b/hostapd/aidl/tests/unittests.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cstring>
+
+#include <gtest/gtest.h>
+#include "../hostapd.cpp"
+
+namespace aidl::android::hardware::wifi::hostapd {
+
+/**
+ * Null hostapd_data* and null mac address (u8*)
+ * There's an || check on these that should return nullopt
+ */
+TEST(getStaInfoByMacAddrTest, NullArguments) {
+ EXPECT_EQ(std::nullopt, getStaInfoByMacAddr(nullptr, nullptr));
+}
+
+
+/**
+ * We pass valid arguments to get past the nullptr check, but hostapd_data->sta_list is nullptr.
+ * Don't loop through the sta_info* list, just return nullopt.
+ */
+TEST(getStaInfoByMacAddrTest, NullStaList) {
+ struct hostapd_data iface_hapd = {};
+ u8 mac_addr[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xD0, 0x0D};
+ EXPECT_EQ(std::nullopt, getStaInfoByMacAddr(&iface_hapd, mac_addr));
+}
+
+/**
+ * Mac doesn't match, and we hit the end of the sta_info list.
+ * Don't run over the end of the list and return nullopt.
+ */
+TEST(getStaInfoByMacAddrTest, NoMatchingMac) {
+ struct hostapd_data iface_hapd = {};
+ struct sta_info sta0 = {};
+ struct sta_info sta1 = {};
+ struct sta_info sta2 = {};
+ iface_hapd.sta_list = &sta0;
+ sta0.next = &sta1;
+ sta1.next = &sta2;
+ u8 mac_addr[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xD0, 0x0D};
+ EXPECT_EQ(std::nullopt, getStaInfoByMacAddr(&iface_hapd, mac_addr));
+}
+
+/**
+ * There is a matching address and we return it.
+ */
+TEST(getStaInfoByMacAddr, MatchingMac) {
+ struct hostapd_data iface_hapd = {};
+ struct sta_info sta0 = {};
+ struct sta_info sta1 = {};
+ struct sta_info sta2 = {};
+ iface_hapd.sta_list = &sta0;
+ sta0.next = &sta1;
+ sta1.next = &sta2;
+ u8 sta0_addr[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xD0, 0x0C}; // off by 1 bit
+ std::memcpy(sta0.addr, sta0_addr, ETH_ALEN);
+ u8 sta1_addr[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xD0, 0x0D};
+ std::memcpy(sta1.addr, sta1_addr, ETH_ALEN);
+ u8 mac_addr[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xD0, 0x0D};
+ auto sta_ptr_optional = getStaInfoByMacAddr(&iface_hapd, mac_addr);
+ EXPECT_TRUE(sta_ptr_optional.has_value());
+ EXPECT_EQ(0, std::memcmp(sta_ptr_optional.value()->addr, sta1_addr, ETH_ALEN));
+}
+
+} // namespace aidl::android::hardware::wifi::hostapd
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 13613db..aa7e156 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -1625,6 +1625,7 @@
if (sta == NULL)
return;
+ sta->deauth_reason = reason;
ap_sta_set_authorized(hapd, sta, 0);
sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
hostapd_set_sta_flags(hapd, sta);
@@ -1654,7 +1655,6 @@
return;
}
- sta->deauth_reason = reason;
sta->flags |= WLAN_STA_PENDING_DEAUTH_CB;
eloop_cancel_timeout(ap_sta_deauth_cb_timeout, hapd, sta);
eloop_register_timeout(hapd->iface->drv_flags &
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index d5dfec9..3e6f88d 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -6254,7 +6254,9 @@
#ifdef MAINLINE_SUPPLICANT
static bool is_event_allowlisted(enum wpa_event_type event) {
- return event == EVENT_RX_MGMT ||
+ return event == EVENT_SCAN_STARTED ||
+ event == EVENT_SCAN_RESULTS ||
+ event == EVENT_RX_MGMT ||
event == EVENT_REMAIN_ON_CHANNEL ||
event == EVENT_CANCEL_REMAIN_ON_CHANNEL ||
event == EVENT_TX_WAIT_EXPIRE;