iw: move generic sched scan parsing code out of net detect

[thirdparty/iw.git] / event.c

diff --git a/event.c b/event.c
index 2d92249363c166c3a88d1cd2385ddc186729a7b9..71ab7f71f9d5ec51e204ad165f3c8719c52840a4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -80,7 +80,6 @@ static void print_frame(struct print_event_args *args, struct nlattr *attr)
                tmp = (frame[29] << 8) + frame[28];
                printf(" status: %d: %s", tmp, get_status_str(tmp));
                break;
-               break;
        case 0xa0: /* disassoc */
        case 0xc0: /* deauth */
                /* reason */
@@ -201,7 +200,8 @@ static void parse_mic_failure(struct nlattr **attrs)
 
 static void parse_wowlan_wake_event(struct nlattr **attrs)
 {
-       struct nlattr *tb[NUM_NL80211_WOWLAN_TRIG];
+       struct nlattr *tb[NUM_NL80211_WOWLAN_TRIG],
+               *tb_match[NUM_NL80211_ATTR];
 
        printf("WoWLAN wakeup\n");
        if (!attrs[NL80211_ATTR_WOWLAN_TRIGGERS]) {
@@ -228,6 +228,31 @@ static void parse_wowlan_wake_event(struct nlattr **attrs)
                printf("\t* 4-way handshake\n");
        if (tb[NL80211_WOWLAN_TRIG_RFKILL_RELEASE])
                printf("\t* RF-kill released\n");
+       if (tb[NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS]) {
+               struct nlattr *match, *freq;
+               int rem_nst, rem_nst2;
+
+               printf("\t* network detected\n");
+               nla_for_each_nested(match,
+                                   tb[NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS],
+                                   rem_nst) {
+                       nla_parse(tb_match, NUM_NL80211_ATTR, nla_data(match),
+                                 nla_len(match),
+                                 NULL);
+                       printf("\t\tSSID: \"");
+                       print_ssid_escaped(nla_len(tb_match[NL80211_ATTR_SSID]),
+                                          nla_data(tb_match[NL80211_ATTR_SSID]));
+                       printf("\"");
+                       if (tb_match[NL80211_ATTR_SCAN_FREQUENCIES]) {
+                               printf(" freq(s):");
+                               nla_for_each_nested(freq,
+                                                   tb_match[NL80211_ATTR_SCAN_FREQUENCIES],
+                                                   rem_nst2)
+                                       printf(" %d", nla_get_u32(freq));
+                       }
+                       printf("\n");
+               }
+       }
        if (tb[NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211]) {
                uint8_t *d = nla_data(tb[NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211]);
                int l = nla_len(tb[NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211]);
@@ -535,9 +560,39 @@ static int print_event(struct nl_msg *msg, void *arg)
                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]));
+               break;
+       case NL80211_CMD_RADAR_DETECT:
+               printf("radar event ");
+               if (tb[NL80211_ATTR_RADAR_EVENT]) {
+                       switch (nla_get_u32(tb[NL80211_ATTR_RADAR_EVENT])) {
+                               case NL80211_RADAR_DETECTED:
+                                       printf("(radar detected)");
+                                       break;
+                               case NL80211_RADAR_CAC_FINISHED:
+                                       printf("(cac finished)");
+                                       break;
+                               case NL80211_RADAR_CAC_ABORTED:
+                                       printf("(cac aborted)");
+                                       break;
+                               case NL80211_RADAR_NOP_FINISHED:
+                                       printf("(nop finished)");
+                                       break;
+                               default:
+                                       printf("(unknown)");
+                                       break;
+                       };
+               } else {
+                       printf("(unknown)");
+               }
+               printf("\n");
                break;
        default:
-               printf("unknown event %d\n", gnlh->cmd);
+               printf("unknown event %d (%s)\n",
+                      gnlh->cmd, command_name(gnlh->cmd));
                break;
        }