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

Rename "broadcast SSID" to "wildcard SSID"

Browse source 
"Wildcard SSID" is the term used in IEEE Std 802.11-2007, so it is a
better name for the zero-length SSID used in Probe Request.
This commit is contained in:
Jouni Malinen 2009-02-14 22:21:17 +02:00
parent 6a1063e008
commit ba2a573c5f
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/drivers/driver.h
View file

@ -156,7 +156,7 @@ struct wpa_driver_scan_params {
/** /**
* ssid - specific SSID to scan for (ProbeReq) * ssid - specific SSID to scan for (ProbeReq)
* %NULL or zero-length SSID is used to indicate active scan * %NULL or zero-length SSID is used to indicate active scan
* with broadcast SSID. * with wildcard SSID.
*/ */
const u8 *ssid; const u8 *ssid;
/** /**
@ -601,8 +601,8 @@ struct wpa_driver_ops {
* scan - Request the driver to initiate scan (old version) * scan - Request the driver to initiate scan (old version)
* @priv: private driver interface data * @priv: private driver interface data
* @ssid: specific SSID to scan for (ProbeReq) or %NULL to scan for * @ssid: specific SSID to scan for (ProbeReq) or %NULL to scan for
* all SSIDs (either active scan with broadcast SSID or passive * all SSIDs (either active scan with wildcard SSID or passive
* scan * scan)
* @ssid_len: length of the SSID * @ssid_len: length of the SSID
* *
* Returns: 0 on success, -1 on failure * Returns: 0 on success, -1 on failure

4
src/drivers/driver_wext.c
View file

@ -1076,8 +1076,8 @@ void wpa_driver_wext_scan_timeout(void *eloop_ctx, void *timeout_ctx)
* wpa_driver_wext_scan - Request the driver to initiate scan * wpa_driver_wext_scan - Request the driver to initiate scan
* @priv: Pointer to private wext data from wpa_driver_wext_init() * @priv: Pointer to private wext data from wpa_driver_wext_init()
* @ssid: Specific SSID to scan for (ProbeReq) or %NULL to scan for * @ssid: Specific SSID to scan for (ProbeReq) or %NULL to scan for
* all SSIDs (either active scan with broadcast SSID or passive * all SSIDs (either active scan with wildcard SSID or passive
* scan * scan)
* @ssid_len: Length of the SSID * @ssid_len: Length of the SSID
* Returns: 0 on success, -1 on failure * Returns: 0 on success, -1 on failure
*/ */

18
wpa_supplicant/scan.c
View file

@ -91,7 +91,7 @@ static void wpa_supplicant_assoc_try(struct wpa_supplicant *wpa_s,
if (ssid == NULL) { if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "wpa_supplicant_scan: Reached " wpa_printf(MSG_DEBUG, "wpa_supplicant_scan: Reached "
"end of scan list - go back to beginning"); "end of scan list - go back to beginning");
wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_supplicant_req_scan(wpa_s, 0, 0);
return; return;
} }
@ -100,7 +100,7 @@ static void wpa_supplicant_assoc_try(struct wpa_supplicant *wpa_s,
wpa_s->prev_scan_ssid = ssid; wpa_s->prev_scan_ssid = ssid;
} else { } else {
/* Start from the beginning of the SSID list. */ /* Start from the beginning of the SSID list. */
wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
} }
wpa_supplicant_associate(wpa_s, NULL, ssid); wpa_supplicant_associate(wpa_s, NULL, ssid);
} }
@ -174,7 +174,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
/* Find the starting point from which to continue scanning */ /* Find the starting point from which to continue scanning */
ssid = wpa_s->conf->ssid; ssid = wpa_s->conf->ssid;
if (wpa_s->prev_scan_ssid != BROADCAST_SSID_SCAN) { if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) {
while (ssid) { while (ssid) {
if (ssid == wpa_s->prev_scan_ssid) { if (ssid == wpa_s->prev_scan_ssid) {
ssid = ssid->next; ssid = ssid->next;
@ -189,8 +189,8 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
return; return;
} else if (wpa_s->conf->ap_scan == 2) { } else if (wpa_s->conf->ap_scan == 2) {
/* /*
* User-initiated scan request in ap_scan == 2; use broadcast * User-initiated scan request in ap_scan == 2; scan with
* scan. * wildcard SSID.
*/ */
ssid = NULL; ssid = NULL;
} else { } else {
@ -221,15 +221,15 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
if (ssid) { if (ssid) {
wpa_s->prev_scan_ssid = ssid; wpa_s->prev_scan_ssid = ssid;
if (max_ssids > 1) { if (max_ssids > 1) {
wpa_printf(MSG_DEBUG, "Include broadcast SSID in the " wpa_printf(MSG_DEBUG, "Include wildcard SSID in the "
"scan request"); "scan request");
params.num_ssids++; /* Broadcast scan */ params.num_ssids++;
} }
wpa_printf(MSG_DEBUG, "Starting AP scan for specific SSID(s)"); wpa_printf(MSG_DEBUG, "Starting AP scan for specific SSID(s)");
} else { } else {
wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
params.num_ssids++; params.num_ssids++;
wpa_printf(MSG_DEBUG, "Starting AP scan for broadcast SSID"); wpa_printf(MSG_DEBUG, "Starting AP scan for wildcard SSID");
} }
#ifdef CONFIG_WPS #ifdef CONFIG_WPS

2
wpa_supplicant/wpa_supplicant.c
View file

@ -1688,7 +1688,7 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s)
wpa_printf(MSG_DEBUG, "RSN: flushing PMKID list in the driver"); wpa_printf(MSG_DEBUG, "RSN: flushing PMKID list in the driver");
wpa_drv_flush_pmkid(wpa_s); wpa_drv_flush_pmkid(wpa_s);
wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN;
wpa_supplicant_req_scan(wpa_s, interface_count, 100000); wpa_supplicant_req_scan(wpa_s, interface_count, 100000);
interface_count++; interface_count++;

6
wpa_supplicant/wpa_supplicant_i.h
View file

@ -309,11 +309,11 @@ struct wpa_supplicant {
struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID; struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID;
* NULL = not yet initialized (start * NULL = not yet initialized (start
* with broadcast SSID) * with wildcard SSID)
* BROADCAST_SSID_SCAN = broadcast * WILDCARD_SSID_SCAN = wildcard
* SSID was used in the previous scan * SSID was used in the previous scan
*/ */
#define BROADCAST_SSID_SCAN ((struct wpa_ssid *) 1) #define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1)
struct wpa_scan_results *scan_res; struct wpa_scan_results *scan_res;