update nl80211.h and command list

[thirdparty/iw.git] / station.c

diff --git a/station.c b/station.c
index f3e3da83398cab298baa156e2ebdbab032cd107f..e1477efe88e3644381b762c32180e48562f3e22e 100644 (file)
--- a/station.c
+++ b/station.c
@@ -43,7 +43,64 @@ static void print_power_mode(struct nlattr *a)
        }
 }
 
-void parse_tid_stats(struct nlattr *tid_stats_attr)
+int parse_txq_stats(char *buf, int buflen, struct nlattr *tid_stats_attr, int header,
+                   int tid, const char *indent)
+{
+       struct nlattr *txqstats_info[NL80211_TXQ_STATS_MAX + 1], *txqinfo;
+       static struct nla_policy txqstats_policy[NL80211_TXQ_STATS_MAX + 1] = {
+               [NL80211_TXQ_STATS_BACKLOG_BYTES] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_BACKLOG_PACKETS] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_FLOWS] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_DROPS] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_ECN_MARKS] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_OVERLIMIT] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_COLLISIONS] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_TX_BYTES] = { .type = NLA_U32 },
+               [NL80211_TXQ_STATS_TX_PACKETS] = { .type = NLA_U32 },
+       };
+       char *pos = buf;
+       if (nla_parse_nested(txqstats_info, NL80211_TXQ_STATS_MAX, tid_stats_attr,
+                            txqstats_policy)) {
+               printf("failed to parse nested TXQ stats attributes!");
+               return 0;
+       }
+
+       if (header)
+               pos += snprintf(buf, buflen, "\n%s\t%s\tqsz-byt\t"
+                               "qsz-pkt\tflows\tdrops\tmarks\toverlmt\t"
+                               "hashcol\ttx-bytes\ttx-packets", indent,
+                               tid >= 0 ? "TID" : "");
+
+       pos += snprintf(pos, buflen - (pos - buf), "\n%s\t", indent);
+       if (tid >= 0)
+               pos += snprintf(pos, buflen - (pos - buf), "%d", tid);
+
+#define PRINT_STAT(key, spacer) do {                                    \
+               txqinfo = txqstats_info[NL80211_TXQ_STATS_ ## key];      \
+               pos += snprintf(pos, buflen - (pos - buf), spacer);      \
+               if (txqinfo)                                             \
+                       pos += snprintf(pos, buflen - (pos - buf), "%u", \
+                                       nla_get_u32(txqinfo));           \
+       } while (0)
+
+
+       PRINT_STAT(BACKLOG_BYTES, "\t");
+       PRINT_STAT(BACKLOG_PACKETS, "\t");
+       PRINT_STAT(FLOWS, "\t");
+       PRINT_STAT(DROPS, "\t");
+       PRINT_STAT(ECN_MARKS, "\t");
+       PRINT_STAT(OVERLIMIT, "\t");
+       PRINT_STAT(COLLISIONS, "\t");
+       PRINT_STAT(TX_BYTES, "\t");
+       PRINT_STAT(TX_PACKETS, "\t\t");
+
+#undef PRINT_STAT
+
+       return pos - buf;
+
+}
+
+static void parse_tid_stats(struct nlattr *tid_stats_attr)
 {
        struct nlattr *stats_info[NL80211_TID_STATS_MAX + 1], *tidattr, *info;
        static struct nla_policy stats_policy[NL80211_TID_STATS_MAX + 1] = {
@@ -51,8 +108,11 @@ void parse_tid_stats(struct nlattr *tid_stats_attr)
                [NL80211_TID_STATS_TX_MSDU] = { .type = NLA_U64 },
                [NL80211_TID_STATS_TX_MSDU_RETRIES] = { .type = NLA_U64 },
                [NL80211_TID_STATS_TX_MSDU_FAILED] = { .type = NLA_U64 },
+               [NL80211_TID_STATS_TXQ_STATS] = { .type = NLA_NESTED },
        };
        int rem, i = 0;
+       char txqbuf[2000] = {}, *pos = txqbuf;
+       int buflen = sizeof(txqbuf), foundtxq = 0;
 
        printf("\n\tMSDU:\n\t\tTID\trx\ttx\ttx retries\ttx failed");
        nla_for_each_nested(tidattr, tid_stats_attr, rem) {
@@ -61,7 +121,7 @@ void parse_tid_stats(struct nlattr *tid_stats_attr)
                        printf("failed to parse nested stats attributes!");
                        return;
                }
-               printf("\n\t\t%d", i++);
+               printf("\n\t\t%d", i);
                info = stats_info[NL80211_TID_STATS_RX_MSDU];
                if (info)
                        printf("\t%llu", (unsigned long long)nla_get_u64(info));
@@ -74,10 +134,20 @@ void parse_tid_stats(struct nlattr *tid_stats_attr)
                info = stats_info[NL80211_TID_STATS_TX_MSDU_FAILED];
                if (info)
                        printf("\t\t%llu", (unsigned long long)nla_get_u64(info));
+               info = stats_info[NL80211_TID_STATS_TXQ_STATS];
+               if (info) {
+                       pos += parse_txq_stats(pos, buflen - (pos - txqbuf), info, !foundtxq, i, "\t");
+                       foundtxq = 1;
+               }
+
+               i++;
        }
+
+       if (foundtxq)
+               printf("\n\tTXQs:%s", txqbuf);
 }
 
-void parse_bss_param(struct nlattr *bss_param_attr)
+static void parse_bss_param(struct nlattr *bss_param_attr)
 {
        struct nlattr *bss_param_info[NL80211_STA_BSS_PARAM_MAX + 1], *info;
        static struct nla_policy bss_poilcy[NL80211_STA_BSS_PARAM_MAX + 1] = {
@@ -151,6 +221,8 @@ void parse_bitrate(struct nlattr *bitrate_attr, char *buf, int buflen)
        if (rate > 0)
                pos += snprintf(pos, buflen - (pos - buf),
                                "%d.%d MBit/s", rate / 10, rate % 10);
+       else
+               pos += snprintf(pos, buflen - (pos - buf), "(unknown)");
 
        if (rinfo[NL80211_RATE_INFO_MCS])
                pos += snprintf(pos, buflen - (pos - buf),
@@ -237,6 +309,8 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
                [NL80211_STA_INFO_TID_STATS] = { .type = NLA_NESTED },
                [NL80211_STA_INFO_BSS_PARAM] = { .type = NLA_NESTED },
                [NL80211_STA_INFO_RX_DURATION] = { .type = NLA_U64 },
+               [NL80211_STA_INFO_ACK_SIGNAL] = {.type = NLA_U8 },
+               [NL80211_STA_INFO_ACK_SIGNAL_AVG] = { .type = NLA_U8 },
        };
        char *chain;
 
@@ -315,7 +389,7 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
 
        if (sinfo[NL80211_STA_INFO_BEACON_SIGNAL_AVG])
                printf("\n\tbeacon signal avg:\t%d dBm",
-                      nla_get_u8(sinfo[NL80211_STA_INFO_BEACON_SIGNAL_AVG]));
+                      (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_BEACON_SIGNAL_AVG]));
        if (sinfo[NL80211_STA_INFO_T_OFFSET])
                printf("\n\tToffset:\t%llu us",
                       (unsigned long long)nla_get_u64(sinfo[NL80211_STA_INFO_T_OFFSET]));
@@ -338,6 +412,14 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
                printf("\n\trx duration:\t%lld us",
                       (unsigned long long)nla_get_u64(sinfo[NL80211_STA_INFO_RX_DURATION]));
 
+       if (sinfo[NL80211_STA_INFO_ACK_SIGNAL])
+               printf("\n\tlast ack signal:%d dBm",
+                       (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_ACK_SIGNAL]));
+
+       if (sinfo[NL80211_STA_INFO_ACK_SIGNAL_AVG])
+               printf("\n\tavg ack signal:\t%d dBm",
+                       (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_ACK_SIGNAL_AVG]));
+
        if (sinfo[NL80211_STA_INFO_EXPECTED_THROUGHPUT]) {
                uint32_t thr;