X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ec5c35ec9f23254f09e734d0c1880559774dfa52..c59b64e643386f42f4329d77d25070be264245da:/components/wifi.c?ds=inline

diff --git a/components/wifi.c b/components/wifi.c
index b3e1723..9de543b 100644
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <ifaddrs.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,7 +13,7 @@
 	#include <linux/wireless.h>
 
 	const char *
-	wifi_perc(const char *iface)
+	wifi_perc(const char *interface)
 	{
 		int i, cur;
 		int total = 70; /* the max of /proc/net/wireless */
@@ -25,7 +24,7 @@
 
 		if (esnprintf(path, sizeof(path),
 		              "/sys/class/net/%s/operstate",
-		              iface) < 0) {
+		              interface) < 0) {
 			return NULL;
 		}
 		if (!(fp = fopen(path, "r"))) {
@@ -52,11 +51,11 @@
 			return NULL;
 		}
 
-		if (!(datastart = strstr(buf, iface))) {
+		if (!(datastart = strstr(buf, interface))) {
 			return NULL;
 		}
 
-		datastart = (datastart+(strlen(iface)+1));
+		datastart = (datastart+(strlen(interface)+1));
 		sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
 		       "%*d\t\t%*d\t\t %*d\t  %*d\t\t %*d", &cur);
 
@@ -64,7 +63,7 @@
 	}
 
 	const char *
-	wifi_essid(const char *iface)
+	wifi_essid(const char *interface)
 	{
 		static char id[IW_ESSID_MAX_SIZE+1];
 		int sockfd;
@@ -73,7 +72,7 @@
 		memset(&wreq, 0, sizeof(struct iwreq));
 		wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
 		if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name),
-		              "%s", iface) < 0) {
+		              "%s", interface) < 0) {
 			return NULL;
 		}
 
@@ -106,10 +105,11 @@
 	#include <sys/types.h>
 
 	static int
-	load_ieee80211_nodereq(const char *iface, struct ieee80211_nodereq *nr)
+	load_ieee80211_nodereq(const char *interface, struct ieee80211_nodereq *nr)
 	{
 		struct ieee80211_bssid bssid;
 		int sockfd;
+		uint8_t zero_bssid[IEEE80211_ADDR_LEN];
 
 		memset(&bssid, 0, sizeof(bssid));
 		memset(nr, 0, sizeof(struct ieee80211_nodereq));
@@ -117,13 +117,19 @@
 			warn("socket 'AF_INET':");
 			return 0;
 		}
-		strlcpy(bssid.i_name, iface, sizeof(bssid.i_name));
+		strlcpy(bssid.i_name, interface, sizeof(bssid.i_name));
 		if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) {
 			warn("ioctl 'SIOCG80211BSSID':");
 			close(sockfd);
 			return 0;
 		}
-		strlcpy(nr->nr_ifname, iface, sizeof(nr->nr_ifname));
+		memset(&zero_bssid, 0, sizeof(zero_bssid));
+		if (memcmp(bssid.i_bssid, zero_bssid,
+		    IEEE80211_ADDR_LEN) == 0) {
+			close(sockfd);
+			return 0;
+		}
+		strlcpy(nr->nr_ifname, interface, sizeof(nr->nr_ifname));
 		memcpy(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr));
 		if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) {
 			warn("ioctl 'SIOCG80211NODE':");
@@ -135,12 +141,12 @@
 	}
 
 	const char *
-	wifi_perc(const char *iface)
+	wifi_perc(const char *interface)
 	{
 		struct ieee80211_nodereq nr;
 		int q;
 
-		if (load_ieee80211_nodereq(iface, &nr)) {
+		if (load_ieee80211_nodereq(interface, &nr)) {
 			if (nr.nr_max_rssi) {
 				q = IEEE80211_NODEREQ_RSSI(&nr);
 			} else {
@@ -154,11 +160,11 @@
 	}
 
 	const char *
-	wifi_essid(const char *iface)
+	wifi_essid(const char *interface)
 	{
 		struct ieee80211_nodereq nr;
 
-		if (load_ieee80211_nodereq(iface, &nr)) {
+		if (load_ieee80211_nodereq(interface, &nr)) {
 			return bprintf("%s", nr.nr_nwid);
 		}