Add callback path from wpa_supplicant core to AidlManager::listAliases.
Order of calls is:
1. wpas_list_aliases (notify.c)
2. wpas_aidl_list_aliases (aidl.cpp)
3. listAliases (aidl_manager.cpp)
Bug: 281566895
Test: m
Change-Id: If9b97f8cf1088ac001891e1722871761601c61a7
diff --git a/wpa_supplicant/aidl/aidl.cpp b/wpa_supplicant/aidl/aidl.cpp
index 614d66d..6a22a2a 100644
--- a/wpa_supplicant/aidl/aidl.cpp
+++ b/wpa_supplicant/aidl/aidl.cpp
@@ -1074,6 +1074,17 @@
return aidl_manager->getCertificate(alias, value);
}
+ssize_t wpas_aidl_list_aliases(const char *prefix, char ***aliases)
+{
+ AidlManager *aidl_manager = AidlManager::getInstance();
+ if (!aidl_manager)
+ return -1;
+
+ wpa_printf(MSG_INFO, "Requesting aliases from framework");
+
+ return aidl_manager->listAliases(prefix, aliases);
+}
+
void wpas_aidl_notify_qos_policy_scs_response(struct wpa_supplicant *wpa_s,
unsigned int count, int **scs_resp)
{
diff --git a/wpa_supplicant/aidl/aidl.h b/wpa_supplicant/aidl/aidl.h
index f4afc7e..f9b374e 100644
--- a/wpa_supplicant/aidl/aidl.h
+++ b/wpa_supplicant/aidl/aidl.h
@@ -146,6 +146,7 @@
void wpas_aidl_notify_qos_policy_request(struct wpa_supplicant *wpa_s,
struct dscp_policy_data *policies, int num_policies);
ssize_t wpas_aidl_get_certificate(const char* alias, uint8_t** value);
+ ssize_t wpas_aidl_list_aliases(const char *prefix, char ***aliases);
void wpas_aidl_notify_qos_policy_scs_response(struct wpa_supplicant *wpa_s,
unsigned int count, int **scs_resp);
#else // CONFIG_CTRL_IFACE_AIDL
@@ -334,6 +335,10 @@
{
return -1;
}
+static ssize_t wpas_aidl_list_aliases(const char *prefix, char ***aliases)
+{
+ return -1;
+}
static void wpas_aidl_notify_qos_policy_scs_response(struct wpa_supplicant *wpa_s,
unsigned int count, int **scs_resp) {}
#endif // CONFIG_CTRL_IFACE_AIDL
diff --git a/wpa_supplicant/aidl/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index 89b5432..8c061a0 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -2607,6 +2607,41 @@
return -1;
}
+ssize_t AidlManager::listAliases(const char *prefix, char ***aliases) {
+ if (prefix == nullptr || aliases == nullptr) {
+ wpa_printf(MSG_ERROR, "Null pointer argument was passed to listAliases");
+ return -1;
+ }
+
+ if (auto results =
+ certificate_utils::listAliases(prefix, non_standard_cert_callback_)) {
+ int count = results->size();
+ *aliases = (char **) os_malloc(sizeof(char *) * count);
+ if (*aliases == nullptr) {
+ wpa_printf(MSG_ERROR, "listAliases: os_malloc alias array error");
+ return -1;
+ }
+ os_memset(*aliases, 0, sizeof(char *) * count);
+
+ int index = 0;
+ for (auto it = results->begin(); it != results->end(); ++it) {
+ int alias_len = it->length();
+ char *alias = (char *) os_malloc(alias_len + 1);
+ if (alias == nullptr) {
+ wpa_printf(MSG_ERROR, "listAliases: os_malloc alias string error");
+ for (int i = 0; i < index; ++i) os_free((*aliases)[i]);
+ os_free(*aliases);
+ return -1;
+ }
+ os_memcpy(alias, it->data(), alias_len + 1);
+ (*aliases)[index] = alias;
+ index++;
+ }
+ return count;
+ }
+ return -1;
+}
+
QosPolicyScsResponseStatusCode getQosPolicyScsResponseStatusCode(int scsResponseCode)
{
QosPolicyScsResponseStatusCode status = QosPolicyScsResponseStatusCode::TIMEOUT;
diff --git a/wpa_supplicant/aidl/aidl_manager.h b/wpa_supplicant/aidl/aidl_manager.h
index 2173a0d..fcea1f7 100644
--- a/wpa_supplicant/aidl/aidl_manager.h
+++ b/wpa_supplicant/aidl/aidl_manager.h
@@ -164,6 +164,7 @@
struct dscp_policy_data *policies,
int num_policies);
ssize_t getCertificate(const char* alias, uint8_t** value);
+ ssize_t listAliases(const char *prefix, char ***aliases);
void notifyQosPolicyScsResponse(struct wpa_supplicant *wpa_s,
unsigned int count, int **scs_resp);
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index cd272e3..943897d 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -1372,6 +1372,10 @@
return wpas_aidl_get_certificate(alias, value);
}
+ssize_t wpas_list_aliases(const char *prefix, char ***aliases)
+{
+ return wpas_aidl_list_aliases(prefix, aliases);
+}
void wpas_notify_signal_change(struct wpa_supplicant *wpa_s)
{
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 84ef898..bc2bd64 100644
--- a/wpa_supplicant/notify.h
+++ b/wpa_supplicant/notify.h
@@ -223,6 +223,7 @@
struct dscp_policy_data *policies, int num_policies);
void wpas_notify_frequency_changed(struct wpa_supplicant *wpa_s, int frequency);
ssize_t wpas_get_certificate(const char *alias, uint8_t** value);
+ssize_t wpas_list_aliases(const char *prefix, char ***aliases);
void wpas_notify_pmk_cache_added(struct wpa_supplicant *wpa_s,
struct rsn_pmksa_cache_entry *entry);
void wpas_notify_signal_change(struct wpa_supplicant *wpa_s);