Skip to contentSkip to conversation

client: fix AP PairwiseCiphers parsing

PATCH Applied James Prestwood 2 participants 2 messages Jan 4, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 client: fix AP PairwiseCiphers parsing

This property was being parsed as "s" when it should be "as". This results in "ap <wlan> show" having an empty entry for the PairwiseCiphers list.

---
 client/ap.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
client/ap.c +11 -2
index f444a12c..3a024d7c 100644
@@ -162,18 +162,27 @@ static const char *get_freq_tostr(const void *data)
 static void update_pairwise(void *data, struct l_dbus_message_iter *variant)
 {
 	struct ap *ap = data;
+	struct l_dbus_message_iter array;
 	char *value;
+	char **strv;
+
 
 	if (ap->pairwise)
 		l_free(ap->pairwise);
 
-	if (!l_dbus_message_iter_get_variant(variant, "s", &value)) {
+	if (!l_dbus_message_iter_get_variant(variant, "as", &array)) {
 		ap->pairwise = NULL;
 
 		return;
 	}
 
-	ap->pairwise = l_strdup(value);
+	strv = l_strv_new();
+
+	while (l_dbus_message_iter_next_entry(&array, &value))
+		strv = l_strv_append(strv, value);
+
+	ap->pairwise = l_strjoinv(strv, ' ');
+	l_strv_free(strv);
 }
 
 static const char *get_pairwise_tostr(const void *data)
Signature · 1 line
2.34.1
#1 lore raw

Hi James,

Quoted 7 lines · James Prestwood

This property was being parsed as "s" when it should be "as". This results in "ap <wlan> show" having an empty entry for the PairwiseCiphers list.

---
  client/ap.c | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)

Applied, thanks.

Regards,
-Denis