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: Add arg completion for the known networks

Browse Source 
Enables tab-completion for the network names in known networks
command family. In addition, tab-completion is added for the
entity commands.
This commit is contained in:
Tim Kourt 2019-04-10 15:58:16 -07:00 committed by Denis Kenzior
parent 43c1bdfd62
commit 4fa5a9869b
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
client/known-networks.c
View File

@ -78,6 +78,13 @@ static void update_name(void *data, struct l_dbus_message_iter *variant)
network->name = l_strdup(value); network->name = l_strdup(value);
} }
static const char *get_name(const void *data)
{
const struct known_network *network = data;
return network->name;
}
static void update_type(void *data, struct l_dbus_message_iter *variant) static void update_type(void *data, struct l_dbus_message_iter *variant)
{ {
struct known_network *network = data; struct known_network *network = data;
@ -132,7 +139,7 @@ static const char *get_hidden_tostr(const void *data)
} }
static const struct proxy_interface_property known_network_properties[] = { static const struct proxy_interface_property known_network_properties[] = {
{ "Name", "s", update_name }, { "Name", "s", update_name, get_name },
{ "Type", "s", update_type }, { "Type", "s", update_type },
{ "LastConnectedTime", "s", update_last_connected }, { "LastConnectedTime", "s", update_last_connected },
{ "Hidden", "b", update_hidden, get_hidden_tostr }, { "Hidden", "b", update_hidden, get_hidden_tostr },
@ -267,6 +274,14 @@ static enum cmd_status cmd_forget(const char *entity, char **argv, int argc)
return CMD_STATUS_TRIGGERED; return CMD_STATUS_TRIGGERED;
} }
static bool match_by_partial_name(const void *a, const void *b)
{
const struct known_network *network = a;
const char *text = b;
return !strncmp(network->name, text, strlen(text));
}
static const struct command known_networks_commands[] = { static const struct command known_networks_commands[] = {
{ NULL, "list", NULL, cmd_list, "List known networks", true }, { NULL, "list", NULL, cmd_list, "List known networks", true },
{ NULL, "forget", "<\"network name\"> [security]", { NULL, "forget", "<\"network name\"> [security]",
@ -276,6 +291,7 @@ static const struct command known_networks_commands[] = {
static char *family_arg_completion(const char *text, int state) static char *family_arg_completion(const char *text, int state)
{ {
static bool first_pass;
static size_t index; static size_t index;
static size_t len; static size_t len;
const char *cmd; const char *cmd;
@ -283,19 +299,31 @@ static char *family_arg_completion(const char *text, int state)
if (!state) { if (!state) {
index = 0; index = 0;
len = strlen(text); len = strlen(text);
first_pass = true;
} }
while ((cmd = known_networks_commands[index].cmd)) { while ((cmd = known_networks_commands[index].cmd)) {
if (known_networks_commands[index++].entity) if (known_networks_commands[index++].entity)
continue; continue;
if (strncmp(cmd, text, len)) if (!strncmp(cmd, text, len))
continue; return l_strdup(cmd);
return l_strdup(cmd);
} }
return NULL; if (first_pass) {
state = 0;
first_pass = false;
}
return proxy_property_str_completion(&known_network_interface_type,
match_by_partial_name, "Name",
text, state, NULL);
}
static char *entity_arg_completion(const char *text, int state)
{
return command_entity_arg_completion(text, state,
known_networks_commands);
} }
static struct command_family known_networks_command_family = { static struct command_family known_networks_command_family = {
@ -303,6 +331,7 @@ static struct command_family known_networks_command_family = {
.name = "known-networks", .name = "known-networks",
.command_list = known_networks_commands, .command_list = known_networks_commands,
.family_arg_completion = family_arg_completion, .family_arg_completion = family_arg_completion,
.entity_arg_completion = entity_arg_completion,
}; };
static int known_networks_command_family_init(void) static int known_networks_command_family_init(void)