Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-29 22:19:23 +01:00
Code Releases Activity

scan: Simplify parsing logic

Browse Source 
scan_parse_result used to parse the wdev and return this to the caller
where it was compared against the expected wdev.  Simplify this by
extract the wdev first, and proceeding with the bss parsing afterwards.
This commit is contained in:
Denis Kenzior 2021-05-28 15:50:25 -05:00
parent 10ac107ba6
commit 8679b82db4
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/scan.c
View File

@ -1280,27 +1280,17 @@ static struct scan_freq_set *scan_parse_attr_scan_frequencies(
} }
static struct scan_bss *scan_parse_result(struct l_genl_msg *msg, static struct scan_bss *scan_parse_result(struct l_genl_msg *msg,
uint64_t *out_wdev,
uint32_t *out_seen_ms_ago) uint32_t *out_seen_ms_ago)
{ {
struct l_genl_attr attr, nested; struct l_genl_attr attr, nested;
uint16_t type, len; uint16_t type;
const void *data;
const uint64_t *wdev = NULL;
struct scan_bss *bss = NULL; struct scan_bss *bss = NULL;
if (!l_genl_attr_init(&attr, msg)) if (!l_genl_attr_init(&attr, msg))
return NULL; return NULL;
while (l_genl_attr_next(&attr, &type, &len, &data)) { while (l_genl_attr_next(&attr, &type, NULL, NULL)) {
switch (type) { switch (type) {
case NL80211_ATTR_WDEV:
if (len != sizeof(uint64_t))
return NULL;
wdev = data;
break;
case NL80211_ATTR_BSS: case NL80211_ATTR_BSS:
if (!l_genl_attr_recurse(&attr, &nested)) if (!l_genl_attr_recurse(&attr, &nested))
return NULL; return NULL;
@ -1310,17 +1300,6 @@ static struct scan_bss *scan_parse_result(struct l_genl_msg *msg,
} }
} }
if (!bss)
return NULL;
if (!wdev) {
scan_bss_free(bss);
return NULL;
}
if (out_wdev)
*out_wdev = *wdev;
return bss; return bss;
} }
@ -1486,16 +1465,19 @@ static void get_scan_callback(struct l_genl_msg *msg, void *user_data)
l_debug("get_scan_callback"); l_debug("get_scan_callback");
bss = scan_parse_result(msg, &wdev_id, &seen_ms_ago); if (nl80211_parse_attrs(msg, NL80211_ATTR_WDEV, &wdev_id,
if (!bss) NL80211_ATTR_UNSPEC) < 0)
return; return;
if (wdev_id != sc->wdev_id) { if (wdev_id != sc->wdev_id) {
l_warn("wdev mismatch in get_scan_callback"); l_warn("wdev mismatch in get_scan_callback");
scan_bss_free(bss);
return; return;
} }
bss = scan_parse_result(msg, &seen_ms_ago);
if (!bss)
return;
if (!bss->time_stamp) if (!bss->time_stamp)
bss->time_stamp = results->time_stamp - bss->time_stamp = results->time_stamp -
seen_ms_ago * L_USEC_PER_MSEC; seen_ms_ago * L_USEC_PER_MSEC;