use proper unsigned type for ESSID length

[i3/i3status] / src / print_wireless_info.c

diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c
index cd95562f01d3eac979db2abf79485fc70e0b7cb0..79e4cd8e049a21168775c04b632711efd9aaf89e 100644 (file)
--- a/src/print_wireless_info.c
+++ b/src/print_wireless_info.c
@@ -125,7 +125,7 @@ static void find_ssid(uint8_t *ies, uint32_t ies_len, uint8_t **ssid, uint32_t *
     }
     if (ies_len < 2)
         return;
-    if (ies_len < 2 + ies[1])
+    if (ies_len < 2 + (uint8_t)ies[1])
         return;
 
     *ssid_len = ies[1];
@@ -144,7 +144,7 @@ static int gwi_sta_cb(struct nl_msg *msg, void *data) {
     };
 
     static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
-            [NL80211_RATE_INFO_BITRATE32] = {.type = NLA_U32},
+            [NL80211_RATE_INFO_BITRATE] = {.type = NLA_U16},
     };
 
     if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
@@ -162,19 +162,19 @@ static int gwi_sta_cb(struct nl_msg *msg, void *data) {
     if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX, sinfo[NL80211_STA_INFO_RX_BITRATE], rate_policy))
         return NL_SKIP;
 
-    if (rinfo[NL80211_RATE_INFO_BITRATE32] == NULL)
+    if (rinfo[NL80211_RATE_INFO_BITRATE] == NULL)
         return NL_SKIP;
 
-    // NL80211_RATE_INFO_BITRATE32 is specified in units of 100 kbit/s, but iw
+    // NL80211_RATE_INFO_BITRATE is specified in units of 100 kbit/s, but iw
     // used to specify bit/s, so we convert to use the same code path.
-    info->bitrate = nla_get_u32(rinfo[NL80211_RATE_INFO_BITRATE32]) * 100 * 1000;
+    info->bitrate = (int)nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]) * 100 * 1000;
 
     return NL_SKIP;
 }
 
 static int gwi_scan_cb(struct nl_msg *msg, void *data) {
     wireless_info_t *info = data;
-    struct genlmsghdr *gnlh = genlmsg_hdr(nlmsg_hdr(msg));
+    struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
     struct nlattr *tb[NL80211_ATTR_MAX + 1];
     struct nlattr *bss[NL80211_BSS_MAX + 1];
     struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = {