add support for expected throughput

[project/iwinfo.git] / include / iwinfo.h

diff --git a/include/iwinfo.h b/include/iwinfo.h
index 95020a4..929f697 100644 (file)
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -37,17 +37,27 @@
 #define IWINFO_CIPHER_WEP104 (1 << 5)
 #define IWINFO_CIPHER_AESOCB (1 << 6)
 #define IWINFO_CIPHER_CKIP   (1 << 7)
+#define IWINFO_CIPHER_COUNT  8
 
 #define IWINFO_KMGMT_NONE    (1 << 0)
 #define IWINFO_KMGMT_8021x   (1 << 1)
 #define IWINFO_KMGMT_PSK     (1 << 2)
+#define IWINFO_KMGMT_COUNT   3
 
 #define IWINFO_AUTH_OPEN     (1 << 0)
 #define IWINFO_AUTH_SHARED   (1 << 1)
+#define IWINFO_AUTH_COUNT    2
 
-extern const char *IWINFO_CIPHER_NAMES[];
-extern const char *IWINFO_KMGMT_NAMES[];
-extern const char *IWINFO_AUTH_NAMES[];
+#define IWINFO_FREQ_NO_10MHZ           (1 << 0)
+#define IWINFO_FREQ_NO_20MHZ           (1 << 1)
+#define IWINFO_FREQ_NO_HT40PLUS                (1 << 2)
+#define IWINFO_FREQ_NO_HT40MINUS       (1 << 3)
+#define IWINFO_FREQ_NO_80MHZ           (1 << 4)
+#define IWINFO_FREQ_NO_160MHZ          (1 << 5)
+
+extern const char *IWINFO_CIPHER_NAMES[IWINFO_CIPHER_COUNT];
+extern const char *IWINFO_KMGMT_NAMES[IWINFO_KMGMT_COUNT];
+extern const char *IWINFO_AUTH_NAMES[IWINFO_AUTH_COUNT];
 
 
 enum iwinfo_opmode {
@@ -86,6 +96,10 @@ struct iwinfo_rate_entry {
        int8_t mcs;
        uint8_t is_40mhz:1;
        uint8_t is_short_gi:1;
+       uint8_t is_ht:1;
+       uint8_t is_vht:1;
+       uint8_t mhz;
+       uint8_t nss;
 };
 
 struct iwinfo_assoclist_entry {
@@ -97,6 +111,18 @@ struct iwinfo_assoclist_entry {
        uint32_t tx_packets;
        struct iwinfo_rate_entry rx_rate;
        struct iwinfo_rate_entry tx_rate;
+       uint32_t rx_bytes;
+       uint32_t tx_bytes;
+       uint32_t tx_retries;
+       uint32_t tx_failed;
+       uint64_t t_offset;
+       uint8_t is_authorized:1;
+       uint8_t is_authenticated:1;
+       uint8_t is_preamble_short:1;
+       uint8_t is_wme:1;
+       uint8_t is_mfp:1;
+       uint8_t is_tdls:1;
+       uint32_t thr;
 };
 
 struct iwinfo_txpwrlist_entry {
@@ -108,6 +134,7 @@ struct iwinfo_freqlist_entry {
        uint8_t channel;
        uint32_t mhz;
        uint8_t restricted;
+       uint32_t flags;
 };
 
 struct iwinfo_crypto_entry {
@@ -121,7 +148,7 @@ struct iwinfo_crypto_entry {
 
 struct iwinfo_scanlist_entry {
        uint8_t mac[6];
-       uint8_t ssid[IWINFO_ESSID_MAX_SIZE+1];
+       char ssid[IWINFO_ESSID_MAX_SIZE+1];
        enum iwinfo_opmode mode;
        uint8_t channel;
        uint8_t signal;
@@ -132,12 +159,12 @@ struct iwinfo_scanlist_entry {
 
 struct iwinfo_country_entry {
        uint16_t iso3166;
-       uint8_t ccode[4];
+       char ccode[4];
 };
 
 struct iwinfo_iso3166_label {
        uint16_t iso3166;
-       uint8_t  name[28];
+       char name[28];
 };
 
 struct iwinfo_hardware_id {