diff options
| author | Gabriel Biren <gbiren@google.com> | 2023-12-06 17:07:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-06 17:07:58 +0000 |
| commit | 86b6fd078ec16f115d6427ce15814cda96f76d44 (patch) | |
| tree | d73d5e45c360346e6e936edbaf3c8d7d7d239a9e | |
| parent | d3450646d5f0c2d275e975a684132cd637d08477 (diff) | |
| parent | b1f063b9e8fe765b8681454ad3704b2f4df1ea26 (diff) | |
| download | wpa_supplicant_8-86b6fd078ec16f115d6427ce15814cda96f76d44.tar.gz | |
Merge "Add skeleton implementation for ISupplicantStaNetwork#setVendorData." into main
| -rw-r--r-- | wpa_supplicant/aidl/sta_network.cpp | 14 | ||||
| -rw-r--r-- | wpa_supplicant/aidl/sta_network.h | 8 |
2 files changed, 20 insertions, 2 deletions
diff --git a/wpa_supplicant/aidl/sta_network.cpp b/wpa_supplicant/aidl/sta_network.cpp index 7b8b6ad7..f373e713 100644 --- a/wpa_supplicant/aidl/sta_network.cpp +++ b/wpa_supplicant/aidl/sta_network.cpp @@ -898,6 +898,14 @@ ndk::ScopedAStatus StaNetwork::getBssid( &StaNetwork::disableEhtInternal); } +::ndk::ScopedAStatus StaNetwork::setVendorData( + const std::vector<common::OuiKeyedData>& in_vendorData) +{ + return validateAndCall( + this, SupplicantStatusCode::FAILURE_NETWORK_INVALID, + &StaNetwork::setVendorDataInternal, in_vendorData); +} + std::pair<uint32_t, ndk::ScopedAStatus> StaNetwork::getIdInternal() { return {network_id_, ndk::ScopedAStatus::ok()}; @@ -2716,6 +2724,12 @@ ndk::ScopedAStatus StaNetwork::disableEhtInternal() return ndk::ScopedAStatus::ok(); } +ndk::ScopedAStatus StaNetwork::setVendorDataInternal( + const std::vector<common::OuiKeyedData>& /* vendorData */) { + // Not implemented in the default implementation. + return ndk::ScopedAStatus::ok(); +} + /** * WPA3-Enterprise 192-bit mode workaround to force the connection to EAP-TLSv1.2 due to * interoperability issues in TLSv1.3 which disables the SSL_SIGN_RSA_PKCS1_SHA384 diff --git a/wpa_supplicant/aidl/sta_network.h b/wpa_supplicant/aidl/sta_network.h index 879d8746..b0cb3dec 100644 --- a/wpa_supplicant/aidl/sta_network.h +++ b/wpa_supplicant/aidl/sta_network.h @@ -178,7 +178,9 @@ public: const std::vector<uint8_t>& in_selectedRcoi) override; ::ndk::ScopedAStatus setMinimumTlsVersionEapPhase1Param( TlsVersion in_tlsVersion) override; - ::ndk::ScopedAStatus disableEht() override; + ::ndk::ScopedAStatus disableEht() override; + ::ndk::ScopedAStatus setVendorData( + const std::vector<common::OuiKeyedData>& in_vendorData) override; private: // Corresponding worker functions for the AIDL methods. @@ -311,7 +313,9 @@ private: ndk::ScopedAStatus setRoamingConsortiumSelectionInternal( const std::vector<uint8_t>& selectedRcoi); ndk::ScopedAStatus setMinimumTlsVersionEapPhase1ParamInternal(TlsVersion tlsVersion); - ndk::ScopedAStatus disableEhtInternal(); + ndk::ScopedAStatus disableEhtInternal(); + ndk::ScopedAStatus setVendorDataInternal( + const std::vector<common::OuiKeyedData>& vendorData); struct wpa_ssid* retrieveNetworkPtr(); struct wpa_supplicant* retrieveIfacePtr(); |