Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-17 18:34:03 -05:00
Code Issues Projects Releases Wiki Activity

bgscan: Provide scan results to the notify_scan handler

Browse Source
This commit is contained in:
Jouni Malinen 2010-07-10 15:43:44 -07:00
parent 3b038d7968
commit c2594c3677
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wpa_supplicant/bgscan.c
View File

@ -88,10 +88,12 @@ void bgscan_deinit(struct wpa_supplicant *wpa_s)
} }
int bgscan_notify_scan(struct wpa_supplicant *wpa_s) int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{ {
if (wpa_s->bgscan && wpa_s->bgscan_priv) if (wpa_s->bgscan && wpa_s->bgscan_priv)
return wpa_s->bgscan->notify_scan(wpa_s->bgscan_priv); return wpa_s->bgscan->notify_scan(wpa_s->bgscan_priv,
scan_res);
return 0; return 0;
} }

8
wpa_supplicant/bgscan.h
View File

@ -25,7 +25,7 @@ struct bgscan_ops {
const struct wpa_ssid *ssid); const struct wpa_ssid *ssid);
void (*deinit)(void *priv); void (*deinit)(void *priv);
int (*notify_scan)(void *priv); int (*notify_scan)(void *priv, struct wpa_scan_results *scan_res);
void (*notify_beacon_loss)(void *priv); void (*notify_beacon_loss)(void *priv);
void (*notify_signal_change)(void *priv, int above); void (*notify_signal_change)(void *priv, int above);
}; };
@ -34,7 +34,8 @@ struct bgscan_ops {
int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); int bgscan_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
void bgscan_deinit(struct wpa_supplicant *wpa_s); void bgscan_deinit(struct wpa_supplicant *wpa_s);
int bgscan_notify_scan(struct wpa_supplicant *wpa_s); int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res);
void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s); void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s);
void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above); void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above);
@ -50,7 +51,8 @@ static inline void bgscan_deinit(struct wpa_supplicant *wpa_s)
{ {
} }
static inline int bgscan_notify_scan(struct wpa_supplicant *wpa_s) static inline int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{ {
return 0; return 0;
} }

3
wpa_supplicant/bgscan_simple.c
View File

@ -138,7 +138,8 @@ static void bgscan_simple_deinit(void *priv)
} }
static int bgscan_simple_notify_scan(void *priv) static int bgscan_simple_notify_scan(void *priv,
struct wpa_scan_results *scan_res)
{ {
struct bgscan_simple_data *data = priv; struct bgscan_simple_data *data = priv;

2
wpa_supplicant/events.c
View File

@ -938,7 +938,7 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
return; return;
} }
if (bgscan_notify_scan(wpa_s) == 1) { if (bgscan_notify_scan(wpa_s, scan_res) == 1) {
wpa_scan_results_free(scan_res); wpa_scan_results_free(scan_res);
return; return;
} }