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

driver_test: Learn scan result channel from DS Params IE

Browse source
This commit is contained in:
Jouni Malinen 2010-01-16 12:26:03 +02:00 committed by Jouni Malinen
parent c35faef51a
commit d455d0806e
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/drivers/driver_test.c
View file

@ -1692,6 +1692,25 @@ static int wpa_driver_test_disassociate(void *priv, const u8 *addr,
} }
static const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
{
const u8 *end, *pos;
pos = (const u8 *) (res + 1);
end = pos + res->ie_len;
while (pos + 1 < end) {
if (pos + 2 + pos[1] > end)
break;
if (pos[0] == ie)
return pos;
pos += 2 + pos[1];
}
return NULL;
}
static void wpa_driver_test_scanresp(struct wpa_driver_test_data *drv, static void wpa_driver_test_scanresp(struct wpa_driver_test_data *drv,
struct sockaddr *from, struct sockaddr *from,
socklen_t fromlen, socklen_t fromlen,
@ -1702,6 +1721,7 @@ static void wpa_driver_test_scanresp(struct wpa_driver_test_data *drv,
size_t len; size_t len;
u8 *ie_pos, *ie_start, *ie_end; u8 *ie_pos, *ie_start, *ie_end;
#define MAX_IE_LEN 1000 #define MAX_IE_LEN 1000
const u8 *ds_params;
wpa_printf(MSG_DEBUG, "test_driver: SCANRESP %s", data); wpa_printf(MSG_DEBUG, "test_driver: SCANRESP %s", data);
if (drv->num_scanres >= MAX_SCAN_RESULTS) { if (drv->num_scanres >= MAX_SCAN_RESULTS) {
@ -1776,6 +1796,12 @@ static void wpa_driver_test_scanresp(struct wpa_driver_test_data *drv,
res->caps |= IEEE80211_CAP_IBSS; res->caps |= IEEE80211_CAP_IBSS;
} }
ds_params = wpa_scan_get_ie(res, WLAN_EID_DS_PARAMS);
if (ds_params && ds_params[1] > 0) {
if (ds_params[2] >= 1 && ds_params[2] <= 13)
res->freq = 2407 + ds_params[2] * 5;
}
os_free(drv->scanres[drv->num_scanres]); os_free(drv->scanres[drv->num_scanres]);
drv->scanres[drv->num_scanres++] = res; drv->scanres[drv->num_scanres++] = res;
} }