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

PNO: Send Probe Request frames only for hidden SSIDs

Browse source 
Previously, offloaded scanning (PNO) on Android was including SSIDs from
all enabled networks regardless of the scan_ssid parameter which
resulted in different behavior for the offloaded case when comparing to
wpa_supplicant initiated scans.

Use the sched_scan match filter to allow broadcast SSID to be used for
scan_ssid=1 networks also with PNO to avoid running active scans for
SSIDs that have not been explicitly marked as requiring an SSID-specific
scan. This reduces exposure of configured network names on the device
when running offloaded scans while the host device is in sleep.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2014-07-02 12:31:38 -07:00 committed by Jouni Malinen
parent 8931a36ca4
commit 4ed3492206
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
wpa_supplicant/scan.c
View file

@ -1931,7 +1931,7 @@ void wpa_scan_free_params(struct wpa_driver_scan_params *params)
int wpas_start_pno(struct wpa_supplicant *wpa_s) int wpas_start_pno(struct wpa_supplicant *wpa_s)
{ {
int ret, interval; int ret, interval;
size_t i, num_ssid; size_t i, num_ssid, num_match_ssid;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
struct wpa_driver_scan_params params; struct wpa_driver_scan_params params;
@ -1960,41 +1960,58 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s)
os_memset(&params, 0, sizeof(params)); os_memset(&params, 0, sizeof(params));
num_ssid = 0; num_ssid = num_match_ssid = 0;
ssid = wpa_s->conf->ssid; ssid = wpa_s->conf->ssid;
while (ssid) { while (ssid) {
if (!wpas_network_disabled(wpa_s, ssid)) if (!wpas_network_disabled(wpa_s, ssid)) {
num_ssid++; num_match_ssid++;
if (ssid->scan_ssid)
num_ssid++;
}
ssid = ssid->next; ssid = ssid->next;
} }
if (num_match_ssid == 0) {
wpa_printf(MSG_DEBUG, "PNO: No configured SSIDs");
return -1;
}
if (num_match_ssid > num_ssid) {
params.num_ssids++; /* wildcard */
num_ssid++;
}
if (num_ssid > WPAS_MAX_SCAN_SSIDS) { if (num_ssid > WPAS_MAX_SCAN_SSIDS) {
wpa_printf(MSG_DEBUG, "PNO: Use only the first %u SSIDs from " wpa_printf(MSG_DEBUG, "PNO: Use only the first %u SSIDs from "
"%u", WPAS_MAX_SCAN_SSIDS, (unsigned int) num_ssid); "%u", WPAS_MAX_SCAN_SSIDS, (unsigned int) num_ssid);
num_ssid = WPAS_MAX_SCAN_SSIDS; num_ssid = WPAS_MAX_SCAN_SSIDS;
} }
if (num_ssid == 0) { if (num_match_ssid > wpa_s->max_match_sets) {
wpa_printf(MSG_DEBUG, "PNO: No configured SSIDs"); num_match_ssid = wpa_s->max_match_sets;
return -1; wpa_dbg(wpa_s, MSG_DEBUG, "PNO: Too many SSIDs to match");
} }
params.filter_ssids = os_calloc(num_match_ssid,
params.filter_ssids = os_malloc(sizeof(struct wpa_driver_scan_filter) * sizeof(struct wpa_driver_scan_filter));
num_ssid);
if (params.filter_ssids == NULL) if (params.filter_ssids == NULL)
return -1; return -1;
i = 0; i = 0;
ssid = wpa_s->conf->ssid; ssid = wpa_s->conf->ssid;
while (ssid) { while (ssid) {
if (!wpas_network_disabled(wpa_s, ssid)) { if (!wpas_network_disabled(wpa_s, ssid)) {
params.ssids[i].ssid = ssid->ssid; if (ssid->scan_ssid && params.num_ssids < num_ssid) {
params.ssids[i].ssid_len = ssid->ssid_len; params.ssids[params.num_ssids].ssid =
params.num_ssids++; ssid->ssid;
params.ssids[params.num_ssids].ssid_len =
ssid->ssid_len;
params.num_ssids++;
}
os_memcpy(params.filter_ssids[i].ssid, ssid->ssid, os_memcpy(params.filter_ssids[i].ssid, ssid->ssid,
ssid->ssid_len); ssid->ssid_len);
params.filter_ssids[i].ssid_len = ssid->ssid_len; params.filter_ssids[i].ssid_len = ssid->ssid_len;
params.num_filter_ssids++; params.num_filter_ssids++;
i++; i++;
if (i == num_ssid) if (i == num_match_ssid)
break; break;
} }
ssid = ssid->next; ssid = ssid->next;