From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v3 2/6] station: add debug method GetNetworks
Date: Thu, 11 Aug 2022 11:47:31 -0700 [thread overview]
Message-ID: <20220811184735.465951-2-prestwoj@gmail.com> (raw)
In-Reply-To: <20220811184735.465951-1-prestwoj@gmail.com>
This gets all networks but includes individual entries for each
BSS.
---
src/station.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
v3:
* Removed hidden networks from the list. GetHiddenAccessPoints could
be used instead.
diff --git a/src/station.c b/src/station.c
index 57dbd0d5..66b296b8 100644
--- a/src/station.c
+++ b/src/station.c
@@ -4600,6 +4600,90 @@ static struct l_dbus_message *station_property_set_autoconnect(
return l_dbus_message_new_method_return(message);
}
+static void station_append_byte_array(struct l_dbus_message_builder *builder,
+ const char *name,
+ const uint8_t *bytes, size_t len)
+{
+ size_t i;
+
+ l_dbus_message_builder_enter_dict(builder, "sv");
+ l_dbus_message_builder_append_basic(builder, 's', name);
+ l_dbus_message_builder_enter_variant(builder, "ay");
+ l_dbus_message_builder_enter_array(builder, "y");
+
+ for (i = 0; i < len; i++)
+ l_dbus_message_builder_append_basic(builder, 'y', &bytes[i]);
+
+ l_dbus_message_builder_leave_array(builder);
+ l_dbus_message_builder_leave_variant(builder);
+ l_dbus_message_builder_leave_dict(builder);
+}
+
+static void station_append_bss_list(struct l_dbus_message_builder *builder,
+ const struct l_queue_entry *entry)
+{
+ for (; entry; entry = entry->next) {
+ struct scan_bss *bss = entry->data;
+ int32_t rssi = bss->signal_strength / 100;
+
+ l_dbus_message_builder_enter_array(builder, "{sv}");
+
+ dbus_append_dict_basic(builder, "Frequency", 'u',
+ &bss->frequency);
+ dbus_append_dict_basic(builder, "RSSI", 'i',
+ &rssi);
+ dbus_append_dict_basic(builder, "Rank", 'q', &bss->rank);
+
+ dbus_append_dict_basic(builder, "Address", 's',
+ util_address_to_string(bss->addr));
+
+ station_append_byte_array(builder, "MDE", bss->mde, 3);
+
+ l_dbus_message_builder_leave_array(builder);
+ }
+}
+
+static struct l_dbus_message *station_debug_get_networks(struct l_dbus *dbus,
+ struct l_dbus_message *message,
+ void *user_data)
+{
+ struct station *station = user_data;
+ struct l_dbus_message *reply =
+ l_dbus_message_new_method_return(message);
+ struct l_dbus_message_builder *builder =
+ l_dbus_message_builder_new(reply);
+ const struct l_queue_entry *entry;
+
+ l_dbus_message_builder_enter_array(builder, "{oaa{sv}}");
+
+ if (l_queue_isempty(station->networks_sorted))
+ goto done;
+
+ for (entry = l_queue_get_entries(station->networks_sorted); entry;
+ entry = entry->next) {
+ const struct network *network = entry->data;
+
+ l_dbus_message_builder_enter_dict(builder, "oaa{sv}");
+ l_dbus_message_builder_append_basic(builder, 'o',
+ network_get_path(network));
+ l_dbus_message_builder_enter_array(builder, "a{sv}");
+
+ station_append_bss_list(builder,
+ network_bss_list_get_entries(network));
+
+ l_dbus_message_builder_leave_array(builder);
+ l_dbus_message_builder_leave_dict(builder);
+ }
+
+done:
+ l_dbus_message_builder_leave_array(builder);
+
+ l_dbus_message_builder_finalize(builder);
+ l_dbus_message_builder_destroy(builder);
+
+ return reply;
+}
+
static void station_setup_debug_interface(
struct l_dbus_interface *interface)
{
@@ -4612,6 +4696,9 @@ static void station_setup_debug_interface(
l_dbus_interface_method(interface, "Scan", 0,
station_debug_scan, "", "aq",
"frequencies");
+ l_dbus_interface_method(interface, "GetNetworks", 0,
+ station_debug_get_networks, "a{oaa{sv}}", "",
+ "networks");
l_dbus_interface_signal(interface, "Event", 0, "sav", "name", "data");
--
2.34.3
next prev parent reply other threads:[~2022-08-11 18:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-11 18:47 [PATCH v3 1/6] doc: add documentation for StationDebug James Prestwood
2022-08-11 18:47 ` James Prestwood [this message]
2022-08-11 18:47 ` [PATCH v3 3/6] client: allow entity name to be passed to completion James Prestwood
2022-08-11 18:47 ` [PATCH v3 4/6] client: add station-debug command interface James Prestwood
2022-08-11 18:47 ` [PATCH v3 5/6] client: fix station autocomplete with multiple phys James Prestwood
2022-08-11 18:47 ` [PATCH v3 6/6] device: command: remove default device concept James Prestwood
2022-08-11 20:48 ` [PATCH v3 1/6] doc: add documentation for StationDebug Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220811184735.465951-2-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox