nl80211: attempt to query Mesh ID from ubus
authorJo-Philipp Wich <jo@mein.io>
Tue, 24 Jul 2018 14:41:47 +0000 (16:41 +0200)
committerJo-Philipp Wich <jo@mein.io>
Tue, 24 Jul 2018 15:36:22 +0000 (17:36 +0200)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
iwinfo_nl80211.c

index fe307abb350dd00d06f3145b8ab71c2cbdd06081..ca78742b1a199f9a2bc1544a67677930f75c1152 100644 (file)
@@ -1115,6 +1115,11 @@ static int nl80211_get_ssid(const char *ifname, char *buf)
                nl80211_hostapd_query(ifname, "ssid", sb.ssid,
                                      IWINFO_ESSID_MAX_SIZE + 1);
 
+       /* failed, try to obtain Mesh ID */
+       if (sb.ssid[0] == 0)
+               iwinfo_ubus_query(res ? res : ifname, "mesh_id",
+                                 sb.ssid, IWINFO_ESSID_MAX_SIZE + 1);
+
        return (sb.ssid[0] == 0) ? -1 : 0;
 }