X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/80fc20d1d69b14f36ad9bb64d8af38481cbf1ff5..1452a44832a302d8928793b889aafd05ab54df2c:/components/wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 591f6ad..3751ae3 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>
@@ -23,8 +22,11 @@
 		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",
+		              iface) < 0) {
+			return NULL;
+		}
 		if (!(fp = fopen(path, "r"))) {
 			warn("fopen '%s':", path);
 			return NULL;
@@ -69,7 +71,10 @@
 
 		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", iface) < 0) {
+			return NULL;
+		}
 
 		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
 			warn("socket 'AF_INET':");
@@ -104,6 +109,7 @@
 	{
 		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,6 +123,12 @@
 			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));
 		memcpy(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr));
 		if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) {