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

wpa_supplicant: Add ctrl parameter to INTERFACES command

Browse source 
"INTERFACES ctrl" can now be used to fetch a list of network interfaces
and their control interfaces, e.g., to fetch the UDP port information
for the control interface.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-03-04 10:20:27 +01:00 committed by Jouni Malinen
parent b9066c638a
commit 56e2fc2c31
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wpa_supplicant/ctrl_iface.c
View file

@ -55,6 +55,7 @@
static int wpa_supplicant_global_iface_list(struct wpa_global *global, static int wpa_supplicant_global_iface_list(struct wpa_global *global,
char *buf, int len); char *buf, int len);
static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global, static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
const char *input,
char *buf, int len); char *buf, int len);
static int * freq_range_to_channel_list(struct wpa_supplicant *wpa_s, static int * freq_range_to_channel_list(struct wpa_supplicant *wpa_s,
char *val); char *val);
@ -8842,9 +8843,9 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
} else if (os_strcmp(buf, "INTERFACE_LIST") == 0) { } else if (os_strcmp(buf, "INTERFACE_LIST") == 0) {
reply_len = wpa_supplicant_global_iface_list( reply_len = wpa_supplicant_global_iface_list(
wpa_s->global, reply, reply_size); wpa_s->global, reply, reply_size);
} else if (os_strcmp(buf, "INTERFACES") == 0) { } else if (os_strncmp(buf, "INTERFACES", 10) == 0) {
reply_len = wpa_supplicant_global_iface_interfaces( reply_len = wpa_supplicant_global_iface_interfaces(
wpa_s->global, reply, reply_size); wpa_s->global, buf + 10, reply, reply_size);
} else if (os_strncmp(buf, "BSS ", 4) == 0) { } else if (os_strncmp(buf, "BSS ", 4) == 0) {
reply_len = wpa_supplicant_ctrl_iface_bss( reply_len = wpa_supplicant_ctrl_iface_bss(
wpa_s, buf + 4, reply, reply_size); wpa_s, buf + 4, reply, reply_size);
@ -9250,18 +9251,31 @@ static int wpa_supplicant_global_iface_list(struct wpa_global *global,
static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global, static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
const char *input,
char *buf, int len) char *buf, int len)
{ {
int res; int res;
char *pos, *end; char *pos, *end;
struct wpa_supplicant *wpa_s; struct wpa_supplicant *wpa_s;
int show_ctrl = 0;
if (input)
show_ctrl = !!os_strstr(input, "ctrl");
wpa_s = global->ifaces; wpa_s = global->ifaces;
pos = buf; pos = buf;
end = buf + len; end = buf + len;
while (wpa_s) { while (wpa_s) {
res = os_snprintf(pos, end - pos, "%s\n", wpa_s->ifname); if (show_ctrl)
res = os_snprintf(pos, end - pos, "%s ctrl_iface=%s\n",
wpa_s->ifname,
wpa_s->conf->ctrl_interface ?
wpa_s->conf->ctrl_interface : "N/A");
else
res = os_snprintf(pos, end - pos, "%s\n",
wpa_s->ifname);
if (os_snprintf_error(end - pos, res)) { if (os_snprintf_error(end - pos, res)) {
*pos = '\0'; *pos = '\0';
break; break;
@ -9650,9 +9664,9 @@ char * wpa_supplicant_global_ctrl_iface_process(struct wpa_global *global,
} else if (os_strcmp(buf, "INTERFACE_LIST") == 0) { } else if (os_strcmp(buf, "INTERFACE_LIST") == 0) {
reply_len = wpa_supplicant_global_iface_list( reply_len = wpa_supplicant_global_iface_list(
global, reply, reply_size); global, reply, reply_size);
} else if (os_strcmp(buf, "INTERFACES") == 0) { } else if (os_strncmp(buf, "INTERFACES", 10) == 0) {
reply_len = wpa_supplicant_global_iface_interfaces( reply_len = wpa_supplicant_global_iface_interfaces(
global, reply, reply_size); global, buf + 10, reply, reply_size);
#ifdef CONFIG_FST #ifdef CONFIG_FST
} else if (os_strncmp(buf, "FST-ATTACH ", 11) == 0) { } else if (os_strncmp(buf, "FST-ATTACH ", 11) == 0) {
reply_len = wpas_global_ctrl_iface_fst_attach(global, buf + 11, reply_len = wpas_global_ctrl_iface_fst_attach(global, buf + 11,