X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ca8a146f03622149fbf9378e72b6ca02f25c5e55..e213b48122f1f8e8d837053324d9c891a67a38d2:/components/wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 339667f..8863252 100644
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -1,10 +1,9 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <ifaddrs.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <unistd.h>
 
 #include "../util.h"
@@ -14,31 +13,31 @@
 	#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 */
+		int cur;
+		size_t i;
 		char *p, *datastart;
 		char path[PATH_MAX];
 		char status[5];
 		FILE *fp;
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface,
-		         "/operstate");
+		if (esnprintf(path, sizeof(path), "/sys/class/net/%s/operstate",
+		              interface) < 0) {
+			return NULL;
+		}
 		if (!(fp = fopen(path, "r"))) {
-			fprintf(stderr, "fopen '%s': %s\n", path,
-			        strerror(errno));
+			warn("fopen '%s':", path);
 			return NULL;
 		}
 		p = fgets(status, 5, fp);
 		fclose(fp);
-		if(!p || strcmp(status, "up\n") != 0) {
+		if (!p || strcmp(status, "up\n") != 0) {
 			return NULL;
 		}
 
 		if (!(fp = fopen("/proc/net/wireless", "r"))) {
-			fprintf(stderr, "fopen '/proc/net/wireless': %s\n",
-			        strerror(errno));
+			warn("fopen '/proc/net/wireless':");
 			return NULL;
 		}
 
@@ -51,19 +50,20 @@
 			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);
 
-		return bprintf("%d", (int)((float)cur / total * 100));
+		/* 70 is the max of /proc/net/wireless */
+		return bprintf("%d", (int)((float)cur / 70 * 100));
 	}
 
 	const char *
-	wifi_essid(const char *iface)
+	wifi_essid(const char *interface)
 	{
 		static char id[IW_ESSID_MAX_SIZE+1];
 		int sockfd;
@@ -71,16 +71,18 @@
 
 		memset(&wreq, 0, sizeof(struct iwreq));
 		wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
-		snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+		if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s",
+		              interface) < 0) {
+			return NULL;
+		}
 
 		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-			fprintf(stderr, "socket 'AF_INET': %s\n",
-			        strerror(errno));
+			warn("socket 'AF_INET':");
 			return NULL;
 		}
 		wreq.u.essid.pointer = id;
 		if (ioctl(sockfd,SIOCGIWESSID, &wreq) < 0) {
-			fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
+			warn("ioctl 'SIOCGIWESSID':");
 			close(sockfd);
 			return NULL;
 		}
@@ -97,35 +99,40 @@
 	#include <net/if.h>
 	#include <net/if_media.h>
 	#include <net80211/ieee80211.h>
+	#include <sys/select.h> /* before <sys/ieee80211_ioctl.h> for NBBY */
 	#include <net80211/ieee80211_ioctl.h>
 	#include <stdlib.h>
 	#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));
 		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-			fprintf(stderr, "socket 'AF_INET': %s\n",
-				strerror(errno));
+			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) {
-			fprintf(stderr, "ioctl 'SIOCG80211BSSID': %s\n",
-				strerror(errno));
+			warn("ioctl 'SIOCG80211BSSID':");
+			close(sockfd);
+			return 0;
+		}
+		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, iface, sizeof(nr->nr_ifname));
+		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) {
-			fprintf(stderr, "ioctl 'SIOCG80211NODE': %s\n",
-				strerror(errno));
+			warn("ioctl 'SIOCG80211NODE':");
 			close(sockfd);
 			return 0;
 		}
@@ -134,17 +141,18 @@
 	}
 
 	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 {
-				q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
-				(2 * (nr.nr_rssi + 100)));
+				q = nr.nr_rssi >= -50 ? 100 :
+				    (nr.nr_rssi <= -100 ? 0 :
+				    (2 * (nr.nr_rssi + 100)));
 			}
 			return bprintf("%d", q);
 		}
@@ -153,11 +161,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);
 		}