jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hostapd_cli: Completion for interface command

Browse source 
Implement command completion for interface command

Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
This commit is contained in:
Mikael Kanstrup 2016-07-07 14:04:37 +02:00 committed by Jouni Malinen
parent 8b73c6aa11
commit b90c13d934
1 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
hostapd/hostapd_cli.c
View file

@ -962,6 +962,28 @@ static int hostapd_cli_cmd_level(struct wpa_ctrl *ctrl, int argc, char *argv[])
} }
static void hostapd_cli_get_interfaces(struct wpa_ctrl *ctrl,
struct dl_list *interfaces)
{
struct dirent *dent;
DIR *dir;
if (!ctrl || !interfaces)
return;
dir = opendir(ctrl_iface_dir);
if (dir == NULL)
return;
while ((dent = readdir(dir))) {
if (strcmp(dent->d_name, ".") == 0 ||
strcmp(dent->d_name, "..") == 0)
continue;
cli_txt_list_add(interfaces, dent->d_name);
}
closedir(dir);
}
static void hostapd_cli_list_interfaces(struct wpa_ctrl *ctrl) static void hostapd_cli_list_interfaces(struct wpa_ctrl *ctrl)
{ {
struct dirent *dent; struct dirent *dent;
@ -1016,6 +1038,24 @@ static int hostapd_cli_cmd_interface(struct wpa_ctrl *ctrl, int argc,
} }
static char ** hostapd_complete_interface(const char *str, int pos)
{
int arg = get_cmd_arg_num(str, pos);
char **res = NULL;
DEFINE_DL_LIST(interfaces);
switch (arg) {
case 1:
hostapd_cli_get_interfaces(ctrl_conn, &interfaces);
res = cli_txt_list_array(&interfaces);
cli_txt_list_flush(&interfaces);
break;
}
return res;
}
static int hostapd_cli_cmd_set(struct wpa_ctrl *ctrl, int argc, char *argv[]) static int hostapd_cli_cmd_set(struct wpa_ctrl *ctrl, int argc, char *argv[])
{ {
char cmd[256]; char cmd[256];
@ -1358,7 +1398,7 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
"= show current configuration" }, "= show current configuration" },
{ "help", hostapd_cli_cmd_help, hostapd_cli_complete_help, { "help", hostapd_cli_cmd_help, hostapd_cli_complete_help,
"= show this usage help" }, "= show this usage help" },
{ "interface", hostapd_cli_cmd_interface, NULL, { "interface", hostapd_cli_cmd_interface, hostapd_complete_interface,
"[ifname] = show interfaces/select interface" }, "[ifname] = show interfaces/select interface" },
#ifdef CONFIG_FST #ifdef CONFIG_FST
{ "fst", hostapd_cli_cmd_fst, NULL, NULL }, { "fst", hostapd_cli_cmd_fst, NULL, NULL },