DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

privsep: Support frequency list for scan requests

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-12-03 18:27:16 +02:00
parent da818ee5e9
commit 865081c307
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/privsep_commands.h
View file

@ -30,10 +30,14 @@ enum privsep_cmd {
PRIVSEP_CMD_AUTHENTICATE, PRIVSEP_CMD_AUTHENTICATE,
}; };
#define PRIVSEP_MAX_SCAN_FREQS 50
struct privsep_cmd_scan { struct privsep_cmd_scan {
unsigned int num_ssids; unsigned int num_ssids;
u8 ssids[WPAS_MAX_SCAN_SSIDS][32]; u8 ssids[WPAS_MAX_SCAN_SSIDS][32];
u8 ssid_lens[WPAS_MAX_SCAN_SSIDS]; u8 ssid_lens[WPAS_MAX_SCAN_SSIDS];
unsigned int num_freqs;
u16 freqs[PRIVSEP_MAX_SCAN_FREQS];
}; };
struct privsep_cmd_authenticate { struct privsep_cmd_authenticate {

5
src/drivers/driver_privsep.c
View file

@ -116,6 +116,11 @@ static int wpa_driver_privsep_scan(void *priv,
scan.ssid_lens[i]); scan.ssid_lens[i]);
} }
for (i = 0; i < PRIVSEP_MAX_SCAN_FREQS &&
params->freqs && params->freqs[i]; i++)
scan.freqs[i] = params->freqs[i];
scan.num_freqs = i;
return wpa_priv_cmd(drv, PRIVSEP_CMD_SCAN, &scan, sizeof(scan), return wpa_priv_cmd(drv, PRIVSEP_CMD_SCAN, &scan, sizeof(scan),
NULL, NULL); NULL, NULL);
} }

12
wpa_supplicant/wpa_priv.c
View file

@ -139,6 +139,7 @@ static void wpa_priv_cmd_scan(struct wpa_priv_interface *iface,
struct wpa_driver_scan_params params; struct wpa_driver_scan_params params;
struct privsep_cmd_scan *scan; struct privsep_cmd_scan *scan;
unsigned int i; unsigned int i;
int freqs[PRIVSEP_MAX_SCAN_FREQS + 1];
if (iface->drv_priv == NULL) if (iface->drv_priv == NULL)
return; return;
@ -161,6 +162,17 @@ static void wpa_priv_cmd_scan(struct wpa_priv_interface *iface,
params.ssids[i].ssid_len = scan->ssid_lens[i]; params.ssids[i].ssid_len = scan->ssid_lens[i];
} }
if (scan->num_freqs > PRIVSEP_MAX_SCAN_FREQS) {
wpa_printf(MSG_DEBUG, "Invalid scan request (num_freqs)");
return;
}
if (scan->num_freqs) {
for (i = 0; i < scan->num_freqs; i++)
freqs[i] = scan->freqs[i];
freqs[i] = 0;
params.freqs = freqs;
}
if (iface->driver->scan2) if (iface->driver->scan2)
iface->driver->scan2(iface->drv_priv, &params); iface->driver->scan2(iface->drv_priv, &params);
} }