Merge "Add skeleton implementation to supplicant service for QoS policy feature."
diff --git a/hostapd/aidl/hostapd.cpp b/hostapd/aidl/hostapd.cpp
index 7874785..bbfd174 100644
--- a/hostapd/aidl/hostapd.cpp
+++ b/hostapd/aidl/hostapd.cpp
@@ -298,7 +298,8 @@
const IfaceParams& iface_params,
const ChannelParams& channelParams,
const NetworkParams& nw_params,
- const std::string br_name)
+ const std::string br_name,
+ const std::string owe_transition_ifname)
{
if (nw_params.ssid.size() >
static_cast<uint32_t>(
@@ -396,6 +397,14 @@
is_6Ghz_band_only ? 1 : 2,
nw_params.passphrase.c_str());
break;
+ case EncryptionType::OWE_TRANSITION:
+ encryption_config_as_string = StringPrintf(
+ "wpa=2\n"
+ "rsn_pairwise=%s\n"
+ "wpa_key_mgmt=OWE\n"
+ "ieee80211w=2",
+ is_60Ghz_band_only ? "GCMP" : "CCMP");
+ break;
default:
wpa_printf(MSG_ERROR, "Unknown encryption type");
return "";
@@ -525,6 +534,12 @@
vendor_elements_as_string = StringPrintf("vendor_elements=%s", ss.str().c_str());
}
+ std::string owe_transition_ifname_as_string;
+ if (!owe_transition_ifname.empty()) {
+ owe_transition_ifname_as_string = StringPrintf(
+ "owe_transition_ifname=%s", owe_transition_ifname.c_str());
+ }
+
return StringPrintf(
"interface=%s\n"
"driver=nl80211\n"
@@ -548,6 +563,7 @@
"%s\n"
"%s\n"
"%s\n"
+ "%s\n"
"%s\n",
iface_params.name.c_str(), ssid_as_string.c_str(),
channel_config_as_string.c_str(),
@@ -561,6 +577,7 @@
#endif /* CONFIG_INTERWORKING */
encryption_config_as_string.c_str(),
bridge_as_string.c_str(),
+ owe_transition_ifname_as_string.c_str(),
enable_edmg_as_string.c_str(),
edmg_channel_as_string.c_str(),
vendor_elements_as_string.c_str());
@@ -771,7 +788,7 @@
wpa_printf(MSG_INFO, "AddSingleAccessPoint, iface=%s",
iface_params.name.c_str());
return addSingleAccessPoint(iface_params, iface_params.channelParams[0],
- nw_params, "");
+ nw_params, "", "");
} else if (channelParamsSize == 2) {
// Concurrent APs
wpa_printf(MSG_INFO, "AddDualAccessPoint, iface=%s",
@@ -781,6 +798,18 @@
return createStatus(HostapdStatusCode::FAILURE_ARGS_INVALID);
}
+std::vector<uint8_t> generateRandomOweSsid()
+{
+ u8 random[8] = {0};
+ os_get_random(random, 8);
+
+ std::string ssid = StringPrintf("Owe-%s", random);
+ wpa_printf(MSG_INFO, "Generated OWE SSID: %s", ssid.c_str());
+ std::vector<uint8_t> vssid(ssid.begin(), ssid.end());
+
+ return vssid;
+}
+
::ndk::ScopedAStatus Hostapd::addConcurrentAccessPoints(
const IfaceParams& iface_params, const NetworkParams& nw_params)
{
@@ -800,9 +829,24 @@
// start BSS on specified bands
for (std::size_t i = 0; i < channelParamsListSize; i ++) {
IfaceParams iface_params_new = iface_params;
+ NetworkParams nw_params_new = nw_params;
iface_params_new.name = managed_interfaces[i];
+
+ std::string owe_transition_ifname = "";
+ if (nw_params.encryptionType == EncryptionType::OWE_TRANSITION) {
+ if (i == 0 && i+1 < channelParamsListSize) {
+ owe_transition_ifname = managed_interfaces[i+1];
+ nw_params_new.encryptionType = EncryptionType::NONE;
+ } else {
+ owe_transition_ifname = managed_interfaces[0];
+ nw_params_new.isHidden = true;
+ nw_params_new.ssid = generateRandomOweSsid();
+ }
+ }
+
ndk::ScopedAStatus status = addSingleAccessPoint(
- iface_params_new, iface_params.channelParams[i], nw_params, br_name);
+ iface_params_new, iface_params.channelParams[i], nw_params_new,
+ br_name, owe_transition_ifname);
if (!status.isOk()) {
wpa_printf(MSG_ERROR, "Failed to addAccessPoint %s",
managed_interfaces[i].c_str());
@@ -818,7 +862,8 @@
const IfaceParams& iface_params,
const ChannelParams& channelParams,
const NetworkParams& nw_params,
- const std::string br_name)
+ const std::string br_name,
+ const std::string owe_transition_ifname)
{
if (hostapd_get_iface(interfaces_, iface_params.name.c_str())) {
wpa_printf(
@@ -826,7 +871,8 @@
iface_params.name.c_str());
return createStatus(HostapdStatusCode::FAILURE_IFACE_EXISTS);
}
- const auto conf_params = CreateHostapdConfig(iface_params, channelParams, nw_params, br_name);
+ const auto conf_params = CreateHostapdConfig(iface_params, channelParams, nw_params,
+ br_name, owe_transition_ifname);
if (conf_params.empty()) {
wpa_printf(MSG_ERROR, "Failed to create config params");
return createStatus(HostapdStatusCode::FAILURE_ARGS_INVALID);
diff --git a/hostapd/aidl/hostapd.h b/hostapd/aidl/hostapd.h
index 18a7a23..ffdbd8e 100644
--- a/hostapd/aidl/hostapd.h
+++ b/hostapd/aidl/hostapd.h
@@ -64,7 +64,8 @@
const IfaceParams& IfaceParams,
const ChannelParams& channelParams,
const NetworkParams& nw_params,
- std::string br_name);
+ std::string br_name,
+ std::string owe_transition_ifname);
::ndk::ScopedAStatus addConcurrentAccessPoints(
const IfaceParams& IfaceParams,
const NetworkParams& nw_params);
diff --git a/wpa_supplicant/aidl/p2p_iface.cpp b/wpa_supplicant/aidl/p2p_iface.cpp
index 8dcaad5..3dcfec8 100644
--- a/wpa_supplicant/aidl/p2p_iface.cpp
+++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -1018,6 +1018,32 @@
&P2pIface::setWfdR2DeviceInfoInternal, in_info);
}
+::ndk::ScopedAStatus P2pIface::removeClient(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &P2pIface::removeClientInternal, peer_address, isLegacyClient);
+}
+
+::ndk::ScopedAStatus P2pIface::findOnSocialChannels(
+ int32_t in_timeoutInSec)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &P2pIface::findOnSocialChannelsInternal, in_timeoutInSec);
+}
+
+::ndk::ScopedAStatus P2pIface::findOnSpecificFrequency(
+ int32_t in_freq,
+ int32_t in_timeoutInSec)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &P2pIface::findOnSpecificFrequencyInternal,
+ in_freq, in_timeoutInSec);
+}
+
std::pair<std::string, ndk::ScopedAStatus> P2pIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -2001,6 +2027,45 @@
return ndk::ScopedAStatus::ok();
}
+ndk::ScopedAStatus P2pIface::removeClientInternal(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient)
+{
+ struct wpa_supplicant* wpa_s = retrieveIfacePtr();
+ wpas_p2p_remove_client(wpa_s, peer_address.data(), isLegacyClient? 1 : 0);
+ return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus P2pIface::findOnSocialChannelsInternal(uint32_t timeout_in_sec)
+{
+ struct wpa_supplicant* wpa_s = retrieveIfacePtr();
+ if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
+ return createStatus(SupplicantStatusCode::FAILURE_IFACE_DISABLED);
+ }
+ uint32_t search_delay = wpas_p2p_search_delay(wpa_s);
+ if (wpas_p2p_find(
+ wpa_s, timeout_in_sec, P2P_FIND_ONLY_SOCIAL, 0, nullptr,
+ nullptr, search_delay, 0, nullptr, 0)) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNKNOWN);
+ }
+ return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus P2pIface::findOnSpecificFrequencyInternal(
+ uint32_t freq, uint32_t timeout_in_sec)
+{
+ struct wpa_supplicant* wpa_s = retrieveIfacePtr();
+ if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
+ return createStatus(SupplicantStatusCode::FAILURE_IFACE_DISABLED);
+ }
+ uint32_t search_delay = wpas_p2p_search_delay(wpa_s);
+ if (wpas_p2p_find(
+ wpa_s, timeout_in_sec, P2P_FIND_START_WITH_FULL, 0, nullptr,
+ nullptr, search_delay, 0, nullptr, freq)) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNKNOWN);
+ }
+ return 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 d24645c..4cb86b6 100644
--- a/wpa_supplicant/aidl/p2p_iface.h
+++ b/wpa_supplicant/aidl/p2p_iface.h
@@ -164,6 +164,11 @@
::ndk::ScopedAStatus getEdmg(bool* _aidl_return) override;
::ndk::ScopedAStatus setWfdR2DeviceInfo(
const std::vector<uint8_t>& in_info) override;
+ ::ndk::ScopedAStatus removeClient(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient) override;
+ ::ndk::ScopedAStatus findOnSocialChannels(int32_t in_timeoutInSec) override;
+ ::ndk::ScopedAStatus findOnSpecificFrequency(
+ int32_t in_freq, int32_t in_timeoutInSec) override;
private:
// Corresponding worker functions for the AIDL methods.
@@ -276,6 +281,11 @@
std::pair<bool, ndk::ScopedAStatus> getEdmgInternal();
ndk::ScopedAStatus setWfdR2DeviceInfoInternal(
const std::vector<uint8_t>& info);
+ ndk::ScopedAStatus removeClientInternal(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient);
+ ndk::ScopedAStatus findOnSocialChannelsInternal(uint32_t timeout_in_sec);
+ ndk::ScopedAStatus findOnSpecificFrequencyInternal(
+ uint32_t freq, uint32_t timeout_in_sec);
struct wpa_supplicant* retrieveIfacePtr();
struct wpa_supplicant* retrieveGroupIfacePtr(
diff --git a/wpa_supplicant/aidl/sta_network.cpp b/wpa_supplicant/aidl/sta_network.cpp
index b59d103..c195190 100644
--- a/wpa_supplicant/aidl/sta_network.cpp
+++ b/wpa_supplicant/aidl/sta_network.cpp
@@ -855,6 +855,14 @@
&StaNetwork::enableSaePkOnlyModeInternal, in_enable);
}
+::ndk::ScopedAStatus StaNetwork::setRoamingConsortiumSelection(
+ const std::vector<uint8_t>& in_selectedRcoi)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_NETWORK_INVALID,
+ &StaNetwork::setRoamingConsortiumSelectionInternal, in_selectedRcoi);
+}
+
std::pair<uint32_t, ndk::ScopedAStatus> StaNetwork::getIdInternal()
{
return {network_id_, ndk::ScopedAStatus::ok()};
@@ -2185,6 +2193,26 @@
ndk::ScopedAStatus::ok()};
}
+ndk::ScopedAStatus StaNetwork::setRoamingConsortiumSelectionInternal(
+ const std::vector<uint8_t> &selectedRcoi)
+{
+ struct wpa_ssid *wpa_ssid = retrieveNetworkPtr();
+ if (wpa_ssid == NULL) {
+ return createStatus(SupplicantStatusCode::FAILURE_NETWORK_INVALID);
+ }
+
+ if (setByteArrayFieldAndResetState(
+ selectedRcoi.data(), selectedRcoi.size(),
+ &(wpa_ssid->roaming_consortium_selection),
+ &(wpa_ssid->roaming_consortium_selection_len),
+ "roaming_consortium_selection")) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNKNOWN);
+ }
+
+ resetInternalStateAfterParamsUpdate();
+ return ndk::ScopedAStatus::ok();
+}
+
/**
* Retrieve the underlying |wpa_ssid| struct pointer for
* this network.
diff --git a/wpa_supplicant/aidl/sta_network.h b/wpa_supplicant/aidl/sta_network.h
index f1ef1ad..704ce2e 100644
--- a/wpa_supplicant/aidl/sta_network.h
+++ b/wpa_supplicant/aidl/sta_network.h
@@ -169,6 +169,8 @@
::ndk::ScopedAStatus setEapErp(bool in_enable) override;
::ndk::ScopedAStatus setSaeH2eMode(SaeH2eMode in_mode) override;
::ndk::ScopedAStatus enableSaePkOnlyMode(bool in_enable) override;
+ ::ndk::ScopedAStatus setRoamingConsortiumSelection(
+ const std::vector<uint8_t>& in_selectedRcoi) override;
private:
// Corresponding worker functions for the AIDL methods.
@@ -295,6 +297,8 @@
std::pair<std::vector<uint8_t>, ndk::ScopedAStatus> getWapiPskInternal();
ndk::ScopedAStatus setSaeH2eModeInternal(SaeH2eMode mode);
ndk::ScopedAStatus enableSaePkOnlyModeInternal(bool enable);
+ ndk::ScopedAStatus setRoamingConsortiumSelectionInternal(
+ const std::vector<uint8_t>& selectedRcoi);
struct wpa_ssid* retrieveNetworkPtr();
struct wpa_supplicant* retrieveIfacePtr();