mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2025-01-17 18:34:03 -05:00
ctrl_iface: Return only finished line for scan results
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
parent
2a0cd0670b
commit
fb0e5bd7df
@ -1092,7 +1092,7 @@ static int wpa_supplicant_ctrl_iface_scan_result(
|
|||||||
ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
|
ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
|
||||||
MAC2STR(bss->bssid), bss->freq, bss->level);
|
MAC2STR(bss->bssid), bss->freq, bss->level);
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
|
ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
|
||||||
if (ie)
|
if (ie)
|
||||||
@ -1104,37 +1104,37 @@ static int wpa_supplicant_ctrl_iface_scan_result(
|
|||||||
if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
||||||
ret = os_snprintf(pos, end - pos, "[WEP]");
|
ret = os_snprintf(pos, end - pos, "[WEP]");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
if (bss->caps & IEEE80211_CAP_IBSS) {
|
if (bss->caps & IEEE80211_CAP_IBSS) {
|
||||||
ret = os_snprintf(pos, end - pos, "[IBSS]");
|
ret = os_snprintf(pos, end - pos, "[IBSS]");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
if (bss->caps & IEEE80211_CAP_ESS) {
|
if (bss->caps & IEEE80211_CAP_ESS) {
|
||||||
ret = os_snprintf(pos, end - pos, "[ESS]");
|
ret = os_snprintf(pos, end - pos, "[ESS]");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
if (p2p) {
|
if (p2p) {
|
||||||
ret = os_snprintf(pos, end - pos, "[P2P]");
|
ret = os_snprintf(pos, end - pos, "[P2P]");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = os_snprintf(pos, end - pos, "\t%s",
|
ret = os_snprintf(pos, end - pos, "\t%s",
|
||||||
wpa_ssid_txt(bss->ssid, bss->ssid_len));
|
wpa_ssid_txt(bss->ssid, bss->ssid_len));
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
|
|
||||||
ret = os_snprintf(pos, end - pos, "\n");
|
ret = os_snprintf(pos, end - pos, "\n");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return -1;
|
||||||
pos += ret;
|
pos += ret;
|
||||||
|
|
||||||
return pos - buf;
|
return pos - buf;
|
||||||
|
Loading…
Reference in New Issue
Block a user