Support for P2P Compatibility Mode
This CL includes,
1. Function to get the features supported by P2P interface.
2. Added Authentication Key management protocol field in
Group started event and Peer client joined event. This is to
get the security type of Group.
Bug: 341971059
Test: Manual - Basic P2P connect/disconnect tests
Test: TH Presubmit tests
Test: atest VtsHalWifiSupplicantStaIfaceTargetTest \
VtsHalWifiSupplicantStaNetworkTargetTest \
VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: Ia28bfe107644897603a98a3e2a24ed0d54453f33
diff --git a/wpa_supplicant/aidl/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index 707299d..84101ca 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -1529,6 +1529,10 @@
params.p2pClientIpInfo.ipAddressMask,
params.p2pClientIpInfo.ipAddressGo);
}
+ if (isAidlServiceVersionAtLeast(4)) {
+ // TODO Fill the field when supplicant implementation is ready
+ params.keyMgmtMask = 0;
+ }
callWithEachP2pIfaceCallback(
misc_utils::charBufToString(wpa_s->ifname),
std::bind(&ISupplicantP2pIfaceCallback::onGroupStartedWithParams,
@@ -1686,6 +1690,10 @@
os_memcpy(&aidl_ip, &ip[0], 4);
}
params.clientIpAddress = aidl_ip;
+ if (isAidlServiceVersionAtLeast(4)) {
+ // TODO Fill the field when supplicant implementation is ready
+ params.keyMgmtMask = 0;
+ }
callWithEachP2pIfaceCallback(
misc_utils::charBufToString(wpa_s->ifname),
std::bind(
diff --git a/wpa_supplicant/aidl/p2p_iface.cpp b/wpa_supplicant/aidl/p2p_iface.cpp
index 7afc8a1..6e909cc 100644
--- a/wpa_supplicant/aidl/p2p_iface.cpp
+++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -853,6 +853,14 @@
this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
&P2pIface::createGroupOwnerInternal, in_groupOwnerInfo);
}
+
+::ndk::ScopedAStatus P2pIface::getFeatureSet(int64_t* _aidl_return)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &P2pIface::getFeatureSetInternal, _aidl_return);
+}
+
std::pair<std::string, ndk::ScopedAStatus> P2pIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -1943,6 +1951,12 @@
groupOwnerInfo.persistent, groupOwnerInfo.persistentNetworkId);
}
+std::pair<int64_t, ndk::ScopedAStatus> P2pIface::getFeatureSetInternal()
+{
+ // TODO Fill the field when supplicant implementation is ready
+ return {0, ndk::ScopedAStatus::ok()};
+}
+
/**
* Retrieve the underlying |wpa_supplicant| struct
* pointer for this iface.
diff --git a/wpa_supplicant/aidl/p2p_iface.h b/wpa_supplicant/aidl/p2p_iface.h
index 98556d1..4f7ae0a 100644
--- a/wpa_supplicant/aidl/p2p_iface.h
+++ b/wpa_supplicant/aidl/p2p_iface.h
@@ -184,6 +184,7 @@
const P2pAddGroupConfigurationParams& in_groupConfigurationParams) override;
::ndk::ScopedAStatus createGroupOwner(
const P2pCreateGroupOwnerInfo& in_groupOwnerInfo) override;
+ ::ndk::ScopedAStatus getFeatureSet(int64_t* _aidl_return) override;
private:
@@ -316,6 +317,7 @@
const P2pAddGroupConfigurationParams& groupConfigurationParams);
ndk::ScopedAStatus createGroupOwnerInternal(
const P2pCreateGroupOwnerInfo& groupOwnerInfo);
+ std::pair<int64_t, ndk::ScopedAStatus> getFeatureSetInternal();
struct wpa_supplicant* retrieveIfacePtr();
struct wpa_supplicant* retrieveGroupIfacePtr(