wifi: Fix order and add missing header

[slstatus.git] / components / wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 78acb3f..414d533 100644 (file)
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -3,8 +3,8 @@
 #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"
@@ -66,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;
@@ -97,6 +97,7 @@
        #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>
@@ -106,30 +107,31 @@
        {
                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 *
@@ -139,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;
        }
 
@@ -157,7 +161,7 @@
                if (load_ieee80211_nodereq(iface, &nr)) {
                        return bprintf("%s", nr.nr_nwid);
                }
+
                return NULL;
        }
-
 #endif