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

Replace hostapd_button_pushed() with generic driver event

Browse source
This commit is contained in:
Jouni Malinen 2009-12-13 21:21:10 +02:00
parent f2dab64ee3
commit fcf0f87d97
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hostapd/drv_callbacks.c
View file

@ -463,6 +463,9 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
data->ft_rrb_rx.data, data->ft_rrb_rx.data_len); data->ft_rrb_rx.data, data->ft_rrb_rx.data_len);
break; break;
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
case EVENT_WPS_BUTTON_PUSHED:
hostapd_wps_button_pushed(hapd);
break;
default: default:
wpa_printf(MSG_DEBUG, "Unknown event %d", event); wpa_printf(MSG_DEBUG, "Unknown event %d", event);
break; break;
@ -480,9 +483,3 @@ void hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa,
hapd->probereq_cb[i].cb(hapd->probereq_cb[i].ctx, hapd->probereq_cb[i].cb(hapd->probereq_cb[i].ctx,
sa, ie, ie_len); sa, ie, ie_len);
} }
void hostapd_button_pushed(struct hostapd_data *hapd)
{
hostapd_wps_button_pushed(hapd);
}

8
src/drivers/driver.h
View file

@ -1706,7 +1706,12 @@ typedef enum wpa_event_type {
/** /**
* EVENT_FT_RRB_RX - FT (IEEE 802.11r) RRB frame received * EVENT_FT_RRB_RX - FT (IEEE 802.11r) RRB frame received
*/ */
EVENT_FT_RRB_RX EVENT_FT_RRB_RX,
/**
* EVENT_WPS_BUTTON_PUSHED - Report hardware push button press for WPS
*/
EVENT_WPS_BUTTON_PUSHED
} wpa_event_type; } wpa_event_type;
@ -1973,6 +1978,5 @@ struct hostapd_data * hostapd_sta_get_bss(struct hostapd_data *hapd,
const u8 *addr); const u8 *addr);
void hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, void hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa,
const u8 *ie, size_t ie_len); const u8 *ie, size_t ie_len);
void hostapd_button_pushed(struct hostapd_data *hapd);
#endif /* DRIVER_H */ #endif /* DRIVER_H */

2
src/drivers/driver_atheros.c
View file

@ -847,7 +847,7 @@ madwifi_wireless_event_wireless_custom(struct madwifi_driver_data *drv,
/* PROBLEM! this event is received for ALL BSSs ... /* PROBLEM! this event is received for ALL BSSs ...
* so all are enabled for WPS... ugh. * so all are enabled for WPS... ugh.
*/ */
hostapd_button_pushed(drv->hapd); wpa_supplicant_event(drv->hapd, EVENT_WPS_BUTTON_PUSHED, NULL);
} else if (strncmp(custom, "Manage.prob_req ", 16) == 0) { } else if (strncmp(custom, "Manage.prob_req ", 16) == 0) {
/* /*
* Atheros driver uses a hack to pass Probe Request frames as a * Atheros driver uses a hack to pass Probe Request frames as a