1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
Add a scan result cache to improve roaming speed if the driver gave us a background scan before losing the connection.
Index: wpa_supplicant-0.6.3/wpa_supplicant/config.h
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/config.h 2008-02-23 03:45:24.000000000 +0100
+++ wpa_supplicant-0.6.3/wpa_supplicant/config.h 2008-07-10 15:08:21.000000000 +0200
@@ -97,6 +97,12 @@
int ap_scan;
/**
+ * scan_cache - controls the time in seconds after the last scan results
+ * before a new scan may be initiated
+ */
+ int scan_cache;
+
+ /**
* ctrl_interface - Parameters for the control interface
*
* If this is specified, %wpa_supplicant will open a control interface
Index: wpa_supplicant-0.6.3/wpa_supplicant/config_file.c
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/config_file.c 2008-02-23 03:45:24.000000000 +0100
+++ wpa_supplicant-0.6.3/wpa_supplicant/config_file.c 2008-07-10 15:59:38.000000000 +0200
@@ -312,6 +312,13 @@
return 0;
}
+static int wpa_config_process_scan_cache(struct wpa_config *config, char *pos)
+{
+ config->scan_cache = atoi(pos);
+ wpa_printf(MSG_DEBUG, "scan_cache=%d", config->scan_cache);
+ return 0;
+}
+
static int wpa_config_process_fast_reauth(struct wpa_config *config, char *pos)
{
@@ -445,6 +452,9 @@
if (os_strncmp(pos, "ap_scan=", 8) == 0)
return wpa_config_process_ap_scan(config, pos + 8);
+ if (os_strncmp(pos, "scan_cache=", 11) == 0)
+ return wpa_config_process_scan_cache(config, pos + 11);
+
if (os_strncmp(pos, "fast_reauth=", 12) == 0)
return wpa_config_process_fast_reauth(config, pos + 12);
@@ -810,6 +820,8 @@
fprintf(f, "eapol_version=%d\n", config->eapol_version);
if (config->ap_scan != DEFAULT_AP_SCAN)
fprintf(f, "ap_scan=%d\n", config->ap_scan);
+ if (config->scan_cache != 0)
+ fprintf(f, "scan_cache=%d\n", config->scan_cache);
if (config->fast_reauth != DEFAULT_FAST_REAUTH)
fprintf(f, "fast_reauth=%d\n", config->fast_reauth);
#ifdef EAP_TLS_OPENSSL
Index: wpa_supplicant-0.6.3/wpa_supplicant/events.c
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/events.c 2008-07-10 13:27:03.000000000 +0200
+++ wpa_supplicant-0.6.3/wpa_supplicant/events.c 2008-07-10 17:18:53.000000000 +0200
@@ -555,6 +555,9 @@
if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
return;
+ if (wpa_s->wpa_state > WPA_ASSOCIATED)
+ goto done;
+
while (selected == NULL) {
for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
selected = wpa_supplicant_select_bss(
@@ -594,13 +597,16 @@
rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res);
} else {
wpa_printf(MSG_DEBUG, "No suitable AP found.");
- timeout = 5;
+ timeout = 1;
goto req_scan;
}
+done:
+ os_get_time(&wpa_s->last_scan_results);
return;
req_scan:
+ memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results));
if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) {
/*
* Quick recovery if the initial scan results were not
@@ -804,6 +810,9 @@
}
if (wpa_s->wpa_state >= WPA_ASSOCIATED)
wpa_supplicant_req_scan(wpa_s, 0, 100000);
+ else if (wpa_s->wpa_state == WPA_ASSOCIATING)
+ wpa_supplicant_req_auth_timeout(wpa_s, 0, 100000);
+
bssid = wpa_s->bssid;
if (os_memcmp(bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0)
bssid = wpa_s->pending_bssid;
Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant_i.h 2008-07-10 15:03:56.000000000 +0200
+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant_i.h 2008-07-10 15:16:17.000000000 +0200
@@ -334,6 +334,7 @@
struct wpa_client_mlme mlme;
int use_client_mlme;
int driver_4way_handshake;
+ struct os_time last_scan_results;
};
@@ -381,6 +382,7 @@
/* scan.c */
void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
+int wpa_supplicant_may_scan(struct wpa_supplicant *wpa_s);
void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
/* events.c */
Index: wpa_supplicant-0.6.3/wpa_supplicant/scan.c
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/scan.c 2008-07-10 13:27:03.000000000 +0200
+++ wpa_supplicant-0.6.3/wpa_supplicant/scan.c 2008-07-10 16:24:31.000000000 +0200
@@ -40,6 +40,18 @@
wpa_supplicant_event(wpa_s, EVENT_ASSOC, &data);
}
+int wpa_supplicant_may_scan(struct wpa_supplicant *wpa_s)
+{
+ struct os_time time;
+
+ if (wpa_s->conf->scan_cache > 0) {
+ os_get_time(&time);
+ time.sec -= wpa_s->conf->scan_cache;
+ if (os_time_before(&time, &wpa_s->last_scan_results))
+ return 0;
+ }
+ return 1;
+}
static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
{
@@ -150,8 +162,9 @@
} else
wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN;
- if (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
- !wpa_s->use_client_mlme) {
+ if (!wpa_supplicant_may_scan(wpa_s) ||
+ (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
+ !wpa_s->use_client_mlme)) {
wpa_s->scan_res_tried++;
wpa_printf(MSG_DEBUG, "Trying to get current scan results "
"first without requesting a new scan to speed up "
Index: wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.6.3.orig/wpa_supplicant/wpa_supplicant.c 2008-07-10 14:41:16.000000000 +0200
+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-07-10 18:45:59.000000000 +0200
@@ -1417,6 +1417,9 @@
{
struct wpa_supplicant *wpa_s = ctx;
+ if (wpa_s->wpa_state < WPA_ASSOCIATING)
+ return;
+
wpa_printf(MSG_DEBUG, "RX EAPOL from " MACSTR, MAC2STR(src_addr));
wpa_hexdump(MSG_MSGDUMP, "RX EAPOL", buf, len);
|
