X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_wireless_info.c;h=c3b52708f743a61f1ba218bc62b2e7bd7a0b0eac;hb=657c0498dbc4eed26df8b7af1c87ea943c2bbdf6;hp=eae942b9c6dfa95271b7e8444f068398a8b2ab64;hpb=d74e904bf4bdd7f1d767a8db09987b90de809579;p=i3%2Fi3status diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c index eae942b..c3b5270 100644 --- a/src/print_wireless_info.c +++ b/src/print_wireless_info.c @@ -5,11 +5,18 @@ #include #ifdef LINUX -#include -#else -#ifndef __FreeBSD__ +#include +#include +#include +#include +#include +#include +#include #define IW_ESSID_MAX_SIZE 32 #endif + +#ifdef __APPLE__ +#define IW_ESSID_MAX_SIZE 32 #endif #ifdef __FreeBSD__ @@ -42,11 +49,19 @@ #include #include #include +#include #include #include #include #include #include +#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN +#endif + +#ifdef __NetBSD__ +#include +#include +#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN #endif #include "i3status.h" @@ -61,7 +76,12 @@ typedef struct { int flags; +#ifdef IW_ESSID_MAX_SIZE char essid[IW_ESSID_MAX_SIZE + 1]; +#endif +#ifdef LINUX + uint8_t bssid[ETH_ALEN]; +#endif int quality; int quality_max; int quality_average; @@ -73,134 +93,248 @@ typedef struct { double frequency; } wireless_info_t; -static int get_wireless_info(const char *interface, wireless_info_t *info) { - memset(info, 0, sizeof(wireless_info_t)); - #ifdef LINUX - int skfd = iw_sockets_open(); - if (skfd < 0) { - perror("iw_sockets_open"); - return 0; +// Like iw_print_bitrate, but without the dependency on libiw. +static void print_bitrate(char *buffer, int buflen, int bitrate) { + const int kilo = 1e3; + const int mega = 1e6; + const int giga = 1e9; + + const double rate = bitrate; + char scale; + int divisor; + + if (rate >= giga) { + scale = 'G'; + divisor = giga; + } else if (rate >= mega) { + scale = 'M'; + divisor = mega; + } else { + scale = 'k'; + divisor = kilo; } + snprintf(buffer, buflen, "%g %cb/s", rate / divisor, scale); +} - wireless_config wcfg; - if (iw_get_basic_config(skfd, interface, &wcfg) < 0) { - close(skfd); - return 0; - } +// Based on NetworkManager/src/platform/wifi/wifi-utils-nl80211.c +static uint32_t nl80211_xbm_to_percent(int32_t xbm, int32_t divisor) { +#define NOISE_FLOOR_DBM -90 +#define SIGNAL_MAX_DBM -20 - if (wcfg.has_essid && wcfg.essid_on) { - info->flags |= WIRELESS_INFO_FLAG_HAS_ESSID; - strncpy(&info->essid[0], wcfg.essid, IW_ESSID_MAX_SIZE); - info->essid[IW_ESSID_MAX_SIZE] = '\0'; + xbm /= divisor; + if (xbm < NOISE_FLOOR_DBM) + xbm = NOISE_FLOOR_DBM; + if (xbm > SIGNAL_MAX_DBM) + xbm = SIGNAL_MAX_DBM; + + return 100 - 70 * (((float)SIGNAL_MAX_DBM - (float)xbm) / ((float)SIGNAL_MAX_DBM - (float)NOISE_FLOOR_DBM)); +} + +// Based on NetworkManager/src/platform/wifi/wifi-utils-nl80211.c +static void find_ssid(uint8_t *ies, uint32_t ies_len, uint8_t **ssid, uint32_t *ssid_len) { +#define WLAN_EID_SSID 0 + *ssid = NULL; + *ssid_len = 0; + + while (ies_len > 2 && ies[0] != WLAN_EID_SSID) { + ies_len -= ies[1] + 2; + ies += ies[1] + 2; } + if (ies_len < 2) + return; + if (ies_len < (uint32_t)(2 + ies[1])) + return; + + *ssid_len = ies[1]; + *ssid = ies + 2; +} + +static int gwi_sta_cb(struct nl_msg *msg, void *data) { + wireless_info_t *info = data; - if (wcfg.has_freq) { - info->frequency = wcfg.freq; + struct nlattr *tb[NL80211_ATTR_MAX + 1]; + struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); + struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1]; + struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1]; + static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { + [NL80211_STA_INFO_RX_BITRATE] = {.type = NLA_NESTED}, + }; + + static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { + [NL80211_RATE_INFO_BITRATE] = {.type = NLA_U16}, + }; + + if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0) + return NL_SKIP; + + if (tb[NL80211_ATTR_STA_INFO] == NULL) + return NL_SKIP; + + if (nla_parse_nested(sinfo, NL80211_STA_INFO_MAX, tb[NL80211_ATTR_STA_INFO], stats_policy)) + return NL_SKIP; + + if (sinfo[NL80211_STA_INFO_RX_BITRATE] == NULL) + return NL_SKIP; + + 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_BITRATE] == NULL) + return NL_SKIP; + + // 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 = (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 = 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] = { + [NL80211_BSS_FREQUENCY] = {.type = NLA_U32}, + [NL80211_BSS_BSSID] = {.type = NLA_UNSPEC}, + [NL80211_BSS_INFORMATION_ELEMENTS] = {.type = NLA_UNSPEC}, + [NL80211_BSS_SIGNAL_MBM] = {.type = NLA_U32}, + [NL80211_BSS_SIGNAL_UNSPEC] = {.type = NLA_U8}, + [NL80211_BSS_STATUS] = {.type = NLA_U32}, + }; + + if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0) + return NL_SKIP; + + if (tb[NL80211_ATTR_BSS] == NULL) + return NL_SKIP; + + if (nla_parse_nested(bss, NL80211_BSS_MAX, tb[NL80211_ATTR_BSS], bss_policy)) + return NL_SKIP; + + if (bss[NL80211_BSS_STATUS] == NULL) + return NL_SKIP; + + const uint32_t status = nla_get_u32(bss[NL80211_BSS_STATUS]); + + if (status != NL80211_BSS_STATUS_ASSOCIATED && + status != NL80211_BSS_STATUS_IBSS_JOINED) + return NL_SKIP; + + if (bss[NL80211_BSS_BSSID] == NULL) + return NL_SKIP; + + memcpy(info->bssid, nla_data(bss[NL80211_BSS_BSSID]), ETH_ALEN); + + if (bss[NL80211_BSS_FREQUENCY]) { info->flags |= WIRELESS_INFO_FLAG_HAS_FREQUENCY; + info->frequency = (double)nla_get_u32(bss[NL80211_BSS_FREQUENCY]) * 1e6; } - /* If the function iw_get_stats does not return proper stats, the - * wifi is considered as down. - * Since ad-hoc network does not have theses stats, we need to return - * here for this mode. */ - if (wcfg.mode == 1) { - close(skfd); - return 1; - } + if (bss[NL80211_BSS_SIGNAL_UNSPEC]) { + info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; + info->signal_level = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]); + info->signal_level_max = 100; - /* Wireless quality is a relative value in a driver-specific range. - * Signal and noise level can be either relative or absolute values - * in dBm. Furthermore, noise and quality can be expressed directly - * in dBm or in RCPI (802.11k), which we convert to dBm. When those - * values are expressed directly in dBm, they range from -192 to 63, - * and since the values are packed into 8 bits, we need to perform - * 8-bit arithmetic on them. Assume absolute values if everything - * else fails (driver bug). */ - - iwrange range; - if (iw_get_range_info(skfd, interface, &range) < 0) { - close(skfd); - return 0; + info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; + info->quality = info->signal_level; + info->quality_max = 100; + info->quality_average = 50; } - iwstats stats; - if (iw_get_stats(skfd, interface, &stats, &range, 1) < 0) { - close(skfd); - return 0; + if (bss[NL80211_BSS_SIGNAL_MBM]) { + info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; + info->signal_level = (int)nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM]) / 100; + + info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; + info->quality = nl80211_xbm_to_percent(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM]), 100); + info->quality_max = 100; + info->quality_average = 50; } - if (stats.qual.level != 0 || (stats.qual.updated & (IW_QUAL_DBM | IW_QUAL_RCPI))) { - if (!(stats.qual.updated & IW_QUAL_QUAL_INVALID)) { - info->quality = stats.qual.qual; - info->quality_max = range.max_qual.qual; - info->quality_average = range.avg_qual.qual; - info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; - } + if (bss[NL80211_BSS_INFORMATION_ELEMENTS]) { + uint8_t *ssid; + uint32_t ssid_len; - if (stats.qual.updated & IW_QUAL_RCPI) { - if (!(stats.qual.updated & IW_QUAL_LEVEL_INVALID)) { - info->signal_level = stats.qual.level / 2.0 - 110 + 0.5; - info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; - } - if (!(stats.qual.updated & IW_QUAL_NOISE_INVALID)) { - info->noise_level = stats.qual.noise / 2.0 - 110 + 0.5; - info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; - } - } else { - if ((stats.qual.updated & IW_QUAL_DBM) || stats.qual.level > range.max_qual.level) { - if (!(stats.qual.updated & IW_QUAL_LEVEL_INVALID)) { - info->signal_level = stats.qual.level; - if (info->signal_level > 63) - info->signal_level -= 256; - info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; - } - if (!(stats.qual.updated & IW_QUAL_NOISE_INVALID)) { - info->noise_level = stats.qual.noise; - if (info->noise_level > 63) - info->noise_level -= 256; - info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; - } - } else { - if (!(stats.qual.updated & IW_QUAL_LEVEL_INVALID)) { - info->signal_level = stats.qual.level; - info->signal_level_max = range.max_qual.level; - info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; - } - if (!(stats.qual.updated & IW_QUAL_NOISE_INVALID)) { - info->noise_level = stats.qual.noise; - info->noise_level_max = range.max_qual.noise; - info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; - } - } - } - } else { - if (!(stats.qual.updated & IW_QUAL_QUAL_INVALID)) { - info->quality = stats.qual.qual; - info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; - } - if (!(stats.qual.updated & IW_QUAL_LEVEL_INVALID)) { - info->quality = stats.qual.level; - info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; - } - if (!(stats.qual.updated & IW_QUAL_NOISE_INVALID)) { - info->quality = stats.qual.noise; - info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; + find_ssid(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]), + nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]), + &ssid, &ssid_len); + if (ssid && ssid_len) { + info->flags |= WIRELESS_INFO_FLAG_HAS_ESSID; + snprintf(info->essid, sizeof(info->essid), "%.*s", ssid_len, ssid); } } - struct iwreq wrq; - if (iw_get_ext(skfd, interface, SIOCGIWRATE, &wrq) >= 0) - info->bitrate = wrq.u.bitrate.value; + return NL_SKIP; +} +#endif + +static int get_wireless_info(const char *interface, wireless_info_t *info) { + memset(info, 0, sizeof(wireless_info_t)); - close(skfd); +#ifdef LINUX + struct nl_sock *sk = nl_socket_alloc(); + if (genl_connect(sk) != 0) + goto error1; + + if (nl_socket_modify_cb(sk, NL_CB_VALID, NL_CB_CUSTOM, gwi_scan_cb, info) < 0) + goto error1; + + const int nl80211_id = genl_ctrl_resolve(sk, "nl80211"); + if (nl80211_id < 0) + goto error1; + + const unsigned int ifidx = if_nametoindex(interface); + if (ifidx == 0) + goto error1; + + struct nl_msg *msg = NULL; + if ((msg = nlmsg_alloc()) == NULL) + goto error1; + + if (!genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id, 0, NLM_F_DUMP, NL80211_CMD_GET_SCAN, 0) || + nla_put_u32(msg, NL80211_ATTR_IFINDEX, ifidx) < 0) + goto error2; + + if (nl_send_sync(sk, msg) < 0) + // nl_send_sync calls nlmsg_free() + goto error1; + msg = NULL; + + if (nl_socket_modify_cb(sk, NL_CB_VALID, NL_CB_CUSTOM, gwi_sta_cb, info) < 0) + goto error1; + + if ((msg = nlmsg_alloc()) == NULL) + goto error1; + + if (!genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id, 0, NLM_F_DUMP, NL80211_CMD_GET_STATION, 0) || nla_put_u32(msg, NL80211_ATTR_IFINDEX, ifidx) < 0 || nla_put(msg, NL80211_ATTR_MAC, 6, info->bssid) < 0) + goto error2; + + if (nl_send_sync(sk, msg) < 0) + // nl_send_sync calls nlmsg_free() + goto error1; + msg = NULL; + + nl_socket_free(sk); return 1; + +error2: + nlmsg_free(msg); +error1: + nl_socket_free(sk); + return 0; + #endif #if defined(__FreeBSD__) || defined(__DragonFly__) - int s, len, inwid; - uint8_t buf[24 * 1024], *cp; + int s, inwid; + union { + struct ieee80211req_sta_req req; + uint8_t buf[24 * 1024]; + } u; struct ieee80211req na; - char network_id[IEEE80211_NWID_LEN + 1]; + char bssid[IEEE80211_ADDR_LEN]; + size_t len; if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) return (0); @@ -228,31 +362,38 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) { memset(&na, 0, sizeof(na)); strlcpy(na.i_name, interface, sizeof(na.i_name)); - na.i_type = IEEE80211_IOC_SCAN_RESULTS; - na.i_data = buf; - na.i_len = sizeof(buf); + na.i_type = IEEE80211_IOC_BSSID; + na.i_data = bssid; + na.i_len = sizeof(bssid); + + if (ioctl(s, SIOCG80211, (caddr_t)&na) == -1) { + close(s); + return (0); + } + + memcpy(u.req.is_u.macaddr, bssid, sizeof(bssid)); + memset(&na, 0, sizeof(na)); + strlcpy(na.i_name, interface, sizeof(na.i_name)); + na.i_type = IEEE80211_IOC_STA_INFO; + na.i_data = &u; + na.i_len = sizeof(u); if (ioctl(s, SIOCG80211, (caddr_t)&na) == -1) { - printf("fail\n"); close(s); return (0); } close(s); - len = na.i_len; - cp = buf; - struct ieee80211req_scan_result *sr; - uint8_t *vp; - sr = (struct ieee80211req_scan_result *)cp; - vp = (u_int8_t *)(sr + 1); - strlcpy(network_id, (const char *)vp, sr->isr_ssid_len + 1); - if (!strcmp(network_id, &info->essid[0])) { - info->signal_level = sr->isr_rssi; + if (na.i_len >= sizeof(u.req)) { + /* + * Just use the first BSSID returned even if there are + * multiple APs sharing the same BSSID. + */ + info->signal_level = u.req.info[0].isi_rssi / 2 + + u.req.info[0].isi_noise; info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; - info->noise_level = sr->isr_noise; + info->noise_level = u.req.info[0].isi_noise; info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; - info->quality = sr->isr_intval; - info->flags |= WIRELESS_INFO_FLAG_HAS_QUALITY; } return 1; @@ -292,7 +433,7 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) { else len = IEEE80211_NWID_LEN + 1; - strncpy(&info->essid[0], nwid.i_nwid, len); + strncpy(&info->essid[0], (char *)nwid.i_nwid, len); info->essid[IW_ESSID_MAX_SIZE] = '\0'; info->flags |= WIRELESS_INFO_FLAG_HAS_ESSID; } @@ -308,10 +449,9 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) { strlcpy(nr.nr_ifname, interface, sizeof(nr.nr_ifname)); if (ioctl(s, SIOCG80211NODE, &nr) == 0 && nr.nr_rssi) { + info->signal_level = nr.nr_rssi; if (nr.nr_max_rssi) - info->signal_level_max = IEEE80211_NODEREQ_RSSI(&nr); - else - info->signal_level = nr.nr_rssi; + info->signal_level_max = nr.nr_max_rssi; info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; } @@ -324,6 +464,21 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) { return 0; } +/* Table summarizing what is the decision to prefer IPv4 or IPv6 + * based their values. + * + * | ipv4_address | ipv6_address | Chosen IP | Color | + * |--------------|--------------|-----------|-------------------| + * | NULL | NULL | None | bad (red) | + * | NULL | no IP | IPv6 | degraded (orange) | + * | NULL | ::1/128 | IPv6 | ok (green) | + * | no IP | NULL | IPv4 | degraded | + * | no IP | no IP | IPv4 | degraded | + * | no IP | ::1/128 | IPv6 | ok | + * | 127.0.0.1 | NULL | IPv4 | ok | + * | 127.0.0.1 | no IP | IPv4 | ok | + * | 127.0.0.1 | ::1/128 | IPv4 | ok | + */ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down) { const char *walk; char *outwalk = buffer; @@ -331,22 +486,48 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, INSTANCE(interface); - const char *ip_address = get_ip_addr(interface); - if (ip_address == NULL) { - START_COLOR("color_bad"); - outwalk += sprintf(outwalk, "%s", format_down); - goto out; + char *ipv4_address = sstrdup(get_ip_addr(interface, AF_INET)); + char *ipv6_address = sstrdup(get_ip_addr(interface, AF_INET6)); + + /* + * Removing '%' and following characters from IPv6 since the interface identifier is redundant, + * as the output already includes the interface name. + */ + if (ipv6_address != NULL) { + char *prct_ptr = strstr(ipv6_address, "%"); + if (prct_ptr != NULL) { + *prct_ptr = '\0'; + } + } + + bool prefer_ipv4 = true; + if (ipv4_address == NULL) { + if (ipv6_address == NULL) { + START_COLOR("color_bad"); + outwalk += sprintf(outwalk, "%s", format_down); + goto out; + } else { + prefer_ipv4 = false; + } + } else if (BEGINS_WITH(ipv4_address, "no IP") && ipv6_address != NULL && !BEGINS_WITH(ipv6_address, "no IP")) { + prefer_ipv4 = false; } - if (get_wireless_info(interface, &info)) { + const char *ip_address = (prefer_ipv4) ? ipv4_address : ipv6_address; + if (!get_wireless_info(interface, &info)) { + walk = format_down; + START_COLOR("color_bad"); + } else { walk = format_up; if (info.flags & WIRELESS_INFO_FLAG_HAS_QUALITY) START_COLOR((info.quality < info.quality_average ? "color_degraded" : "color_good")); - else - START_COLOR("color_good"); - } else { - walk = format_down; - START_COLOR("color_bad"); + else { + if (BEGINS_WITH(ip_address, "no IP")) { + START_COLOR("color_degraded"); + } else { + START_COLOR("color_good"); + } + } } for (; *walk != '\0'; walk++) { @@ -358,7 +539,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, if (BEGINS_WITH(walk + 1, "quality")) { if (info.flags & WIRELESS_INFO_FLAG_HAS_QUALITY) { if (info.quality_max) - outwalk += sprintf(outwalk, "%03d%%", PERCENT_VALUE(info.quality, info.quality_max)); + outwalk += sprintf(outwalk, "%3d%s", PERCENT_VALUE(info.quality, info.quality_max), pct_mark); else outwalk += sprintf(outwalk, "%d", info.quality); } else { @@ -370,7 +551,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, if (BEGINS_WITH(walk + 1, "signal")) { if (info.flags & WIRELESS_INFO_FLAG_HAS_SIGNAL) { if (info.signal_level_max) - outwalk += sprintf(outwalk, "%03d%%", PERCENT_VALUE(info.signal_level, info.signal_level_max)); + outwalk += sprintf(outwalk, "%3d%s", PERCENT_VALUE(info.signal_level, info.signal_level_max), pct_mark); else outwalk += sprintf(outwalk, "%d dBm", info.signal_level); } else { @@ -382,7 +563,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, if (BEGINS_WITH(walk + 1, "noise")) { if (info.flags & WIRELESS_INFO_FLAG_HAS_NOISE) { if (info.noise_level_max) - outwalk += sprintf(outwalk, "%03d%%", PERCENT_VALUE(info.noise_level, info.noise_level_max)); + outwalk += sprintf(outwalk, "%3d%s", PERCENT_VALUE(info.noise_level, info.noise_level_max), pct_mark); else outwalk += sprintf(outwalk, "%d dBm", info.noise_level); } else { @@ -392,9 +573,11 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, } if (BEGINS_WITH(walk + 1, "essid")) { +#ifdef IW_ESSID_MAX_SIZE if (info.flags & WIRELESS_INFO_FLAG_HAS_ESSID) - outwalk += sprintf(outwalk, "%s", info.essid); + maybe_escape_markup(info.essid, &outwalk); else +#endif *(outwalk++) = '?'; walk += strlen("essid"); } @@ -416,7 +599,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, if (BEGINS_WITH(walk + 1, "bitrate")) { char br_buffer[128]; - iw_print_bitrate(br_buffer, sizeof(br_buffer), info.bitrate); + print_bitrate(br_buffer, sizeof(br_buffer), info.bitrate); outwalk += sprintf(outwalk, "%s", br_buffer); walk += strlen("bitrate"); @@ -426,5 +609,7 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, out: END_COLOR; + free(ipv4_address); + free(ipv6_address); OUTPUT_FULL_TEXT(buffer); }