]> git.ipfire.org Git - thirdparty/iw.git/blobdiff - scan.c
add a few new commands/events
[thirdparty/iw.git] / scan.c
diff --git a/scan.c b/scan.c
index db7de83de6166ec695b4c68b7edb55e027265104..8e75b814ce74b66677129be69acba9ee334826f9 100644 (file)
--- a/scan.c
+++ b/scan.c
 #define WLAN_CAPABILITY_QOS            (1<<9)
 #define WLAN_CAPABILITY_SHORT_SLOT_TIME        (1<<10)
 #define WLAN_CAPABILITY_APSD           (1<<11)
+#define WLAN_CAPABILITY_RADIO_MEASURE  (1<<12)
 #define WLAN_CAPABILITY_DSSS_OFDM      (1<<13)
+#define WLAN_CAPABILITY_DEL_BACK       (1<<14)
+#define WLAN_CAPABILITY_IMM_BACK       (1<<15)
+/* DMG (60gHz) 802.11ad */
+/* type - bits 0..1 */
+#define WLAN_CAPABILITY_DMG_TYPE_MASK          (3<<0)
 
-static unsigned char wifi_oui[3]      = { 0x00, 0x50, 0xf2 };
-static unsigned char ieee80211_oui[3] = { 0x00, 0x0f, 0xac };
+#define WLAN_CAPABILITY_DMG_TYPE_IBSS          (1<<0) /* Tx by: STA */
+#define WLAN_CAPABILITY_DMG_TYPE_PBSS          (2<<0) /* Tx by: PCP */
+#define WLAN_CAPABILITY_DMG_TYPE_AP            (3<<0) /* Tx by: AP */
+
+#define WLAN_CAPABILITY_DMG_CBAP_ONLY          (1<<2)
+#define WLAN_CAPABILITY_DMG_CBAP_SOURCE                (1<<3)
+#define WLAN_CAPABILITY_DMG_PRIVACY            (1<<4)
+#define WLAN_CAPABILITY_DMG_ECPAC              (1<<5)
+
+#define WLAN_CAPABILITY_DMG_SPECTRUM_MGMT      (1<<8)
+#define WLAN_CAPABILITY_DMG_RADIO_MEASURE      (1<<12)
+
+static unsigned char ms_oui[3]         = { 0x00, 0x50, 0xf2 };
+static unsigned char ieee80211_oui[3]  = { 0x00, 0x0f, 0xac };
+static unsigned char wfa_oui[3]                = { 0x50, 0x6f, 0x9a };
 
 struct scan_params {
        bool unknown;
+       enum print_ie_type type;
+       bool show_both_ie_sets;
 };
 
+#define IEEE80211_COUNTRY_EXTENSION_ID 201
+
+union ieee80211_country_ie_triplet {
+       struct {
+               __u8 first_channel;
+               __u8 num_channels;
+               __s8 max_power;
+       } __attribute__ ((packed)) chans;
+       struct {
+               __u8 reg_extension_id;
+               __u8 reg_class;
+               __u8 coverage_class;
+       } __attribute__ ((packed)) ext;
+} __attribute__ ((packed));
+
+static int parse_random_mac_addr(struct nl_msg *msg, char *arg)
+{
+       char *a_addr, *a_mask, *sep;
+       unsigned char addr[ETH_ALEN], mask[ETH_ALEN];
+       char *addrs = arg + 9;
+
+       if (*addrs != '=')
+               return 0;
+
+       addrs++;
+       sep = strchr(addrs, '/');
+       a_addr = addrs;
+
+       if (!sep)
+               return 1;
+
+       *sep = 0;
+       a_mask = sep + 1;
+       if (mac_addr_a2n(addr, a_addr) || mac_addr_a2n(mask, a_mask))
+               return 1;
+
+       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
+       NLA_PUT(msg, NL80211_ATTR_MAC_MASK, ETH_ALEN, mask);
+
+       return 0;
+ nla_put_failure:
+       return -ENOBUFS;
+}
+
+int parse_sched_scan(struct nl_msg *msg, int *argc, char ***argv)
+{
+       struct nl_msg *matchset = NULL, *freqs = NULL, *ssids = NULL;
+       struct nlattr *match = NULL;
+       enum {
+               ND_TOPLEVEL,
+               ND_MATCH,
+               ND_FREQS,
+               ND_ACTIVE,
+       } parse_state = ND_TOPLEVEL;
+       int c  = *argc;
+       char *end, **v = *argv;
+       int err = 0, i = 0;
+       unsigned int freq, interval = 0, delay = 0;
+       bool have_matchset = false, have_freqs = false, have_ssids = false;
+       bool have_active = false, have_passive = false;
+       uint32_t flags = 0;
+
+       matchset = nlmsg_alloc();
+       if (!matchset) {
+               err = -ENOBUFS;
+               goto out;
+       }
+
+       freqs = nlmsg_alloc();
+       if (!freqs) {
+               err = -ENOBUFS;
+               goto out;
+       }
+
+       ssids = nlmsg_alloc();
+       if (!ssids) {
+               err = -ENOMEM;
+               goto out;
+       }
+
+       while (c) {
+               switch (parse_state) {
+               case ND_TOPLEVEL:
+                       if (!strcmp(v[0], "interval")) {
+                               c--; v++;
+                               if (c == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               if (interval) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+                               interval = strtoul(v[0], &end, 10);
+                               if (*end || !interval) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+                               NLA_PUT_U32(msg,
+                                           NL80211_ATTR_SCHED_SCAN_INTERVAL,
+                                           interval);
+                       } else if (!strcmp(v[0], "delay")) {
+                               c--; v++;
+                               if (c == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               if (delay) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+                               delay = strtoul(v[0], &end, 10);
+                               if (*end) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+                               NLA_PUT_U32(msg,
+                                           NL80211_ATTR_SCHED_SCAN_DELAY,
+                                           delay);
+                       } else if (!strcmp(v[0], "matches")) {
+                               parse_state = ND_MATCH;
+                               if (have_matchset) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               i = 0;
+                       } else if (!strcmp(v[0], "freqs")) {
+                               parse_state = ND_FREQS;
+                               if (have_freqs) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               have_freqs = true;
+                               i = 0;
+                       } else if (!strcmp(v[0], "active")) {
+                               parse_state = ND_ACTIVE;
+                               if (have_active || have_passive) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               have_active = true;
+                               i = 0;
+                       } else if (!strcmp(v[0], "passive")) {
+                               if (have_active || have_passive) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               have_passive = true;
+                       } else if (!strncmp(v[0], "randomise", 9) ||
+                                  !strncmp(v[0], "randomize", 9)) {
+                               flags |= NL80211_SCAN_FLAG_RANDOM_ADDR;
+                               if (c > 0) {
+                                       err = parse_random_mac_addr(msg, v[0]);
+                                       if (err)
+                                               goto nla_put_failure;
+                               }
+                       } else {
+                               /* this element is not for us, so
+                                * return to continue parsing.
+                                */
+                               goto nla_put_failure;
+                       }
+                       c--; v++;
+
+                       break;
+               case ND_MATCH:
+                       if (!strcmp(v[0], "ssid")) {
+                               c--; v++;
+                               if (c == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               /* TODO: for now we can only have an
+                                * SSID in the match, so we can start
+                                * the match nest here.
+                                */
+                               match = nla_nest_start(matchset, i);
+                               if (!match) {
+                                       err = -ENOBUFS;
+                                       goto nla_put_failure;
+                               }
+
+                               NLA_PUT(matchset,
+                                       NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
+                                       strlen(v[0]), v[0]);
+                               nla_nest_end(matchset, match);
+                               match = NULL;
+
+                               have_matchset = true;
+                               i++;
+                               c--; v++;
+                       } else {
+                               /* other element that cannot be part
+                                * of a match indicates the end of the
+                                * match. */
+                               /* need at least one match in the matchset */
+                               if (i == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               parse_state = ND_TOPLEVEL;
+                       }
+
+                       break;
+               case ND_FREQS:
+                       freq = strtoul(v[0], &end, 10);
+                       if (*end) {
+                               if (i == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               parse_state = ND_TOPLEVEL;
+                       } else {
+                               NLA_PUT_U32(freqs, i, freq);
+                               i++;
+                               c--; v++;
+                       }
+                       break;
+               case ND_ACTIVE:
+                       if (!strcmp(v[0], "ssid")) {
+                               c--; v++;
+                               if (c == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               NLA_PUT(ssids,
+                                       NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
+                                       strlen(v[0]), v[0]);
+
+                               have_ssids = true;
+                               i++;
+                               c--; v++;
+                       } else {
+                               /* other element that cannot be part
+                                * of a match indicates the end of the
+                                * active set. */
+                               /* need at least one item in the set */
+                               if (i == 0) {
+                                       err = -EINVAL;
+                                       goto nla_put_failure;
+                               }
+
+                               parse_state = ND_TOPLEVEL;
+                       }
+                       break;
+               }
+       }
+
+       if (!have_ssids)
+               NLA_PUT(ssids, 1, 0, "");
+       if (!have_passive)
+               nla_put_nested(msg, NL80211_ATTR_SCAN_SSIDS, ssids);
+       if (have_freqs)
+               nla_put_nested(msg, NL80211_ATTR_SCAN_FREQUENCIES, freqs);
+       if (have_matchset)
+               nla_put_nested(msg, NL80211_ATTR_SCHED_SCAN_MATCH, matchset);
+       if (flags)
+               NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, flags);
+
+nla_put_failure:
+       if (match)
+               nla_nest_end(msg, match);
+       nlmsg_free(freqs);
+       nlmsg_free(matchset);
+
+out:
+       *argc = c;
+       *argv = v;
+       return err;
+}
+
 static int handle_scan(struct nl80211_state *state,
-                      struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        struct nl_msg *ssids = NULL, *freqs = NULL;
        char *eptr;
@@ -46,11 +348,16 @@ static int handle_scan(struct nl80211_state *state,
        enum {
                NONE,
                FREQ,
+               IES,
                SSID,
+               MESHID,
                DONE,
        } parse = NONE;
        int freq;
        bool passive = false, have_ssids = false, have_freqs = false;
+       size_t ies_len = 0, meshid_len = 0;
+       unsigned char *ies = NULL, *meshid = NULL, *tmpies;
+       unsigned int flags = 0;
 
        ssids = nlmsg_alloc();
        if (!ssids)
@@ -63,36 +370,96 @@ static int handle_scan(struct nl80211_state *state,
        }
 
        for (i = 0; i < argc; i++) {
-               if (parse == NONE && strcmp(argv[i], "freq") == 0) {
-                       parse = FREQ;
-                       have_freqs = true;
-                       continue;
-               } else if (parse < SSID && strcmp(argv[i], "ssid") == 0) {
-                       parse = SSID;
-                       have_ssids = true;
-                       continue;
-               } else if (parse < SSID && strcmp(argv[i], "passive") == 0) {
-                       parse = DONE;
-                       passive = true;
-                       continue;
-               }
-
                switch (parse) {
                case NONE:
+                       if (strcmp(argv[i], "freq") == 0) {
+                               parse = FREQ;
+                               have_freqs = true;
+                               break;
+                       } else if (strcmp(argv[i], "ies") == 0) {
+                               parse = IES;
+                               break;
+                       } else if (strcmp(argv[i], "lowpri") == 0) {
+                               flags |= NL80211_SCAN_FLAG_LOW_PRIORITY;
+                               break;
+                       } else if (strcmp(argv[i], "flush") == 0) {
+                               flags |= NL80211_SCAN_FLAG_FLUSH;
+                               break;
+                       } else if (strcmp(argv[i], "ap-force") == 0) {
+                               flags |= NL80211_SCAN_FLAG_AP;
+                               break;
+                       } else if (strncmp(argv[i], "randomise", 9) == 0 ||
+                                  strncmp(argv[i], "randomize", 9) == 0) {
+                               flags |= NL80211_SCAN_FLAG_RANDOM_ADDR;
+                               err = parse_random_mac_addr(msg, argv[i]);
+                               if (err)
+                                       goto nla_put_failure;
+                               break;
+                       } else if (strcmp(argv[i], "ssid") == 0) {
+                               parse = SSID;
+                               have_ssids = true;
+                               break;
+                       } else if (strcmp(argv[i], "passive") == 0) {
+                               parse = DONE;
+                               passive = true;
+                               break;
+                       } else if (strcmp(argv[i], "meshid") == 0) {
+                               parse = MESHID;
+                               break;
+                       }
                case DONE:
+                       nlmsg_free(ssids);
+                       nlmsg_free(freqs);
                        return 1;
                case FREQ:
                        freq = strtoul(argv[i], &eptr, 10);
-                       if (eptr != argv[i] + strlen(argv[i]))
-                               return 1;
+                       if (eptr != argv[i] + strlen(argv[i])) {
+                               /* failed to parse as number -- maybe a tag? */
+                               i--;
+                               parse = NONE;
+                               continue;
+                       }
                        NLA_PUT_U32(freqs, i, freq);
                        break;
+               case IES:
+                       ies = parse_hex(argv[i], &ies_len);
+                       if (!ies)
+                               goto nla_put_failure;
+                       parse = NONE;
+                       break;
                case SSID:
                        NLA_PUT(ssids, i, strlen(argv[i]), argv[i]);
                        break;
+               case MESHID:
+                       meshid_len = strlen(argv[i]);
+                       meshid = (unsigned char *) malloc(meshid_len + 2);
+                       if (!meshid)
+                               goto nla_put_failure;
+                       meshid[0] = 114; /* mesh element id */
+                       meshid[1] = meshid_len;
+                       memcpy(&meshid[2], argv[i], meshid_len);
+                       meshid_len += 2;
+                       parse = NONE;
+                       break;
                }
        }
 
+       if (ies || meshid) {
+               tmpies = (unsigned char *) malloc(ies_len + meshid_len);
+               if (!tmpies)
+                       goto nla_put_failure;
+               if (ies) {
+                       memcpy(tmpies, ies, ies_len);
+                       free(ies);
+               }
+               if (meshid) {
+                       memcpy(&tmpies[ies_len], meshid, meshid_len);
+                       free(meshid);
+               }
+               NLA_PUT(msg, NL80211_ATTR_IE, ies_len + meshid_len, tmpies);
+               free(tmpies);
+       }
+
        if (!have_ssids)
                NLA_PUT(ssids, 1, 0, "");
        if (!passive)
@@ -100,6 +467,8 @@ static int handle_scan(struct nl80211_state *state,
 
        if (have_freqs)
                nla_put_nested(msg, NL80211_ATTR_SCAN_FREQUENCIES, freqs);
+       if (flags)
+               NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, flags);
 
        err = 0;
  nla_put_failure:
@@ -107,8 +476,6 @@ static int handle_scan(struct nl80211_state *state,
        nlmsg_free(freqs);
        return err;
 }
-COMMAND(scan, trigger, "[freq <freq>*] [ssid <ssid>*|passive]",
-       NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan);
 
 static void tab_on_first(bool *first)
 {
@@ -120,19 +487,14 @@ static void tab_on_first(bool *first)
 
 static void print_ssid(const uint8_t type, uint8_t len, const uint8_t *data)
 {
-       int i;
-
        printf(" ");
-
-       for (i = 0; i < len; i++) {
-               if (isprint(data[i]))
-                       printf("%c", data[i]);
-               else
-                       printf("\\x%.2x", data[i]);
-       }
+       print_ssid_escaped(len, data);
        printf("\n");
 }
 
+#define BSS_MEMBERSHIP_SELECTOR_VHT_PHY 126
+#define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
+
 static void print_supprates(const uint8_t type, uint8_t len, const uint8_t *data)
 {
        int i;
@@ -141,7 +503,15 @@ static void print_supprates(const uint8_t type, uint8_t len, const uint8_t *data
 
        for (i = 0; i < len; i++) {
                int r = data[i] & 0x7f;
-               printf("%d.%d%s ", r/2, 5*(r&1), data[i] & 0x80 ? "*":"");
+
+               if (r == BSS_MEMBERSHIP_SELECTOR_VHT_PHY && data[i] & 0x80)
+                       printf("VHT");
+               else if (r == BSS_MEMBERSHIP_SELECTOR_HT_PHY && data[i] & 0x80)
+                       printf("HT");
+               else
+                       printf("%d.%d", r/2, 5*(r&1));
+
+               printf("%s ", data[i] & 0x80 ? "*" : "");
        }
        printf("\n");
 }
@@ -151,29 +521,63 @@ static void print_ds(const uint8_t type, uint8_t len, const uint8_t *data)
        printf(" channel %d\n", data[0]);
 }
 
-static void print_country(const uint8_t type, uint8_t len, const uint8_t *data)
+static const char *country_env_str(char environment)
 {
-       int i;
-
-       printf(" %.*s", 2, data);
-       switch (data[2]) {
+       switch (environment) {
        case 'I':
-               printf(" (indoor)");
-               break;
+               return "Indoor only";
        case 'O':
-               printf(" (outdoor)");
-               break;
+               return "Outdoor only";
        case ' ':
-               printf(" (in/outdoor)");
-               break;
+               return "Indoor/Outdoor";
        default:
-               printf(" (invalid environment)");
-               break;
+               return "bogus";
        }
-       printf(", data:");
-       for(i=0; i<len-3; i++)
-               printf(" %.02x", data[i + 3]);
-       printf("\n");
+}
+
+static void print_country(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf(" %.*s", 2, data);
+
+       printf("\tEnvironment: %s\n", country_env_str(data[2]));
+
+       data += 3;
+       len -= 3;
+
+       if (len < 3) {
+               printf("\t\tNo country IE triplets present\n");
+               return;
+       }
+
+       while (len >= 3) {
+               int end_channel;
+               union ieee80211_country_ie_triplet *triplet = (void *) data;
+
+               if (triplet->ext.reg_extension_id >= IEEE80211_COUNTRY_EXTENSION_ID) {
+                       printf("\t\tExtension ID: %d Regulatory Class: %d Coverage class: %d (up to %dm)\n",
+                              triplet->ext.reg_extension_id,
+                              triplet->ext.reg_class,
+                              triplet->ext.coverage_class,
+                              triplet->ext.coverage_class * 450);
+
+                       data += 3;
+                       len -= 3;
+                       continue;
+               }
+
+               /* 2 GHz */
+               if (triplet->chans.first_channel <= 14)
+                       end_channel = triplet->chans.first_channel + (triplet->chans.num_channels - 1);
+               else
+                       end_channel =  triplet->chans.first_channel + (4 * (triplet->chans.num_channels - 1));
+
+               printf("\t\tChannels [%d - %d] @ %d dBm\n", triplet->chans.first_channel, end_channel, triplet->chans.max_power);
+
+               data += 3;
+               len -= 3;
+       }
+
+       return;
 }
 
 static void print_powerconstraint(const uint8_t type, uint8_t len, const uint8_t *data)
@@ -181,6 +585,12 @@ static void print_powerconstraint(const uint8_t type, uint8_t len, const uint8_t
        printf(" %d dB\n", data[0]);
 }
 
+static void print_tpcreport(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf(" TX power: %d dBm\n", data[0]);
+       /* printf(" Link Margin (%d dB) is reserved in Beacons\n", data[1]); */
+}
+
 static void print_erp(const uint8_t type, uint8_t len, const uint8_t *data)
 {
        if (data[0] == 0x00)
@@ -196,104 +606,138 @@ static void print_erp(const uint8_t type, uint8_t len, const uint8_t *data)
 
 static void print_cipher(const uint8_t *data)
 {
-       if (memcmp(data, wifi_oui, 3) == 0) {
+       if (memcmp(data, ms_oui, 3) == 0) {
                switch (data[3]) {
-               case 0x00:
+               case 0:
                        printf("Use group cipher suite");
                        break;
-               case 0x01:
+               case 1:
                        printf("WEP-40");
                        break;
-               case 0x02:
+               case 2:
                        printf("TKIP");
                        break;
-               case 0x04:
+               case 4:
                        printf("CCMP");
                        break;
-               case 0x05:
+               case 5:
                        printf("WEP-104");
                        break;
                default:
-                       printf("Unknown (%.02x-%.02x-%.02x:%d)",
+                       printf("%.02x-%.02x-%.02x:%d",
                                data[0], data[1] ,data[2], data[3]);
                        break;
                }
        } else if (memcmp(data, ieee80211_oui, 3) == 0) {
                switch (data[3]) {
-               case 0x00:
+               case 0:
                        printf("Use group cipher suite");
                        break;
-               case 0x01:
+               case 1:
                        printf("WEP-40");
                        break;
-               case 0x02:
+               case 2:
                        printf("TKIP");
                        break;
-               case 0x04:
+               case 4:
                        printf("CCMP");
                        break;
-               case 0x05:
+               case 5:
                        printf("WEP-104");
                        break;
-               case 0x06:
+               case 6:
                        printf("AES-128-CMAC");
                        break;
+               case 7:
+                       printf("NO-GROUP");
+                       break;
+               case 8:
+                       printf("GCMP");
+                       break;
                default:
-                       printf("Unknown (%.02x-%.02x-%.02x:%d)",
+                       printf("%.02x-%.02x-%.02x:%d",
                                data[0], data[1] ,data[2], data[3]);
                        break;
                }
        } else
-               printf("Unknown (%.02x-%.02x-%.02x:%d)",
+               printf("%.02x-%.02x-%.02x:%d",
                        data[0], data[1] ,data[2], data[3]);
 }
 
 static void print_auth(const uint8_t *data)
 {
-       if (memcmp(data, wifi_oui, 3) == 0) {
+       if (memcmp(data, ms_oui, 3) == 0) {
                switch (data[3]) {
-               case 0x01:
+               case 1:
                        printf("IEEE 802.1X");
                        break;
-               case 0x02:
+               case 2:
                        printf("PSK");
                        break;
                default:
-                       printf("Unknown (%.02x-%.02x-%.02x:%d)",
+                       printf("%.02x-%.02x-%.02x:%d",
                                data[0], data[1] ,data[2], data[3]);
                        break;
                }
        } else if (memcmp(data, ieee80211_oui, 3) == 0) {
                switch (data[3]) {
-               case 0x01:
+               case 1:
                        printf("IEEE 802.1X");
                        break;
-               case 0x02:
+               case 2:
                        printf("PSK");
                        break;
+               case 3:
+                       printf("FT/IEEE 802.1X");
+                       break;
+               case 4:
+                       printf("FT/PSK");
+                       break;
+               case 5:
+                       printf("IEEE 802.1X/SHA-256");
+                       break;
+               case 6:
+                       printf("PSK/SHA-256");
+                       break;
+               case 7:
+                       printf("TDLS/TPK");
+                       break;
                default:
-                       printf("Unknown (%.02x-%.02x-%.02x:%d)",
+                       printf("%.02x-%.02x-%.02x:%d",
+                               data[0], data[1] ,data[2], data[3]);
+                       break;
+               }
+       } else if (memcmp(data, wfa_oui, 3) == 0) {
+               switch (data[3]) {
+               case 1:
+                       printf("OSEN");
+                       break;
+               default:
+                       printf("%.02x-%.02x-%.02x:%d",
                                data[0], data[1] ,data[2], data[3]);
                        break;
                }
        } else
-               printf("Unknown (%.02x-%.02x-%.02x:%d)",
+               printf("%.02x-%.02x-%.02x:%d",
                        data[0], data[1] ,data[2], data[3]);
 }
 
-static void print_rsn_ie(const char *defcipher, const char *defauth,
-                        uint8_t len, const uint8_t *data)
+static void _print_rsn_ie(const char *defcipher, const char *defauth,
+                         uint8_t len, const uint8_t *data, int is_osen)
 {
        bool first = true;
-       __u16 version, count, capa;
+       __u16 count, capa;
        int i;
 
-       version = data[0] + (data[1] << 8);
-       tab_on_first(&first);
-       printf("\t * Version: %d\n", version);
+       if (!is_osen) {
+               __u16 version;
+               version = data[0] + (data[1] << 8);
+               tab_on_first(&first);
+               printf("\t * Version: %d\n", version);
 
-       data += 2;
-       len -= 2;
+               data += 2;
+               len -= 2;
+       }
 
        if (len < 4) {
                tab_on_first(&first);
@@ -355,13 +799,77 @@ static void print_rsn_ie(const char *defcipher, const char *defauth,
        if (len >= 2) {
                capa = data[0] | (data[1] << 8);
                tab_on_first(&first);
-               printf("\t * Capabilities: 0x%.4x\n", capa);
-
+               printf("\t * Capabilities:");
+               if (capa & 0x0001)
+                       printf(" PreAuth");
+               if (capa & 0x0002)
+                       printf(" NoPairwise");
+               switch ((capa & 0x000c) >> 2) {
+               case 0:
+                       printf(" 1-PTKSA-RC");
+                       break;
+               case 1:
+                       printf(" 2-PTKSA-RC");
+                       break;
+               case 2:
+                       printf(" 4-PTKSA-RC");
+                       break;
+               case 3:
+                       printf(" 16-PTKSA-RC");
+                       break;
+               }
+               switch ((capa & 0x0030) >> 4) {
+               case 0:
+                       printf(" 1-GTKSA-RC");
+                       break;
+               case 1:
+                       printf(" 2-GTKSA-RC");
+                       break;
+               case 2:
+                       printf(" 4-GTKSA-RC");
+                       break;
+               case 3:
+                       printf(" 16-GTKSA-RC");
+                       break;
+               }
+               if (capa & 0x0040)
+                       printf(" MFP-required");
+               if (capa & 0x0080)
+                       printf(" MFP-capable");
+               if (capa & 0x0200)
+                       printf(" Peerkey-enabled");
+               if (capa & 0x0400)
+                       printf(" SPP-AMSDU-capable");
+               if (capa & 0x0800)
+                       printf(" SPP-AMSDU-required");
+               printf(" (0x%.4x)\n", capa);
                data += 2;
                len -= 2;
        }
 
-invalid:
+       if (len >= 2) {
+               int pmkid_count = data[0] | (data[1] << 8);
+
+               if (len >= 2 + 16 * pmkid_count) {
+                       tab_on_first(&first);
+                       printf("\t * %d PMKIDs\n", pmkid_count);
+                       /* not printing PMKID values */
+                       data += 2 + 16 * pmkid_count;
+                       len -= 2 + 16 * pmkid_count;
+               } else
+                       goto invalid;
+       }
+
+       if (len >= 4) {
+               tab_on_first(&first);
+               printf("\t * Group mgmt cipher suite: ");
+               print_cipher(data);
+               printf("\n");
+               data += 4;
+               len -= 4;
+       }
+
+ invalid:
        if (len != 0) {
                printf("\t\t * bogus tail data (%d):", len);
                while (len) {
@@ -373,24 +881,401 @@ invalid:
        }
 }
 
+static void print_rsn_ie(const char *defcipher, const char *defauth,
+                        uint8_t len, const uint8_t *data)
+{
+       _print_rsn_ie(defcipher, defauth, len, data, 0);
+}
+
+static void print_osen_ie(const char *defcipher, const char *defauth,
+                         uint8_t len, const uint8_t *data)
+{
+       printf("\n\t");
+       _print_rsn_ie(defcipher, defauth, len, data, 1);
+}
+
 static void print_rsn(const uint8_t type, uint8_t len, const uint8_t *data)
 {
        print_rsn_ie("CCMP", "IEEE 802.1X", len, data);
 }
 
+static void print_ht_capa(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf("\n");
+       print_ht_capability(data[0] | (data[1] << 8));
+       print_ampdu_length(data[2] & 3);
+       print_ampdu_spacing((data[2] >> 2) & 7);
+       print_ht_mcs(data + 3);
+}
+
+static const char* ntype_11u(uint8_t t)
+{
+       switch (t) {
+       case 0: return "Private";
+       case 1: return "Private with Guest";
+       case 2: return "Chargeable Public";
+       case 3: return "Free Public";
+       case 4: return "Personal Device";
+       case 5: return "Emergency Services Only";
+       case 14: return "Test or Experimental";
+       case 15: return "Wildcard";
+       default: return "Reserved";
+       }
+}
+
+static const char* vgroup_11u(uint8_t t)
+{
+       switch (t) {
+       case 0: return "Unspecified";
+       case 1: return "Assembly";
+       case 2: return "Business";
+       case 3: return "Educational";
+       case 4: return "Factory and Industrial";
+       case 5: return "Institutional";
+       case 6: return "Mercantile";
+       case 7: return "Residential";
+       case 8: return "Storage";
+       case 9: return "Utility and Miscellaneous";
+       case 10: return "Vehicular";
+       case 11: return "Outdoor";
+       default: return "Reserved";
+       }
+}
+
+static void print_interworking(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       /* See Section 7.3.2.92 in the 802.11u spec. */
+       printf("\n");
+       if (len >= 1) {
+               uint8_t ano = data[0];
+               printf("\t\tNetwork Options: 0x%hx\n", (unsigned short)(ano));
+               printf("\t\t\tNetwork Type: %i (%s)\n",
+                      (int)(ano & 0xf), ntype_11u(ano & 0xf));
+               if (ano & (1<<4))
+                       printf("\t\t\tInternet\n");
+               if (ano & (1<<5))
+                       printf("\t\t\tASRA\n");
+               if (ano & (1<<6))
+                       printf("\t\t\tESR\n");
+               if (ano & (1<<7))
+                       printf("\t\t\tUESA\n");
+       }
+       if ((len == 3) || (len == 9)) {
+               printf("\t\tVenue Group: %i (%s)\n",
+                      (int)(data[1]), vgroup_11u(data[1]));
+               printf("\t\tVenue Type: %i\n", (int)(data[2]));
+       }
+       if (len == 9)
+               printf("\t\tHESSID: %02hx:%02hx:%02hx:%02hx:%02hx:%02hx\n",
+                      data[3], data[4], data[5], data[6], data[7], data[8]);
+       else if (len == 7)
+               printf("\t\tHESSID: %02hx:%02hx:%02hx:%02hx:%02hx:%02hx\n",
+                      data[1], data[2], data[3], data[4], data[5], data[6]);
+}
+
+static void print_11u_advert(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       /* See Section 7.3.2.93 in the 802.11u spec. */
+       /* TODO: This code below does not decode private protocol IDs */
+       int idx = 0;
+       printf("\n");
+       while (idx < (len - 1)) {
+               uint8_t qri = data[idx];
+               uint8_t proto_id = data[idx + 1];
+               printf("\t\tQuery Response Info: 0x%hx\n", (unsigned short)(qri));
+               printf("\t\t\tQuery Response Length Limit: %i\n",
+                      (qri & 0x7f));
+               if (qri & (1<<7))
+                       printf("\t\t\tPAME-BI\n");
+               switch(proto_id) {
+               case 0:
+                       printf("\t\t\tANQP\n"); break;
+               case 1:
+                       printf("\t\t\tMIH Information Service\n"); break;
+               case 2:
+                       printf("\t\t\tMIH Command and Event Services Capability Discovery\n"); break;
+               case 3:
+                       printf("\t\t\tEmergency Alert System (EAS)\n"); break;
+               case 221:
+                       printf("\t\t\tVendor Specific\n"); break;
+               default:
+                       printf("\t\t\tReserved: %i\n", proto_id); break;
+               }
+               idx += 2;
+       }
+}
+
+static void print_11u_rcon(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       /* See Section 7.3.2.96 in the 802.11u spec. */
+       int idx = 0;
+       int ln0 = data[1] & 0xf;
+       int ln1 = ((data[1] & 0xf0) >> 4);
+       int ln2 = 0;
+       printf("\n");
+
+       if (ln1)
+               ln2 = len - 2 - ln0 - ln1;
+
+       printf("\t\tANQP OIs: %i\n", data[0]);
+
+       if (ln0 > 0) {
+               printf("\t\tOI 1: ");
+               if (2 + ln0 > len) {
+                       printf("Invalid IE length.\n");
+               } else {
+                       for (idx = 0; idx < ln0; idx++) {
+                               printf("%02hx", data[2 + idx]);
+                       }
+                       printf("\n");
+               }
+       }
+
+       if (ln1 > 0) {
+               printf("\t\tOI 2: ");
+               if (2 + ln0 + ln1 > len) {
+                       printf("Invalid IE length.\n");
+               } else {
+                       for (idx = 0; idx < ln1; idx++) {
+                               printf("%02hx", data[2 + ln0 + idx]);
+                       }
+                       printf("\n");
+               }
+       }
+
+       if (ln2 > 0) {
+               printf("\t\tOI 3: ");
+               if (2 + ln0 + ln1 + ln2 > len) {
+                       printf("Invalid IE length.\n");
+               } else {
+                       for (idx = 0; idx < ln2; idx++) {
+                               printf("%02hx", data[2 + ln0 + ln1 + idx]);
+                       }
+                       printf("\n");
+               }
+       }
+}
+
+static const char *ht_secondary_offset[4] = {
+       "no secondary",
+       "above",
+       "[reserved!]",
+       "below",
+};
+
+static void print_ht_op(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       static const char *protection[4] = {
+               "no",
+               "nonmember",
+               "20 MHz",
+               "non-HT mixed",
+       };
+       static const char *sta_chan_width[2] = {
+               "20 MHz",
+               "any",
+       };
+
+       printf("\n");
+       printf("\t\t * primary channel: %d\n", data[0]);
+       printf("\t\t * secondary channel offset: %s\n",
+               ht_secondary_offset[data[1] & 0x3]);
+       printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
+       printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
+       printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
+       printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
+       printf("\t\t * OBSS non-GF present: %d\n", (data[2] & 0x10) >> 4);
+       printf("\t\t * dual beacon: %d\n", (data[4] & 0x40) >> 6);
+       printf("\t\t * dual CTS protection: %d\n", (data[4] & 0x80) >> 7);
+       printf("\t\t * STBC beacon: %d\n", data[5] & 0x1);
+       printf("\t\t * L-SIG TXOP Prot: %d\n", (data[5] & 0x2) >> 1);
+       printf("\t\t * PCO active: %d\n", (data[5] & 0x4) >> 2);
+       printf("\t\t * PCO phase: %d\n", (data[5] & 0x8) >> 3);
+}
+
 static void print_capabilities(const uint8_t type, uint8_t len, const uint8_t *data)
 {
-       int i;
+       int i, base, bit;
+       bool first = true;
 
-       for(i = 0; i < len; i++)
-               printf(" %.02x", data[i]);
+
+       for (i = 0; i < len; i++) {
+               base = i * 8;
+
+               for (bit = 0; bit < 8; bit++) {
+                       if (!(data[i] & (1 << bit)))
+                               continue;
+
+                       if (!first)
+                               printf(",");
+                       else
+                               first = false;
+
+#define CAPA(bit, name)                case bit: printf(" " name); break
+
+                       switch (bit + base) {
+                       CAPA(0, "HT Information Exchange Supported");
+                       CAPA(1, "reserved (On-demand Beacon)");
+                       CAPA(2, "Extended Channel Switching");
+                       CAPA(3, "reserved (Wave Indication)");
+                       CAPA(4, "PSMP Capability");
+                       CAPA(5, "reserved (Service Interval Granularity)");
+                       CAPA(6, "S-PSMP Capability");
+                       CAPA(7, "Event");
+                       CAPA(8, "Diagnostics");
+                       CAPA(9, "Multicast Diagnostics");
+                       CAPA(10, "Location Tracking");
+                       CAPA(11, "FMS");
+                       CAPA(12, "Proxy ARP Service");
+                       CAPA(13, "Collocated Interference Reporting");
+                       CAPA(14, "Civic Location");
+                       CAPA(15, "Geospatial Location");
+                       CAPA(16, "TFS");
+                       CAPA(17, "WNM-Sleep Mode");
+                       CAPA(18, "TIM Broadcast");
+                       CAPA(19, "BSS Transition");
+                       CAPA(20, "QoS Traffic Capability");
+                       CAPA(21, "AC Station Count");
+                       CAPA(22, "Multiple BSSID");
+                       CAPA(23, "Timing Measurement");
+                       CAPA(24, "Channel Usage");
+                       CAPA(25, "SSID List");
+                       CAPA(26, "DMS");
+                       CAPA(27, "UTC TSF Offset");
+                       CAPA(28, "TDLS Peer U-APSD Buffer STA Support");
+                       CAPA(29, "TDLS Peer PSM Support");
+                       CAPA(30, "TDLS channel switching");
+                       CAPA(31, "Interworking");
+                       CAPA(32, "QoS Map");
+                       CAPA(33, "EBR");
+                       CAPA(34, "SSPN Interface");
+                       CAPA(35, "Reserved");
+                       CAPA(36, "MSGCF Capability");
+                       CAPA(37, "TDLS Support");
+                       CAPA(38, "TDLS Prohibited");
+                       CAPA(39, "TDLS Channel Switching Prohibited");
+                       CAPA(40, "Reject Unadmitted Frame");
+                       CAPA(44, "Identifier Location");
+                       CAPA(45, "U-APSD Coexistence");
+                       CAPA(46, "WNM-Notification");
+                       CAPA(47, "Reserved");
+                       CAPA(48, "UTF-8 SSID");
+                       default:
+                               printf(" %d", bit);
+                               break;
+                       }
+#undef CAPA
+               }
+       }
+
+       printf("\n");
+}
+
+static void print_tim(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf(" DTIM Count %u DTIM Period %u Bitmap Control 0x%x "
+              "Bitmap[0] 0x%x",
+              data[0], data[1], data[2], data[3]);
+       if (len - 4)
+               printf(" (+ %u octet%s)", len - 4, len - 4 == 1 ? "" : "s");
        printf("\n");
 }
 
+static void print_ibssatim(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf(" %d TUs", (data[1] << 8) + data[0]);
+}
+
+static void print_vht_capa(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf("\n");
+       print_vht_info(data[0] | (data[1] << 8) |
+                      (data[2] << 16) | (data[3] << 24),
+                      data + 4);
+}
+
+static void print_vht_oper(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       const char *chandwidths[] = {
+               [0] = "20 or 40 MHz",
+               [1] = "80 MHz",
+               [3] = "80+80 MHz",
+               [2] = "160 MHz",
+       };
+
+       printf("\n");
+       printf("\t\t * channel width: %d (%s)\n", data[0],
+               data[0] < ARRAY_SIZE(chandwidths) ? chandwidths[data[0]] : "unknown");
+       printf("\t\t * center freq segment 1: %d\n", data[1]);
+       printf("\t\t * center freq segment 2: %d\n", data[2]);
+       printf("\t\t * VHT basic MCS set: 0x%.2x%.2x\n", data[4], data[3]);
+}
+
+static void print_obss_scan_params(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf("\n");
+       printf("\t\t * passive dwell: %d TUs\n", (data[1] << 8) | data[0]);
+       printf("\t\t * active dwell: %d TUs\n", (data[3] << 8) | data[2]);
+       printf("\t\t * channel width trigger scan interval: %d s\n", (data[5] << 8) | data[4]);
+       printf("\t\t * scan passive total per channel: %d TUs\n", (data[7] << 8) | data[6]);
+       printf("\t\t * scan active total per channel: %d TUs\n", (data[9] << 8) | data[8]);
+       printf("\t\t * BSS width channel transition delay factor: %d\n", (data[11] << 8) | data[10]);
+       printf("\t\t * OBSS Scan Activity Threshold: %d.%02d %%\n",
+               ((data[13] << 8) | data[12]) / 100, ((data[13] << 8) | data[12]) % 100);
+}
+
+static void print_secchan_offs(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       if (data[0] < ARRAY_SIZE(ht_secondary_offset))
+               printf(" %s (%d)\n", ht_secondary_offset[data[0]], data[0]);
+       else
+               printf(" %d\n", data[0]);
+}
+
+static void print_bss_load(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf("\n");
+       printf("\t\t * station count: %d\n", (data[1] << 8) | data[0]);
+       printf("\t\t * channel utilisation: %d/255\n", data[2]);
+       printf("\t\t * available admission capacity: %d [*32us]\n", (data[4] << 8) | data[3]);
+}
+
+static void print_mesh_conf(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       printf("\n");
+       printf("\t\t * Active Path Selection Protocol ID: %d\n", data[0]);
+       printf("\t\t * Active Path Selection Metric ID: %d\n", data[1]);
+       printf("\t\t * Congestion Control Mode ID: %d\n", data[2]);
+       printf("\t\t * Synchronization Method ID: %d\n", data[3]);
+       printf("\t\t * Authentication Protocol ID: %d\n", data[4]);
+       printf("\t\t * Mesh Formation Info:\n");
+       printf("\t\t\t Number of Peerings: %d\n", (data[5] & 0x7E) >> 1);
+       if (data[5] & 0x01)
+               printf("\t\t\t Connected to Mesh Gate\n");
+       if (data[5] & 0x80)
+               printf("\t\t\t Connected to AS\n");
+       printf("\t\t * Mesh Capability\n");
+       if (data[6] & 0x01)
+               printf("\t\t\t Accepting Additional Mesh Peerings\n");
+       if (data[6] & 0x02)
+               printf("\t\t\t MCCA Supported\n");
+       if (data[6] & 0x04)
+               printf("\t\t\t MCCA Enabled\n");
+       if (data[6] & 0x08)
+               printf("\t\t\t Forwarding\n");
+       if (data[6] & 0x10)
+               printf("\t\t\t MBCA Supported\n");
+       if (data[6] & 0x20)
+               printf("\t\t\t TBTT Adjusting\n");
+       if (data[6] & 0x40)
+               printf("\t\t\t Mesh Power Save Level\n");
+}
+
 struct ie_print {
        const char *name;
        void (*print)(const uint8_t type, uint8_t len, const uint8_t *data);
        uint8_t minlen, maxlen;
+       uint8_t flags;
 };
 
 static void print_ie(const struct ie_print *p, const uint8_t type,
@@ -426,16 +1311,31 @@ static void print_ie(const struct ie_print *p, const uint8_t type,
 }
 
 static const struct ie_print ieprinters[] = {
-       [0] = { "SSID", print_ssid, 0, 32, },
-       [1] = { "Supported rates", print_supprates, 0, 255, },
-       [3] = { "DS Paramater set", print_ds, 1, 1, },
-       [5] = PRINT_IGN,
-       [7] = { "Country", print_country, 3, 255, },
-       [32] = { "Power constraint", print_powerconstraint, 1, 1, },
-       [42] = { "ERP", print_erp, 1, 255, },
-       [48] = { "RSN", print_rsn, 2, 255, },
-       [50] = { "Extended supported rates", print_supprates, 0, 255, },
-       [127] = { "Extended capabilities", print_capabilities, 0, 255, },
+       [0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
+       [1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
+       [3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
+       [5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
+       [6] = { "IBSS ATIM window", print_ibssatim, 2, 2, BIT(PRINT_SCAN), },
+       [7] = { "Country", print_country, 3, 255, BIT(PRINT_SCAN), },
+       [11] = { "BSS Load", print_bss_load, 5, 5, BIT(PRINT_SCAN), },
+       [32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
+       [35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
+       [42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
+       [45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), },
+       [47] = { "ERP D4.0", print_erp, 1, 255, BIT(PRINT_SCAN), },
+       [74] = { "Overlapping BSS scan params", print_obss_scan_params, 14, 255, BIT(PRINT_SCAN), },
+       [61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
+       [62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), },
+       [191] = { "VHT capabilities", print_vht_capa, 12, 255, BIT(PRINT_SCAN), },
+       [192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), },
+       [48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
+       [50] = { "Extended supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
+       [113] = { "MESH Configuration", print_mesh_conf, 7, 7, BIT(PRINT_SCAN), },
+       [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
+       [127] = { "Extended capabilities", print_capabilities, 0, 255, BIT(PRINT_SCAN), },
+       [107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), },
+       [108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), },
+       [111] = { "802.11u Roaming Consortium", print_11u_rcon, 0, 255, BIT(PRINT_SCAN), },
 };
 
 static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data)
@@ -443,6 +1343,53 @@ static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data)
        print_rsn_ie("TKIP", "IEEE 802.1X", len, data);
 }
 
+static void print_wifi_osen(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       print_osen_ie("OSEN", "OSEN", len, data);
+}
+
+static bool print_wifi_wmm_param(const uint8_t *data, uint8_t len)
+{
+       int i;
+       static const char *aci_tbl[] = { "BE", "BK", "VI", "VO" };
+
+       if (len < 19)
+               goto invalid;
+
+       if (data[0] != 1) {
+               printf("Parameter: not version 1: ");
+               return false;
+       }
+
+       printf("\t * Parameter version 1");
+
+       data++;
+
+       if (data[0] & 0x80)
+               printf("\n\t\t * u-APSD");
+
+       data += 2;
+
+       for (i = 0; i < 4; i++) {
+               printf("\n\t\t * %s:", aci_tbl[(data[0] >> 5) & 3]);
+               if (data[0] & 0x10)
+                       printf(" acm");
+               printf(" CW %d-%d", (1 << (data[1] & 0xf)) - 1,
+                                   (1 << (data[1] >> 4)) - 1);
+               printf(", AIFSN %d", data[0] & 0xf);
+               if (data[2] | data[3])
+                       printf(", TXOP %d usec", (data[2] + (data[3] << 8)) * 32);
+               data += 4;
+       }
+
+       printf("\n");
+       return true;
+
+ invalid:
+       printf("invalid: ");
+       return false;
+}
+
 static void print_wifi_wmm(const uint8_t type, uint8_t len, const uint8_t *data)
 {
        int i;
@@ -452,18 +1399,39 @@ static void print_wifi_wmm(const uint8_t type, uint8_t len, const uint8_t *data)
                printf(" information:");
                break;
        case 0x01:
-               printf(" parameter:");
+               if (print_wifi_wmm_param(data + 1, len - 1))
+                       return;
                break;
        default:
                printf(" type %d:", data[0]);
                break;
        }
 
-       for(i = 0; i < len - 1; i++)
-               printf(" %.02x", data[i + 1]);
+       for(i = 1; i < len; i++)
+               printf(" %.02x", data[i]);
        printf("\n");
 }
 
+static const char * wifi_wps_dev_passwd_id(uint16_t id)
+{
+       switch (id) {
+       case 0:
+               return "Default (PIN)";
+       case 1:
+               return "User-specified";
+       case 2:
+               return "Machine-specified";
+       case 3:
+               return "Rekey";
+       case 4:
+               return "PushButton";
+       case 5:
+               return "Registrar-specified";
+       default:
+               return "??";
+       }
+}
+
 static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
 {
        bool first = true;
@@ -484,6 +1452,19 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
                        tab_on_first(&first);
                        printf("\t * Device name: %.*s\n", sublen, data + 4);
                        break;
+               case 0x1012: {
+                       uint16_t id;
+                       tab_on_first(&first);
+                       if (sublen != 2) {
+                               printf("\t * Device Password ID: (invalid "
+                                      "length %d)\n", sublen);
+                               break;
+                       }
+                       id = data[4] << 8 | data[5];
+                       printf("\t * Device Password ID: %u (%s)\n",
+                              id, wifi_wps_dev_passwd_id(id));
+                       break;
+               }
                case 0x1021:
                        tab_on_first(&first);
                        printf("\t * Manufacturer: %.*s\n", sublen, data + 4);
@@ -492,17 +1473,83 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
                        tab_on_first(&first);
                        printf("\t * Model: %.*s\n", sublen, data + 4);
                        break;
+               case 0x1024:
+                       tab_on_first(&first);
+                       printf("\t * Model Number: %.*s\n", sublen, data + 4);
+                       break;
+               case 0x103b: {
+                       __u8 val = data[4];
+                       tab_on_first(&first);
+                       printf("\t * Response Type: %d%s\n",
+                              val, val == 3 ? " (AP)" : "");
+                       break;
+               }
+               case 0x103c: {
+                       __u8 val = data[4];
+                       tab_on_first(&first);
+                       printf("\t * RF Bands: 0x%x\n", val);
+                       break;
+               }
+               case 0x1041: {
+                       __u8 val = data[4];
+                       tab_on_first(&first);
+                       printf("\t * Selected Registrar: 0x%x\n", val);
+                       break;
+               }
+               case 0x1042:
+                       tab_on_first(&first);
+                       printf("\t * Serial Number: %.*s\n", sublen, data + 4);
+                       break;
+               case 0x1044: {
+                       __u8 val = data[4];
+                       tab_on_first(&first);
+                       printf("\t * Wi-Fi Protected Setup State: %d%s%s\n",
+                              val,
+                              val == 1 ? " (Unconfigured)" : "",
+                              val == 2 ? " (Configured)" : "");
+                       break;
+               }
+               case 0x1047:
+                       tab_on_first(&first);
+                       printf("\t * UUID: ");
+                       if (sublen != 16) {
+                               printf("(invalid, length=%d)\n", sublen);
+                               break;
+                       }
+                       printf("%02x%02x%02x%02x-%02x%02x-%02x%02x-"
+                               "%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+                               data[4], data[5], data[6], data[7],
+                               data[8], data[9], data[10], data[11],
+                               data[12], data[13], data[14], data[15],
+                               data[16], data[17], data[18], data[19]);
+                       break;
+               case 0x1054: {
+                       tab_on_first(&first);
+                       if (sublen != 8) {
+                               printf("\t * Primary Device Type: (invalid "
+                                      "length %d)\n", sublen);
+                               break;
+                       }
+                       printf("\t * Primary Device Type: "
+                              "%u-%02x%02x%02x%02x-%u\n",
+                              data[4] << 8 | data[5],
+                              data[6], data[7], data[8], data[9],
+                              data[10] << 8 | data[11]);
+                       break;
+               }
                case 0x1057: {
-                       __u16 val = (data[4] << 8) | data[5];
+                       __u8 val = data[4];
                        tab_on_first(&first);
-                       printf("\t * AP setup locked: 0x%.4x\n", val);
+                       printf("\t * AP setup locked: 0x%.2x\n", val);
                        break;
                }
-               case 0x1008: {
+               case 0x1008:
+               case 0x1053: {
                        __u16 meth = (data[4] << 8) + data[5];
                        bool comma = false;
                        tab_on_first(&first);
-                       printf("\t * Config methods:");
+                       printf("\t * %sConfig methods:",
+                              subtype == 0x1053 ? "Selected Registrar ": "");
 #define T(bit, name) do {              \
        if (meth & (1<<bit)) {          \
                if (comma)              \
@@ -523,9 +1570,22 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
                        break;
 #undef T
                }
-               default:
+               default: {
+                       const __u8 *subdata = data + 4;
+                       __u16 tmplen = sublen;
+
+                       tab_on_first(&first);
+                       printf("\t * Unknown TLV (%#.4x, %d bytes):",
+                              subtype, tmplen);
+                       while (tmplen) {
+                               printf(" %.2x", *subdata);
+                               subdata++;
+                               tmplen--;
+                       }
+                       printf("\n");
                        break;
                }
+               }
 
                data += sublen + 4;
                len -= sublen + 4;
@@ -543,13 +1603,109 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data)
 }
 
 static const struct ie_print wifiprinters[] = {
-       [1] = { "WPA", print_wifi_wpa, 2, 255, },
-       [2] = { "WMM", print_wifi_wmm, 1, 255, },
-       [4] = { "WPS", print_wifi_wps, 0, 255, },
+       [1] = { "WPA", print_wifi_wpa, 2, 255, BIT(PRINT_SCAN), },
+       [2] = { "WMM", print_wifi_wmm, 1, 255, BIT(PRINT_SCAN), },
+       [4] = { "WPS", print_wifi_wps, 0, 255, BIT(PRINT_SCAN), },
+};
+
+static inline void print_p2p(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       bool first = true;
+       __u8 subtype;
+       __u16 sublen;
+
+       while (len >= 3) {
+               subtype = data[0];
+               sublen = (data[2] << 8) + data[1];
+
+               if (sublen > len - 3)
+                       break;
+
+               switch (subtype) {
+               case 0x02: /* capability */
+                       tab_on_first(&first);
+                       if (sublen < 2) {
+                               printf("\t * malformed capability\n");
+                               break;
+                       }
+                       printf("\t * Group capa: 0x%.2x, Device capa: 0x%.2x\n",
+                               data[3], data[4]);
+                       break;
+               case 0x0d: /* device info */
+                       if (sublen < 6 + 2 + 8 + 1) {
+                               printf("\t * malformed device info\n");
+                               break;
+                       }
+                       /* fall through for now */
+               case 0x00: /* status */
+               case 0x01: /* minor reason */
+               case 0x03: /* device ID */
+               case 0x04: /* GO intent */
+               case 0x05: /* configuration timeout */
+               case 0x06: /* listen channel */
+               case 0x07: /* group BSSID */
+               case 0x08: /* ext listen timing */
+               case 0x09: /* intended interface address */
+               case 0x0a: /* manageability */
+               case 0x0b: /* channel list */
+               case 0x0c: /* NoA */
+               case 0x0e: /* group info */
+               case 0x0f: /* group ID */
+               case 0x10: /* interface */
+               case 0x11: /* operating channel */
+               case 0x12: /* invitation flags */
+               case 0xdd: /* vendor specific */
+               default: {
+                       const __u8 *subdata = data + 4;
+                       __u16 tmplen = sublen;
+
+                       tab_on_first(&first);
+                       printf("\t * Unknown TLV (%#.2x, %d bytes):",
+                              subtype, tmplen);
+                       while (tmplen) {
+                               printf(" %.2x", *subdata);
+                               subdata++;
+                               tmplen--;
+                       }
+                       printf("\n");
+                       break;
+               }
+               }
+
+               data += sublen + 3;
+               len -= sublen + 3;
+       }
+
+       if (len != 0) {
+               tab_on_first(&first);
+               printf("\t * bogus tail data (%d):", len);
+               while (len) {
+                       printf(" %.2x", *data);
+                       data++;
+                       len--;
+               }
+               printf("\n");
+       }
+}
+
+static inline void print_hs20_ind(const uint8_t type, uint8_t len, const uint8_t *data)
+{
+       /* I can't find the spec for this...just going off what wireshark uses. */
+       printf("\n");
+       if (len > 0)
+               printf("\t\tDGAF: %i\n", (int)(data[0] & 0x1));
+       else
+               printf("\t\tUnexpected length: %i\n", len);
+}
+
+static const struct ie_print wfa_printers[] = {
+       [9] = { "P2P", print_p2p, 2, 255, BIT(PRINT_SCAN), },
+       [16] = { "HotSpot 2.0 Indication", print_hs20_ind, 1, 255, BIT(PRINT_SCAN), },
+       [18] = { "HotSpot 2.0 OSEN", print_wifi_osen, 1, 255, BIT(PRINT_SCAN), },
 };
 
 static void print_vendor(unsigned char len, unsigned char *data,
-                        struct scan_params *params)
+                        bool unknown, enum print_ie_type ptype)
 {
        int i;
 
@@ -561,21 +1717,39 @@ static void print_vendor(unsigned char len, unsigned char *data,
                return;
        }
 
-       if (len >= 4 && memcmp(data, wifi_oui, 3) == 0) {
-               if (data[3] < ARRAY_SIZE(wifiprinters) && wifiprinters[data[3]].name) {
+       if (len >= 4 && memcmp(data, ms_oui, 3) == 0) {
+               if (data[3] < ARRAY_SIZE(wifiprinters) &&
+                   wifiprinters[data[3]].name &&
+                   wifiprinters[data[3]].flags & BIT(ptype)) {
                        print_ie(&wifiprinters[data[3]], data[3], len - 4, data + 4);
                        return;
                }
-               if (!params->unknown)
+               if (!unknown)
+                       return;
+               printf("\tMS/WiFi %#.2x, data:", data[3]);
+               for(i = 0; i < len - 4; i++)
+                       printf(" %.02x", data[i + 4]);
+               printf("\n");
+               return;
+       }
+
+       if (len >= 4 && memcmp(data, wfa_oui, 3) == 0) {
+               if (data[3] < ARRAY_SIZE(wfa_printers) &&
+                   wfa_printers[data[3]].name &&
+                   wfa_printers[data[3]].flags & BIT(ptype)) {
+                       print_ie(&wfa_printers[data[3]], data[3], len - 4, data + 4);
+                       return;
+               }
+               if (!unknown)
                        return;
-               printf("\tWiFi OUI %#.2x, data:", data[3]);
+               printf("\tWFA %#.2x, data:", data[3]);
                for(i = 0; i < len - 4; i++)
                        printf(" %.02x", data[i + 4]);
                printf("\n");
                return;
        }
 
-       if (!params->unknown)
+       if (!unknown)
                return;
 
        printf("\tVendor specific: OUI %.2x:%.2x:%.2x, data:",
@@ -585,14 +1759,17 @@ static void print_vendor(unsigned char len, unsigned char *data,
        printf("\n");
 }
 
-static void print_ies(unsigned char *ie, int ielen, struct scan_params *params)
+void print_ies(unsigned char *ie, int ielen, bool unknown,
+              enum print_ie_type ptype)
 {
        while (ielen >= 2 && ielen >= ie[1]) {
-               if (ie[0] < ARRAY_SIZE(ieprinters) && ieprinters[ie[0]].name) {
+               if (ie[0] < ARRAY_SIZE(ieprinters) &&
+                   ieprinters[ie[0]].name &&
+                   ieprinters[ie[0]].flags & BIT(ptype)) {
                        print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2);
                } else if (ie[0] == 221 /* vendor */) {
-                       print_vendor(ie[1], ie + 2, params);
-               } else if (params->unknown) {
+                       print_vendor(ie[1], ie + 2, unknown, ptype);
+               } else if (unknown) {
                        int i;
 
                        printf("\tUnknown IE (%d):", ie[0]);
@@ -605,6 +1782,70 @@ static void print_ies(unsigned char *ie, int ielen, struct scan_params *params)
        }
 }
 
+static void print_capa_dmg(__u16 capa)
+{
+       switch (capa & WLAN_CAPABILITY_DMG_TYPE_MASK) {
+       case WLAN_CAPABILITY_DMG_TYPE_AP:
+               printf(" DMG_ESS");
+               break;
+       case WLAN_CAPABILITY_DMG_TYPE_PBSS:
+               printf(" DMG_PCP");
+               break;
+       case WLAN_CAPABILITY_DMG_TYPE_IBSS:
+               printf(" DMG_IBSS");
+               break;
+       }
+
+       if (capa & WLAN_CAPABILITY_DMG_CBAP_ONLY)
+               printf(" CBAP_Only");
+       if (capa & WLAN_CAPABILITY_DMG_CBAP_SOURCE)
+               printf(" CBAP_Src");
+       if (capa & WLAN_CAPABILITY_DMG_PRIVACY)
+               printf(" Privacy");
+       if (capa & WLAN_CAPABILITY_DMG_ECPAC)
+               printf(" ECPAC");
+       if (capa & WLAN_CAPABILITY_DMG_SPECTRUM_MGMT)
+               printf(" SpectrumMgmt");
+       if (capa & WLAN_CAPABILITY_DMG_RADIO_MEASURE)
+               printf(" RadioMeasure");
+}
+
+static void print_capa_non_dmg(__u16 capa)
+{
+       if (capa & WLAN_CAPABILITY_ESS)
+               printf(" ESS");
+       if (capa & WLAN_CAPABILITY_IBSS)
+               printf(" IBSS");
+       if (capa & WLAN_CAPABILITY_CF_POLLABLE)
+               printf(" CfPollable");
+       if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
+               printf(" CfPollReq");
+       if (capa & WLAN_CAPABILITY_PRIVACY)
+               printf(" Privacy");
+       if (capa & WLAN_CAPABILITY_SHORT_PREAMBLE)
+               printf(" ShortPreamble");
+       if (capa & WLAN_CAPABILITY_PBCC)
+               printf(" PBCC");
+       if (capa & WLAN_CAPABILITY_CHANNEL_AGILITY)
+               printf(" ChannelAgility");
+       if (capa & WLAN_CAPABILITY_SPECTRUM_MGMT)
+               printf(" SpectrumMgmt");
+       if (capa & WLAN_CAPABILITY_QOS)
+               printf(" QoS");
+       if (capa & WLAN_CAPABILITY_SHORT_SLOT_TIME)
+               printf(" ShortSlotTime");
+       if (capa & WLAN_CAPABILITY_APSD)
+               printf(" APSD");
+       if (capa & WLAN_CAPABILITY_RADIO_MEASURE)
+               printf(" RadioMeasure");
+       if (capa & WLAN_CAPABILITY_DSSS_OFDM)
+               printf(" DSSS-OFDM");
+       if (capa & WLAN_CAPABILITY_DEL_BACK)
+               printf(" DelayedBACK");
+       if (capa & WLAN_CAPABILITY_IMM_BACK)
+               printf(" ImmediateBACK");
+}
+
 static int print_bss_handler(struct nl_msg *msg, void *arg)
 {
        struct nlattr *tb[NL80211_ATTR_MAX + 1];
@@ -620,19 +1861,25 @@ static int print_bss_handler(struct nl_msg *msg, void *arg)
                [NL80211_BSS_INFORMATION_ELEMENTS] = { },
                [NL80211_BSS_SIGNAL_MBM] = { .type = NLA_U32 },
                [NL80211_BSS_SIGNAL_UNSPEC] = { .type = NLA_U8 },
+               [NL80211_BSS_STATUS] = { .type = NLA_U32 },
+               [NL80211_BSS_SEEN_MS_AGO] = { .type = NLA_U32 },
+               [NL80211_BSS_BEACON_IES] = { },
        };
+       struct scan_params *params = arg;
+       int show = params->show_both_ie_sets ? 2 : 1;
+       bool is_dmg = false;
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
                  genlmsg_attrlen(gnlh, 0), NULL);
 
        if (!tb[NL80211_ATTR_BSS]) {
-               fprintf(stderr, "bss info missing!");
+               fprintf(stderr, "bss info missing!\n");
                return NL_SKIP;
        }
        if (nla_parse_nested(bss, NL80211_BSS_MAX,
                             tb[NL80211_ATTR_BSS],
                             bss_policy)) {
-               fprintf(stderr, "failed to parse nested attributes!");
+               fprintf(stderr, "failed to parse nested attributes!\n");
                return NL_SKIP;
        }
 
@@ -640,8 +1887,30 @@ static int print_bss_handler(struct nl_msg *msg, void *arg)
                return NL_SKIP;
 
        mac_addr_n2a(mac_addr, nla_data(bss[NL80211_BSS_BSSID]));
-       if_indextoname(nla_get_u32(tb[NL80211_ATTR_IFINDEX]), dev);
-       printf("BSS %s (on %s)\n", mac_addr, dev);
+       printf("BSS %s", mac_addr);
+       if (tb[NL80211_ATTR_IFINDEX]) {
+               if_indextoname(nla_get_u32(tb[NL80211_ATTR_IFINDEX]), dev);
+               printf("(on %s)", dev);
+       }
+
+       if (bss[NL80211_BSS_STATUS]) {
+               switch (nla_get_u32(bss[NL80211_BSS_STATUS])) {
+               case NL80211_BSS_STATUS_AUTHENTICATED:
+                       printf(" -- authenticated");
+                       break;
+               case NL80211_BSS_STATUS_ASSOCIATED:
+                       printf(" -- associated");
+                       break;
+               case NL80211_BSS_STATUS_IBSS_JOINED:
+                       printf(" -- joined");
+                       break;
+               default:
+                       printf(" -- unknown status: %d",
+                               nla_get_u32(bss[NL80211_BSS_STATUS]));
+                       break;
+               }
+       }
+       printf("\n");
 
        if (bss[NL80211_BSS_TSF]) {
                unsigned long long tsf;
@@ -650,37 +1919,22 @@ static int print_bss_handler(struct nl_msg *msg, void *arg)
                        tsf, tsf/1000/1000/60/60/24, (tsf/1000/1000/60/60) % 24,
                        (tsf/1000/1000/60) % 60, (tsf/1000/1000) % 60);
        }
-       if (bss[NL80211_BSS_FREQUENCY])
-               printf("\tfreq: %d\n",
-                       nla_get_u32(bss[NL80211_BSS_FREQUENCY]));
+       if (bss[NL80211_BSS_FREQUENCY]) {
+               int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
+               printf("\tfreq: %d\n", freq);
+               if (freq > 45000)
+                       is_dmg = true;
+       }
        if (bss[NL80211_BSS_BEACON_INTERVAL])
-               printf("\tbeacon interval: %d\n",
+               printf("\tbeacon interval: %d TUs\n",
                        nla_get_u16(bss[NL80211_BSS_BEACON_INTERVAL]));
        if (bss[NL80211_BSS_CAPABILITY]) {
                __u16 capa = nla_get_u16(bss[NL80211_BSS_CAPABILITY]);
                printf("\tcapability:");
-               if (capa & WLAN_CAPABILITY_ESS)
-                       printf(" ESS");
-               if (capa & WLAN_CAPABILITY_IBSS)
-                       printf(" IBSS");
-               if (capa & WLAN_CAPABILITY_PRIVACY)
-                       printf(" Privacy");
-               if (capa & WLAN_CAPABILITY_SHORT_PREAMBLE)
-                       printf(" ShortPreamble");
-               if (capa & WLAN_CAPABILITY_PBCC)
-                       printf(" PBCC");
-               if (capa & WLAN_CAPABILITY_CHANNEL_AGILITY)
-                       printf(" ChannelAgility");
-               if (capa & WLAN_CAPABILITY_SPECTRUM_MGMT)
-                       printf(" SpectrumMgmt");
-               if (capa & WLAN_CAPABILITY_QOS)
-                       printf(" QoS");
-               if (capa & WLAN_CAPABILITY_SHORT_SLOT_TIME)
-                       printf(" ShortSlotTime");
-               if (capa & WLAN_CAPABILITY_APSD)
-                       printf(" APSD");
-               if (capa & WLAN_CAPABILITY_DSSS_OFDM)
-                       printf(" DSSS-OFDM");
+               if (is_dmg)
+                       print_capa_dmg(capa);
+               else
+                       print_capa_non_dmg(capa);
                printf(" (0x%.4x)\n", capa);
        }
        if (bss[NL80211_BSS_SIGNAL_MBM]) {
@@ -691,10 +1945,25 @@ static int print_bss_handler(struct nl_msg *msg, void *arg)
                unsigned char s = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
                printf("\tsignal: %d/100\n", s);
        }
-       if (bss[NL80211_BSS_INFORMATION_ELEMENTS])
+       if (bss[NL80211_BSS_SEEN_MS_AGO]) {
+               int age = nla_get_u32(bss[NL80211_BSS_SEEN_MS_AGO]);
+               printf("\tlast seen: %d ms ago\n", age);
+       }
+
+       if (bss[NL80211_BSS_INFORMATION_ELEMENTS] && show--) {
+               if (bss[NL80211_BSS_BEACON_IES])
+                       printf("\tInformation elements from Probe Response "
+                              "frame:\n");
                print_ies(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
                          nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
-                         arg);
+                         params->unknown, params->type);
+       }
+       if (bss[NL80211_BSS_BEACON_IES] && show--) {
+               printf("\tInformation elements from Beacon frame:\n");
+               print_ies(nla_data(bss[NL80211_BSS_BEACON_IES]),
+                         nla_len(bss[NL80211_BSS_BEACON_IES]),
+                         params->unknown, params->type);
+       }
 
        return NL_SKIP;
 }
@@ -702,35 +1971,33 @@ static int print_bss_handler(struct nl_msg *msg, void *arg)
 static struct scan_params scan_params;
 
 static int handle_scan_dump(struct nl80211_state *state,
-                           struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        if (argc > 1)
                return 1;
 
-       scan_params.unknown = false;
+       memset(&scan_params, 0, sizeof(scan_params));
+
        if (argc == 1 && !strcmp(argv[0], "-u"))
                scan_params.unknown = true;
+       else if (argc == 1 && !strcmp(argv[0], "-b"))
+               scan_params.show_both_ie_sets = true;
 
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_bss_handler,
+       scan_params.type = PRINT_SCAN;
+
+       register_handler(print_bss_handler,
                  &scan_params);
        return 0;
 }
-COMMAND(scan, dump, "[-u]",
-       NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump);
 
 static int handle_scan_combined(struct nl80211_state *state,
-                               struct nl_cb *cb,
                                struct nl_msg *msg,
-                               int argc, char **argv)
+                               int argc, char **argv,
+                               enum id_input id)
 {
        char **trig_argv;
-/*     static char *trig_argv[] = {
-               NULL,
-               "scan",
-               "trigger",
-       };*/
        static char *dump_argv[] = {
                NULL,
                "scan",
@@ -742,10 +2009,14 @@ static int handle_scan_combined(struct nl80211_state *state,
                NL80211_CMD_SCAN_ABORTED,
        };
        int trig_argc, dump_argc, err;
+       int i;
 
        if (argc >= 3 && !strcmp(argv[2], "-u")) {
                dump_argc = 4;
                dump_argv[3] = "-u";
+       } else if (argc >= 3 && !strcmp(argv[2], "-b")) {
+               dump_argc = 4;
+               dump_argv[3] = "-b";
        } else
                dump_argc = 3;
 
@@ -756,10 +2027,10 @@ static int handle_scan_combined(struct nl80211_state *state,
        trig_argv[0] = argv[0];
        trig_argv[1] = "scan";
        trig_argv[2] = "trigger";
-       int i;
+
        for (i = 0; i < argc - 2 - (dump_argc - 3); i++)
                trig_argv[i + 3] = argv[i + 2 + (dump_argc - 3)];
-       err = handle_cmd(state, II_NETDEV, trig_argc, trig_argv);
+       err = handle_cmd(state, id, trig_argc, trig_argv);
        free(trig_argv);
        if (err)
                return err;
@@ -795,6 +2066,48 @@ static int handle_scan_combined(struct nl80211_state *state,
        }
 
        dump_argv[0] = argv[0];
-       return handle_cmd(state, II_NETDEV, dump_argc, dump_argv);
+       return handle_cmd(state, id, dump_argc, dump_argv);
+}
+TOPLEVEL(scan, "[-u] [freq <freq>*] [ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]", 0, 0,
+        CIB_NETDEV, handle_scan_combined,
+        "Scan on the given frequencies and probe for the given SSIDs\n"
+        "(or wildcard if not given) unless passive scanning is requested.\n"
+        "If -u is specified print unknown data in the scan results.\n"
+        "Specified (vendor) IEs must be well-formed.");
+COMMAND(scan, dump, "[-u]",
+       NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
+       "Dump the current scan results. If -u is specified, print unknown\n"
+       "data in scan results.");
+COMMAND(scan, trigger, "[freq <freq>*] [ies <hex as 00:11:..>] [meshid <meshid>] [lowpri,flush,ap-force] [randomise[=<addr>/<mask>]] [ssid <ssid>*|passive]",
+       NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
+        "Trigger a scan on the given frequencies with probing for the given\n"
+        "SSIDs (or wildcard if not given) unless passive scanning is requested.");
+
+
+static int handle_start_sched_scan(struct nl80211_state *state,
+                                  struct nl_msg *msg,
+                                  int argc, char **argv, enum id_input id)
+{
+       return parse_sched_scan(msg, &argc, &argv);
+}
+
+static int handle_stop_sched_scan(struct nl80211_state *state,
+                                 struct nl_msg *msg, int argc, char **argv,
+                                 enum id_input id)
+{
+       if (argc != 0)
+               return 1;
+
+       return 0;
 }
-TOPLEVEL(scan, "[-u] [freq <freq>*] [ssid <ssid>*|passive]", 0, 0, CIB_NETDEV, handle_scan_combined);
+
+COMMAND(scan, sched_start,
+       SCHED_SCAN_OPTIONS,
+       NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
+       "Start a scheduled scan at the specified interval on the given frequencies\n"
+       "with probing for the given SSIDs (or wildcard if not given) unless passive\n"
+       "scanning is requested.  If matches are specified, only matching results\n"
+       "will be returned.");
+COMMAND(scan, sched_stop, "",
+       NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
+       "Stop an ongoing scheduled scan.");