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

WPS: Add MAC address to validation error message for Probe Request 

This makes it easier to figure out which device is sending invalid
Probe Request frames.
This commit is contained in:
Jouni Malinen 2010-09-22 10:07:20 -07:00 committed by Jouni Malinen
parent b4e34f2fdf
commit baf7081ccd
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ap/wps_hostapd.c
View File

@ -881,7 +881,7 @@ static int hostapd_wps_probe_req_rx(void *ctx, const u8 *addr,
wps_ie = ieee802_11_vendor_ie_concat(ie, ie_len, WPS_DEV_OUI_WFA);
if (wps_ie == NULL)
return 0;
if (wps_validate_probe_req(wps_ie) < 0) {
if (wps_validate_probe_req(wps_ie, addr) < 0) {
wpabuf_free(wps_ie);
return 0;
}

5
src/wps/wps.h
View File

@ -770,7 +770,7 @@ u16 wps_config_methods_str2bin(const char *str);
int wps_validate_beacon(const struct wpabuf *wps_ie);
int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe,
const u8 *addr);
int wps_validate_probe_req(const struct wpabuf *wps_ie);
int wps_validate_probe_req(const struct wpabuf *wps_ie, const u8 *addr);
int wps_validate_assoc_req(const struct wpabuf *wps_ie);
int wps_validate_assoc_resp(const struct wpabuf *wps_ie);
int wps_validate_m1(const struct wpabuf *tlvs);
@ -802,7 +802,8 @@ static inline int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie,
return 0;
}
static inline int wps_validate_probe_req(const struct wpabuf *wps_ie)
static inline int wps_validate_probe_req(const struct wpabuf *wps_ie,
const u8 *addr)
{
return 0;
}

4
src/wps/wps_validate.c
View File

@ -1181,7 +1181,7 @@ int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe,
}
int wps_validate_probe_req(const struct wpabuf *wps_ie)
int wps_validate_probe_req(const struct wpabuf *wps_ie, const u8 *addr)
{
struct wps_parse_attr attr;
int wps2;
@ -1220,7 +1220,7 @@ int wps_validate_probe_req(const struct wpabuf *wps_ie)
wps_validate_req_dev_type(attr.req_dev_type, attr.num_req_dev_type,
0)) {
wpa_printf(MSG_INFO, "WPS-STRICT: Invalid Probe Request "
"frame");
"frame from " MACSTR, MAC2STR(addr));
return -1;
}