X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/1fc5cf00166a5dfefa89c3d6abbe92fedaf71e27..977be0cf4f369f586d0606887498066ee0565e2f:/components/wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index edbcc01..414d533 100644
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -1,16 +1,17 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <ifaddrs.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "../util.h"
+
 #if defined(__linux__)
-	#include <errno.h>
-	#include <ifaddrs.h>
 	#include <limits.h>
 	#include <linux/wireless.h>
-	#include <sys/socket.h>
-	#include <stdio.h>
-	#include <string.h>
-	#include <sys/ioctl.h>
-	#include <unistd.h>
-
-	#include "../util.h"
 
 	const char *
 	wifi_perc(const char *iface)
@@ -65,14 +66,14 @@
 	wifi_essid(const char *iface)
 	{
 		static char id[IW_ESSID_MAX_SIZE+1];
-		int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+		int sockfd;
 		struct iwreq wreq;
 
 		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 (sockfd < 0) {
+		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
 			fprintf(stderr, "socket 'AF_INET': %s\n",
 			        strerror(errno));
 			return NULL;
@@ -93,51 +94,44 @@
 		return id;
 	}
 #elif defined(__OpenBSD__)
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <string.h>
-	#include <errno.h>
-	#include <ifaddrs.h>
-	#include <unistd.h>
-	#include <sys/ioctl.h>
-	#include <sys/types.h>
-	#include <sys/socket.h>
 	#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 "../util.h"
+	#include <stdlib.h>
+	#include <sys/types.h>
 
 	static int
 	load_ieee80211_nodereq(const char *iface, struct ieee80211_nodereq *nr)
 	{
 		struct ieee80211_bssid bssid;
 		int sockfd;
-		memset(&bssid, 0, sizeof(bssid);
+
+		memset(&bssid, 0, sizeof(bssid));
 		memset(nr, 0, sizeof(struct ieee80211_nodereq));
-		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
+		if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
 			fprintf(stderr, "socket 'AF_INET': %s\n",
 				strerror(errno));
 			return 0;
 		}
 		strlcpy(bssid.i_name, iface, sizeof(bssid.i_name));
-		if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) == -1) {
+		if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) {
 			fprintf(stderr, "ioctl 'SIOCG80211BSSID': %s\n",
 				strerror(errno));
 			close(sockfd);
 			return 0;
 		}
 		strlcpy(nr->nr_ifname, iface, sizeof(nr->nr_ifname));
-		memmove(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr));
-		if ((ioctl(sockfd, SIOCG80211NODE, nr)) == -1 && nr->nr_rssi) {
+		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));
 			close(sockfd);
 			return 0;
 		}
-		return close(sockfd), 1;
 
+		return close(sockfd), 1;
 	}
 
 	const char *
@@ -147,13 +141,15 @@
 		int q;
 
 		if (load_ieee80211_nodereq(iface, &nr)) {
-			if (nr.nr_max_rssi)
+			if (nr.nr_max_rssi) {
 				q = IEEE80211_NODEREQ_RSSI(&nr);
-			else
+			} else {
 				q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
 				(2 * (nr.nr_rssi + 100)));
+			}
 			return bprintf("%d", q);
 		}
+
 		return NULL;
 	}
 
@@ -165,7 +161,7 @@
 		if (load_ieee80211_nodereq(iface, &nr)) {
 			return bprintf("%s", nr.nr_nwid);
 		}
+
 		return NULL;
 	}
-
 #endif