fix -Wformat-truncation warnings

[project/iwinfo.git] / iwinfo_nl80211.c

diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index a708aec5bd21c0d10cac68c511d12e2d17cf3447..d4d7538263df0105651ce1ebdfff152ae68428c0 100644 (file)
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -240,12 +240,16 @@ static const char *nl80211_phy_path_str(const char *phyname)
        int prefix_len = strlen(prefix);
        int buf_len, offset;
        struct dirent *e;
-       char buf[128], *link;
-       int phy_id;
+       char buf[512], *link;
+       int phy_idx;
        int seq = 0;
        DIR *d;
 
-       phy_id = atoi(phyname + 3);
+       snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/index", phyname);
+       phy_idx = nl80211_readint(buf);
+       if (phy_idx < 0)
+               return NULL;
+
        buf_len = snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/device", phyname);
        link = realpath(buf, path);
        if (!link)
@@ -267,13 +271,14 @@ static const char *nl80211_phy_path_str(const char *phyname)
                return link;
 
        while ((e = readdir(d)) != NULL) {
-               int cur_id;
+               int cur_idx;
 
-               if (strncmp(e->d_name, "phy", 3) != 0)
+               snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/index", e->d_name);
+               cur_idx = nl80211_readint(buf);
+               if (cur_idx < 0)
                        continue;
 
-               cur_id = atoi(e->d_name + 3);
-               if (cur_id >= phy_id)
+               if (cur_idx >= phy_idx)
                        continue;
 
                seq++;
@@ -292,7 +297,7 @@ static const char *nl80211_phy_path_str(const char *phyname)
 
 static int nl80211_phy_idx_from_path(const char *path)
 {
-       char buf[128];
+       char buf[512];
        struct dirent *e;
        const char *cur_path;
        int cur_path_len;
@@ -679,7 +684,7 @@ static int nl80211_channel2freq(int channel, const char *band)
        return 0;
 }
 
-static int nl80211_ifname2phy_cb(struct nl_msg *msg, void *arg)
+static int nl80211_phyname_cb(struct nl_msg *msg, void *arg)
 {
        char *buf = arg;
        struct nlattr **attr = nl80211_parse(msg);
@@ -700,15 +705,38 @@ static char * nl80211_ifname2phy(const char *ifname)
        memset(phy, 0, sizeof(phy));
 
        nl80211_request(ifname, NL80211_CMD_GET_WIPHY, 0,
-                       nl80211_ifname2phy_cb, phy);
+                       nl80211_phyname_cb, phy);
 
        return phy[0] ? phy : NULL;
 }
 
+static char * nl80211_phyidx2name(unsigned int idx)
+{
+       struct nl80211_msg_conveyor *cv;
+       static char phy[32] = { 0 };
+
+       if (nl80211_init() < 0)
+               return NULL;
+
+       cv = nl80211_new(nls->nl80211, NL80211_CMD_GET_WIPHY, 0);
+       if (!cv)
+               return NULL;
+
+       NLA_PUT_U32(cv->msg, NL80211_ATTR_WIPHY, idx);
+
+       memset(phy, 0, sizeof(phy));
+       nl80211_send(cv, nl80211_phyname_cb, phy);
+
+       return phy[0] ? phy : NULL;
+
+nla_put_failure:
+       return NULL;
+}
+
 static char * nl80211_phy2ifname(const char *ifname)
 {
        int ifidx = -1, cifidx = -1, phyidx = -1;
-       char buffer[64];
+       char buffer[512];
        static char nif[IFNAMSIZ] = { 0 };
 
        DIR *d;
@@ -1655,6 +1683,7 @@ static struct {
        { "IEEE 802.1X/EAP", 0, IWINFO_KMGMT_8021x },
        { "EAP-SUITE-B-192", 4, IWINFO_KMGMT_8021x },
        { "EAP-SUITE-B",     4, IWINFO_KMGMT_8021x },
+       { "EAP-SHA384",      4, IWINFO_KMGMT_8021x },
        { "EAP-SHA256",      0, IWINFO_KMGMT_8021x },
        { "PSK-SHA256",      0, IWINFO_KMGMT_PSK },
        { "NONE",            0, IWINFO_KMGMT_NONE },
@@ -1840,6 +1869,9 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
                                if (!strncmp(p, "WPA-", 4))
                                        p += 4;
 
+                               if (!strncmp(p, "FT-", 3))
+                                       p += 3;
+
                                parse_wpa_suites(p, atoi(wpa), &c->wpa_version, &c->auth_suites);
                        }
 
@@ -3507,6 +3539,7 @@ static int nl80211_get_frequency_offset(const char *ifname, int *buf)
 
 static int nl80211_lookup_phyname(const char *section, char *buf)
 {
+       const char *name;
        int idx;
 
        if (!strncmp(section, "path=", 5))
@@ -3519,7 +3552,11 @@ static int nl80211_lookup_phyname(const char *section, char *buf)
        if (idx < 0)
                return -1;
 
-       sprintf(buf, "phy%d", idx);
+       name = nl80211_phyidx2name(idx);
+       if (!name)
+               return -1;
+
+       strcpy(buf, name);
        return 0;
 }