From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 23 Jul 2018 14:37:28 +0000 (+0200)
Subject: nl80211: handle Mesh ID IE
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49c0a4b1a2ad6f7dbb869d22b26c8d000d2ebe64;p=oweals%2Fiwinfo.git

nl80211: handle Mesh ID IE

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index 49a1831..d135d30 100644
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -2074,9 +2074,12 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
 		switch (ie[0])
 		{
 		case 0: /* SSID */
-			len = min(ie[1], IWINFO_ESSID_MAX_SIZE);
-			memcpy(e->ssid, ie + 2, len);
-			e->ssid[len] = 0;
+		case 114: /* Mesh ID */
+			if (e->ssid[0] == 0) {
+				len = min(ie[1], IWINFO_ESSID_MAX_SIZE);
+				memcpy(e->ssid, ie + 2, len);
+				e->ssid[len] = 0;
+			}
 			break;
 
 		case 48: /* RSN */