print wdev id in event info

[thirdparty/iw.git] / iw.h

diff --git a/iw.h b/iw.h
index a7545610db1f8ea56f7d55d1b7c0d9a01642f8d4..54ecbc3d584a3d6732c8435f29e5cfd10033c3c6 100644 (file)
--- a/iw.h
+++ b/iw.h
@@ -6,25 +6,28 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
 #include <netlink/genl/ctrl.h>
+#include <endian.h>
 
 #include "nl80211.h"
+#include "ieee80211.h"
 
 #define ETH_ALEN 6
 
-#ifndef CONFIG_LIBNL20
+/* libnl 1.x compatibility code */
+#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
 #  define nl_sock nl_handle
 #endif
 
 struct nl80211_state {
        struct nl_sock *nl_sock;
-       struct nl_cache *nl_cache;
-       struct genl_family *nl80211;
+       int nl80211_id;
 };
 
 enum command_identify_by {
        CIB_NONE,
        CIB_PHY,
        CIB_NETDEV,
+       CIB_WDEV,
 };
 
 enum id_input {
@@ -32,6 +35,7 @@ enum id_input {
        II_NETDEV,
        II_PHY_NAME,
        II_PHY_IDX,
+       II_WDEV,
 };
 
 struct cmd {
@@ -50,14 +54,17 @@ struct cmd {
        int (*handler)(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv);
+                      int argc, char **argv,
+                      enum id_input id);
+       const struct cmd *(*selector)(int argc, char **argv);
        const struct cmd *parent;
 };
 
 #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
+#define DIV_ROUND_UP(x, y) (((x) + (y - 1)) / (y))
 
-#define __COMMAND(_section, _symname, _name, _args, _nlcmd, _flags, _hidden, _idby, _handler, _help)\
-       static const struct cmd                                         \
+#define __COMMAND(_section, _symname, _name, _args, _nlcmd, _flags, _hidden, _idby, _handler, _help, _sel)\
+       static struct cmd                                               \
        __cmd ## _ ## _symname ## _ ## _handler ## _ ## _nlcmd ## _ ## _idby ## _ ## _hidden\
        __attribute__((used)) __attribute__((section("__cmd"))) = {     \
                .name = (_name),                                        \
@@ -69,14 +76,20 @@ struct cmd {
                .handler = (_handler),                                  \
                .help = (_help),                                        \
                .parent = _section,                                     \
-        }
+               .selector = (_sel),                                     \
+       }
+#define __ACMD(_section, _symname, _name, _args, _nlcmd, _flags, _hidden, _idby, _handler, _help, _sel, _alias)\
+       __COMMAND(_section, _symname, _name, _args, _nlcmd, _flags, _hidden, _idby, _handler, _help, _sel);\
+       static const struct cmd *_alias = &__cmd ## _ ## _symname ## _ ## _handler ## _ ## _nlcmd ## _ ## _idby ## _ ## _hidden
 #define COMMAND(section, name, args, cmd, flags, idby, handler, help)  \
-       __COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 0, idby, handler, help)
+       __COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 0, idby, handler, help, NULL)
+#define COMMAND_ALIAS(section, name, args, cmd, flags, idby, handler, help, selector, alias)\
+       __ACMD(&(__section ## _ ## section), name, #name, args, cmd, flags, 0, idby, handler, help, selector, alias)
 #define HIDDEN(section, name, args, cmd, flags, idby, handler)         \
-       __COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 1, idby, handler, NULL)
+       __COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 1, idby, handler, NULL, NULL)
 
 #define TOPLEVEL(_name, _args, _nlcmd, _flags, _idby, _handler, _help) \
-       const struct cmd                                                \
+       struct cmd                                                      \
        __section ## _ ## _name                                         \
        __attribute__((used)) __attribute__((section("__cmd"))) = {     \
                .name = (#_name),                                       \
@@ -88,14 +101,14 @@ struct cmd {
                .help = (_help),                                        \
         }
 #define SECTION(_name)                                                 \
-       const struct cmd __section ## _ ## _name                        \
+       struct cmd __section ## _ ## _name                              \
        __attribute__((used)) __attribute__((section("__cmd"))) = {     \
                .name = (#_name),                                       \
                .hidden = 1,                                            \
        }
 
 #define DECLARE_SECTION(_name)                                         \
-       extern const struct cmd __section ## _ ## _name;
+       extern struct cmd __section ## _ ## _name;
 
 extern const char iw_version[];
 
@@ -105,22 +118,28 @@ int handle_cmd(struct nl80211_state *state, enum id_input idby,
               int argc, char **argv);
 
 struct print_event_args {
-       bool frame, time;
+       struct timeval ts; /* internal */
+       bool have_ts; /* must be set false */
+       bool frame, time, reltime;
 };
 
 __u32 listen_events(struct nl80211_state *state,
                    const int n_waits, const __u32 *waits);
-__u32 __listen_events(struct nl80211_state *state,
-                     const int n_waits, const __u32 *waits,
-                     struct print_event_args *args);
+int __prepare_listen_events(struct nl80211_state *state);
+__u32 __do_listen_events(struct nl80211_state *state,
+                        const int n_waits, const __u32 *waits,
+                        struct print_event_args *args);
 
 
 int mac_addr_a2n(unsigned char *mac_addr, char *arg);
 void mac_addr_n2a(char *mac_addr, unsigned char *arg);
+int parse_hex_mask(char *hexmask, unsigned char **result, size_t *result_len,
+                  unsigned char **mask);
+unsigned char *parse_hex(char *hex, size_t *outlen);
 
 int parse_keys(struct nl_msg *msg, char **argv, int argc);
 
-void print_mcs_set(const uint8_t *data);
+void print_ht_mcs(const __u8 *mcs);
 void print_ampdu_length(__u8 exponent);
 void print_ampdu_spacing(__u8 spacing);
 void print_ht_capability(__u16 cap);