Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

client: update to work with diagnostic changes 

The diagnostic interface will now only come up when station is
connected. This avoids the need for display station to return
a 'connected' out parameter. We can instead just see that
the diagnostic interface doesn't exist.
This commit is contained in:
James Prestwood 2021-02-03 11:07:05 -08:00 committed by Denis Kenzior
parent c3e160880f
commit 5370fefdad
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/station.c
View File

@ -142,8 +142,7 @@ static void check_errors_method_callback(struct l_dbus_message *message,
} }
static void display_station(const char *device_name, static void display_station(const char *device_name,
const struct proxy_interface *proxy, const struct proxy_interface *proxy)
bool *connected)
{ {
const struct station *station = proxy_interface_get_data(proxy); const struct station *station = proxy_interface_get_data(proxy);
char *caption = l_strdup_printf("%s: %s", "Station", device_name); char *caption = l_strdup_printf("%s: %s", "Station", device_name);
@ -155,12 +154,13 @@ static void display_station(const char *device_name,
display("%s%*s %-*s%-*s\n", MARGIN, 8, "", 20, display("%s%*s %-*s%-*s\n", MARGIN, 8, "", 20,
"Connected network", 47, "Connected network", 47,
network_get_name(station->connected_network)); network_get_name(station->connected_network));
*connected = true; /*
* If connected the diagnostic interface is presumably up so
* don't add the table footer just yet.
*/
return; return;
} }
*connected = false;
display_table_footer(); display_table_footer();
} }
@ -623,20 +623,19 @@ static enum cmd_status cmd_show(const char *device_name,
const struct proxy_interface *diagnostic = const struct proxy_interface *diagnostic =
device_proxy_find(device_name, device_proxy_find(device_name,
IWD_STATION_DIAGNOSTIC_INTERFACE); IWD_STATION_DIAGNOSTIC_INTERFACE);
bool connected;
if (!station) { if (!station) {
display("No station on device: '%s'\n", device_name); display("No station on device: '%s'\n", device_name);
return CMD_STATUS_INVALID_VALUE; return CMD_STATUS_INVALID_VALUE;
} }
display_station(device_name, station, &connected); display_station(device_name, station);
/* /*
* No need to query additional diagnostic information if not connected, * No need to query additional diagnostic information if IWD has
* or IWD has no diagnostic interface. * no diagnostic interface.
*/ */
if (!connected || !diagnostic) { if (!diagnostic) {
display_table_footer(); display_table_footer();
display_refresh_reset(); display_refresh_reset();
return CMD_STATUS_DONE; return CMD_STATUS_DONE;