From 9d045fae0ef93c76256345705d1b39f97f8739d7 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 3 Sep 2021 16:32:51 -0500
Subject: [PATCH] scan: Parse network cost IE info into scan_bss

---
 src/scan.c | 35 ++++++++++++++++++++++++-----------
 src/scan.h |  2 ++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/scan.c b/src/scan.c
index 16bd2a87..cdc14dbd 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -911,25 +911,39 @@ static bool start_next_scan_request(struct wiphy_radio_work_item *item)
 	return true;
 }
 
-static bool scan_parse_vendor_specific(struct scan_bss *bss, const void *data,
+static void scan_parse_vendor_specific(struct scan_bss *bss, const void *data,
 					uint16_t len)
 {
-	if (!bss->wpa && is_ie_wpa_ie(data, len))
+	uint16_t cost_level;
+	uint16_t cost_flags;
+
+	if (!bss->wpa && is_ie_wpa_ie(data, len)) {
 		bss->wpa = l_memdup(data - 2, len + 2);
-	else if (!bss->osen && is_ie_wfa_ie(data, len, IE_WFA_OI_OSEN))
+		return;
+	}
+
+	if (!bss->osen && is_ie_wfa_ie(data, len, IE_WFA_OI_OSEN)) {
 		bss->osen = l_memdup(data - 2, len + 2);
-	else if (is_ie_wfa_ie(data, len, IE_WFA_OI_HS20_INDICATION)) {
+		return;
+	}
+
+	if (is_ie_wfa_ie(data, len, IE_WFA_OI_HS20_INDICATION)) {
 		if (ie_parse_hs20_indication_from_data(data - 2, len + 2,
 					&bss->hs20_version, NULL, NULL) < 0)
-			return false;
+			return;
 
 		bss->hs20_capable = true;
-	} else if (is_ie_default_sae_group_oui(data, len))
-		bss->force_default_sae_group = true;
-	else
-		return false;
+		return;
+	}
 
-	return true;
+	if (!ie_parse_network_cost(data, len, &cost_level, &cost_flags)) {
+		bss->cost_level = cost_level;
+		bss->cost_flags = cost_flags;
+		return;
+	}
+
+	if (is_ie_default_sae_group_oui(data, len))
+		bss->force_default_sae_group = true;
 }
 
 /*
@@ -1021,7 +1035,6 @@ static bool scan_parse_bss_information_elements(struct scan_bss *bss,
 
 			break;
 		case IE_TYPE_VENDOR_SPECIFIC:
-			/* Interested only in WPA/WFA IE from Vendor data */
 			scan_parse_vendor_specific(bss, iter.data, iter.len);
 			break;
 		case IE_TYPE_MOBILITY_DOMAIN:
diff --git a/src/scan.h b/src/scan.h
index 8a57c2b3..be8912e6 100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -84,6 +84,8 @@ struct scan_bss {
 	bool anqp_capable : 1;
 	bool hs20_capable : 1;
 	bool force_default_sae_group : 1;
+	uint8_t cost_level : 3;
+	uint8_t cost_flags : 4;
 };
 
 struct scan_parameters {