iw: add support for vendor events

We can already drop in arbitrary files for vendor commands
as the build system picks those up, also add support for
vendor specific events in a similar fashion.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/event.c b/event.c
index fdd25ae98380ed9c2a3fbb5da4ebd7fa68fcc3ab..8dd434539fb04ded0011b139fc14d0b3db4459ad 100644 (file)
--- a/event.c
+++ b/event.c
@@ -296,6 +296,51 @@ static void parse_wowlan_wake_event(struct nlattr **attrs)
                printf("\t* TCP connection ran out of tokens\n");
 }
 
+extern struct vendor_event *__start_vendor_event[];
+extern struct vendor_event *__stop_vendor_event;
+
+// Dummy to force the section to exist
+VENDOR_EVENT(0xffffffff, 0xffffffff, NULL);
+
+static void parse_vendor_event(struct nlattr **attrs, bool dump)
+{
+       __u32 vendor_id, subcmd;
+       unsigned int i;
+
+       if (!attrs[NL80211_ATTR_VENDOR_ID] ||
+           !attrs[NL80211_ATTR_VENDOR_SUBCMD])
+               return;
+
+       vendor_id = nla_get_u32(attrs[NL80211_ATTR_VENDOR_ID]);
+       subcmd = nla_get_u32(attrs[NL80211_ATTR_VENDOR_SUBCMD]);
+
+       printf("vendor event %.6x:%d", vendor_id, subcmd);
+
+       for (i = 0; i < &__stop_vendor_event - __start_vendor_event; i++) {
+               struct vendor_event *ev = __start_vendor_event[i];
+
+               if (!ev)
+                       continue;
+
+               if (ev->vendor_id != vendor_id)
+                       continue;
+               if (ev->subcmd != subcmd)
+                       continue;
+               if (!ev->callback)
+                       continue;
+
+               ev->callback(vendor_id, subcmd, attrs[NL80211_ATTR_VENDOR_DATA]);
+               goto out;
+       }
+
+       if (dump && attrs[NL80211_ATTR_VENDOR_DATA])
+               iw_hexdump("vendor event",
+                          nla_data(attrs[NL80211_ATTR_VENDOR_DATA]),
+                          nla_len(attrs[NL80211_ATTR_VENDOR_DATA]));
+out:
+       printf("\n");
+}
+
 static void parse_nan_term(struct nlattr **attrs)
 {
        struct nlattr *func[NL80211_NAN_FUNC_ATTR_MAX + 1];
@@ -1143,13 +1188,7 @@ static int print_event(struct nl_msg *msg, void *arg)
                       tb[NL80211_ATTR_ACK] ? "acked" : "no ack");
                break;
        case NL80211_CMD_VENDOR:
-               printf("vendor event %.6x:%d\n",
-                       nla_get_u32(tb[NL80211_ATTR_VENDOR_ID]),
-                       nla_get_u32(tb[NL80211_ATTR_VENDOR_SUBCMD]));
-               if (args->frame && tb[NL80211_ATTR_VENDOR_DATA])
-                       iw_hexdump("vendor event",
-                                  nla_data(tb[NL80211_ATTR_VENDOR_DATA]),
-                                  nla_len(tb[NL80211_ATTR_VENDOR_DATA]));
+               parse_vendor_event(tb, args->frame);
                break;
        case NL80211_CMD_RADAR_DETECT: {
                enum nl80211_radar_event event_type;

diff --git a/iw.h b/iw.h
index bc0b3acbc408a649baa34bb8f8ba42f99624322a..51f5ca8987199155dc322da87825ad3365768002 100644 (file)
--- a/iw.h
+++ b/iw.h
@@ -155,6 +155,22 @@ struct chandef {
 #define DECLARE_SECTION(_name)                                         \
        extern struct cmd __section ## _ ## _name;
 
+struct vendor_event {
+       unsigned int vendor_id, subcmd;
+       void (*callback)(unsigned int vendor_id, unsigned int subcmd,
+                        struct nlattr *data);
+};
+
+#define VENDOR_EVENT(_id, _subcmd, _callback)                          \
+       const struct vendor_event                                       \
+       vendor_event_ ## _id ## _ ## _subcmd = {                        \
+               .vendor_id = _id,                                       \
+               .subcmd = _subcmd,                                      \
+               .callback = _callback,                                  \
+       }, * const vendor_event_ ## _id ## _ ## _subcmd ## _p           \
+       __attribute__((used,section("vendor_event"))) =                 \
+               &vendor_event_ ## _id ## _ ## _subcmd
+
 extern const char iw_version[];
 
 extern int iw_debug;