Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

client: ap: show Name in 'ap <wlan> show'

Browse Source 
This will show some basic AP information like Started and
network Name. Some cleanup was done to make the AP interface
and client table columns line up.
This commit is contained in:
James Prestwood 2021-02-01 15:52:16 -08:00 committed by Denis Kenzior
parent ec15ef1d34
commit 479506013c
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
client/ap.c
View File

@ -34,6 +34,7 @@
struct ap {
bool started;
char *name;
};
static void *ap_create(void)
@ -45,6 +46,9 @@ static void ap_destroy(void *data)
{
struct ap *ap = data;
if (ap->name)
l_free(ap->name);
l_free(ap);
}
@ -74,8 +78,35 @@ static void update_started(void *data, struct l_dbus_message_iter *variant)
ap->started = value;
}
static const char *get_name_tostr(const void *data)
{
const struct ap *ap = data;
if (!ap->name)
return "";
return ap->name;
}
static void update_name(void *data, struct l_dbus_message_iter *variant)
{
struct ap *ap = data;
const char *name;
if (ap->name)
l_free(ap->name);
if (!l_dbus_message_iter_get_variant(variant, "s", &name)) {
ap->name = NULL;
return;
}
ap->name = l_strdup(name);
}
static const struct proxy_interface_property ap_properties[] = {
{ "Started", "b", update_started, get_started_tostr },
{ "Name", "s", update_name, get_name_tostr },
{ }
};
@ -212,9 +243,9 @@ static void ap_get_diagnostics_callback(struct l_dbus_message *message,
while (l_dbus_message_iter_next_entry(&array, &iter)) {
sprintf(client_num, "Client %u", idx++);
display_table_header(client_num, "%-*s%-*s",
display_table_header(client_num, " %-*s%-*s",
20, "Property", 20, "Value");
diagnostic_display(&iter, "", 20, 20);
diagnostic_display(&iter, " ", 20, 20);
display_table_footer();
}
}
@ -223,12 +254,20 @@ static enum cmd_status cmd_show(const char *device_name, char **argv, int argc)
{
const struct proxy_interface *ap_diagnostic =
device_proxy_find(device_name, IWD_AP_DIAGNOSTIC_INTERFACE);
const struct proxy_interface *ap_i =
device_proxy_find(device_name, IWD_ACCESS_POINT_INTERFACE);
if (!ap_diagnostic) {
if (!ap_i) {
display("No ap on device: '%s'\n", device_name);
return CMD_STATUS_INVALID_VALUE;
}
proxy_properties_display(ap_i, "Access Point Interface", MARGIN, 20, 20);
display_table_footer();
if (!ap_diagnostic)
return CMD_STATUS_DONE;
proxy_interface_method_call(ap_diagnostic, "GetDiagnostics", "",
ap_get_diagnostics_callback);