tests: Long P2P_LISTEN and offchannel TX
[mech_eap.git] / wlantest / wlantest_cli.c
index df96bd3..ad5a48d 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * wlantest controller
- * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2010-2013, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "utils/includes.h"
@@ -176,7 +170,7 @@ static char ** get_bssid_list(int s)
        if (bssid == NULL)
                return NULL;
 
-       res = os_zalloc((len / ETH_ALEN + 1) * sizeof(char *));
+       res = os_calloc(len / ETH_ALEN + 1, sizeof(char *));
        if (res == NULL)
                return NULL;
        for (i = 0; i < len / ETH_ALEN; i++) {
@@ -214,7 +208,7 @@ static char ** get_sta_list(int s, const u8 *bssid, int add_bcast)
        if (addr == NULL)
                return NULL;
 
-       res = os_zalloc((len / ETH_ALEN + 1 + add_bcast) * sizeof(char *));
+       res = os_calloc(len / ETH_ALEN + 1 + add_bcast, sizeof(char *));
        if (res == NULL)
                return NULL;
        for (i = 0; i < len / ETH_ALEN; i++) {
@@ -430,6 +424,81 @@ static char ** complete_clear_bss_counters(int s, const char *str, int pos)
 }
 
 
+static int cmd_clear_tdls_counters(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *pos;
+       int rlen;
+
+       if (argc < 3) {
+               printf("clear_tdls_counters needs three arguments: BSSID, "
+                      "STA1 address, STA2 address\n");
+               return -1;
+       }
+
+       pos = buf;
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_CLEAR_TDLS_COUNTERS);
+       pos += 4;
+       WPA_PUT_BE32(pos, WLANTEST_ATTR_BSSID);
+       pos += 4;
+       WPA_PUT_BE32(pos, ETH_ALEN);
+       pos += 4;
+       if (hwaddr_aton(argv[0], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[0]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       WPA_PUT_BE32(pos, WLANTEST_ATTR_STA_ADDR);
+       pos += 4;
+       WPA_PUT_BE32(pos, ETH_ALEN);
+       pos += 4;
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid STA1 address '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       WPA_PUT_BE32(pos, WLANTEST_ATTR_STA2_ADDR);
+       pos += 4;
+       WPA_PUT_BE32(pos, ETH_ALEN);
+       pos += 4;
+       if (hwaddr_aton(argv[2], pos) < 0) {
+               printf("Invalid STA2 address '%s'\n", argv[2]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+       printf("OK\n");
+       return 0;
+}
+
+
+static char ** complete_clear_tdls_counters(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+       u8 addr[ETH_ALEN];
+
+       switch (arg) {
+       case 1:
+               res = get_bssid_list(s);
+               break;
+       case 2:
+       case 3:
+               if (hwaddr_aton(&str[get_prev_arg_pos(str, pos)], addr) < 0)
+                       break;
+               res = get_sta_list(s, addr, 0);
+               break;
+       }
+
+       return res;
+}
+
+
 struct sta_counters {
        const char *name;
        enum wlantest_sta_counter num;
@@ -462,6 +531,25 @@ static const struct sta_counters sta_counters[] = {
        { "invalid_saqueryresp_rx",
          WLANTEST_STA_COUNTER_INVALID_SAQUERYRESP_RX },
        { "ping_ok", WLANTEST_STA_COUNTER_PING_OK },
+       { "assocresp_comeback", WLANTEST_STA_COUNTER_ASSOCRESP_COMEBACK },
+       { "reassocresp_comeback", WLANTEST_STA_COUNTER_REASSOCRESP_COMEBACK },
+       { "ping_ok_first_assoc", WLANTEST_STA_COUNTER_PING_OK_FIRST_ASSOC },
+       { "valid_deauth_rx_ack", WLANTEST_STA_COUNTER_VALID_DEAUTH_RX_ACK },
+       { "valid_disassoc_rx_ack",
+         WLANTEST_STA_COUNTER_VALID_DISASSOC_RX_ACK },
+       { "invalid_deauth_rx_ack",
+         WLANTEST_STA_COUNTER_INVALID_DEAUTH_RX_ACK },
+       { "invalid_disassoc_rx_ack",
+         WLANTEST_STA_COUNTER_INVALID_DISASSOC_RX_ACK },
+       { "deauth_rx_asleep", WLANTEST_STA_COUNTER_DEAUTH_RX_ASLEEP },
+       { "deauth_rx_awake", WLANTEST_STA_COUNTER_DEAUTH_RX_AWAKE },
+       { "disassoc_rx_asleep", WLANTEST_STA_COUNTER_DISASSOC_RX_ASLEEP },
+       { "disassoc_rx_awake", WLANTEST_STA_COUNTER_DISASSOC_RX_AWAKE },
+       { "prot_data_tx", WLANTEST_STA_COUNTER_PROT_DATA_TX },
+       { "deauth_rx_rc6", WLANTEST_STA_COUNTER_DEAUTH_RX_RC6 },
+       { "deauth_rx_rc7", WLANTEST_STA_COUNTER_DEAUTH_RX_RC7 },
+       { "disassoc_rx_rc6", WLANTEST_STA_COUNTER_DISASSOC_RX_RC6 },
+       { "disassoc_rx_rc7", WLANTEST_STA_COUNTER_DISASSOC_RX_RC7 },
        { NULL, 0 }
 };
 
@@ -534,8 +622,8 @@ static char ** complete_get_sta_counter(int s, const char *str, int pos)
        switch (arg) {
        case 1:
                /* counter list */
-               count = sizeof(sta_counters) / sizeof(sta_counters[0]);
-               res = os_zalloc(count * sizeof(char *));
+               count = ARRAY_SIZE(sta_counters);
+               res = os_calloc(count, sizeof(char *));
                if (res == NULL)
                        return NULL;
                for (i = 0; sta_counters[i].name; i++) {
@@ -567,6 +655,9 @@ static const struct bss_counters bss_counters[] = {
        { "valid_bip_mmie", WLANTEST_BSS_COUNTER_VALID_BIP_MMIE },
        { "invalid_bip_mmie", WLANTEST_BSS_COUNTER_INVALID_BIP_MMIE },
        { "missing_bip_mmie", WLANTEST_BSS_COUNTER_MISSING_BIP_MMIE },
+       { "bip_deauth", WLANTEST_BSS_COUNTER_BIP_DEAUTH },
+       { "bip_disassoc", WLANTEST_BSS_COUNTER_BIP_DISASSOC },
+       { "probe_response", WLANTEST_BSS_COUNTER_PROBE_RESPONSE },
        { NULL, 0 }
 };
 
@@ -578,7 +669,7 @@ static int cmd_get_bss_counter(int s, int argc, char *argv[])
        size_t len;
 
        if (argc != 2) {
-               printf("get_bss_counter needs at three arguments: "
+               printf("get_bss_counter needs at two arguments: "
                       "counter name and BSSID\n");
                return -1;
        }
@@ -631,8 +722,8 @@ static char ** complete_get_bss_counter(int s, const char *str, int pos)
        switch (arg) {
        case 1:
                /* counter list */
-               count = sizeof(bss_counters) / sizeof(bss_counters[0]);
-               res = os_zalloc(count * sizeof(char *));
+               count = ARRAY_SIZE(bss_counters);
+               res = os_calloc(count, sizeof(char *));
                if (res == NULL)
                        return NULL;
                for (i = 0; bss_counters[i].name; i++) {
@@ -650,6 +741,132 @@ static char ** complete_get_bss_counter(int s, const char *str, int pos)
 }
 
 
+static int cmd_relog(int s, int argc, char *argv[])
+{
+       return cmd_simple(s, WLANTEST_CTRL_RELOG);
+}
+
+
+struct tdls_counters {
+       const char *name;
+       enum wlantest_tdls_counter num;
+};
+
+static const struct tdls_counters tdls_counters[] = {
+       { "valid_direct_link", WLANTEST_TDLS_COUNTER_VALID_DIRECT_LINK },
+       { "invalid_direct_link", WLANTEST_TDLS_COUNTER_INVALID_DIRECT_LINK },
+       { "valid_ap_path", WLANTEST_TDLS_COUNTER_VALID_AP_PATH },
+       { "invalid_ap_path", WLANTEST_TDLS_COUNTER_INVALID_AP_PATH },
+       { "setup_req", WLANTEST_TDLS_COUNTER_SETUP_REQ },
+       { "setup_resp_ok", WLANTEST_TDLS_COUNTER_SETUP_RESP_OK },
+       { "setup_resp_fail", WLANTEST_TDLS_COUNTER_SETUP_RESP_FAIL },
+       { "setup_conf_ok", WLANTEST_TDLS_COUNTER_SETUP_CONF_OK },
+       { "setup_conf_fail", WLANTEST_TDLS_COUNTER_SETUP_CONF_FAIL },
+       { "teardown", WLANTEST_TDLS_COUNTER_TEARDOWN },
+       { NULL, 0 }
+};
+
+static int cmd_get_tdls_counter(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *end, *pos;
+       int rlen, i;
+       size_t len;
+
+       if (argc != 4) {
+               printf("get_tdls_counter needs four arguments: "
+                      "counter name, BSSID, STA1 address, STA2 address\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_GET_TDLS_COUNTER);
+       pos += 4;
+
+       for (i = 0; tdls_counters[i].name; i++) {
+               if (os_strcasecmp(tdls_counters[i].name, argv[0]) == 0)
+                       break;
+       }
+       if (tdls_counters[i].name == NULL) {
+               printf("Unknown TDLS counter '%s'\n", argv[0]);
+               printf("Counters:");
+               for (i = 0; tdls_counters[i].name; i++)
+                       printf(" %s", tdls_counters[i].name);
+               printf("\n");
+               return -1;
+       }
+
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_TDLS_COUNTER,
+                           tdls_counters[i].num);
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_STA_ADDR, ETH_ALEN);
+       if (hwaddr_aton(argv[2], pos) < 0) {
+               printf("Invalid STA1 address '%s'\n", argv[2]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_STA2_ADDR, ETH_ALEN);
+       if (hwaddr_aton(argv[3], pos) < 0) {
+               printf("Invalid STA2 address '%s'\n", argv[3]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+
+       pos = attr_get(resp + 4, rlen - 4, WLANTEST_ATTR_COUNTER, &len);
+       if (pos == NULL || len != 4)
+               return -1;
+       printf("%u\n", WPA_GET_BE32(pos));
+       return 0;
+}
+
+
+static char ** complete_get_tdls_counter(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+       int i, count;
+       u8 addr[ETH_ALEN];
+
+       switch (arg) {
+       case 1:
+               /* counter list */
+               count = ARRAY_SIZE(tdls_counters);
+               res = os_calloc(count, sizeof(char *));
+               if (res == NULL)
+                       return NULL;
+               for (i = 0; tdls_counters[i].name; i++) {
+                       res[i] = os_strdup(tdls_counters[i].name);
+                       if (res[i] == NULL)
+                               break;
+               }
+               break;
+       case 2:
+               res = get_bssid_list(s);
+               break;
+       case 3:
+       case 4:
+               if (hwaddr_aton(&str[get_prev_arg_pos(str, pos)], addr) < 0)
+                       break;
+               res = get_sta_list(s, addr, 0);
+               break;
+       }
+
+       return res;
+}
+
+
 struct inject_frames {
        const char *name;
        enum wlantest_inject_frame frame;
@@ -761,8 +978,8 @@ static char ** complete_inject(int s, const char *str, int pos)
        switch (arg) {
        case 1:
                /* frame list */
-               count = sizeof(inject_frames) / sizeof(inject_frames[0]);
-               res = os_zalloc(count * sizeof(char *));
+               count = ARRAY_SIZE(inject_frames);
+               res = os_calloc(count, sizeof(char *));
                if (res == NULL)
                        break;
                for (i = 0; inject_frames[i].name; i++) {
@@ -772,7 +989,7 @@ static char ** complete_inject(int s, const char *str, int pos)
                }
                break;
        case 2:
-               res = os_zalloc(5 * sizeof(char *));
+               res = os_calloc(5, sizeof(char *));
                if (res == NULL)
                        break;
                res[0] = os_strdup("normal");
@@ -789,7 +1006,7 @@ static char ** complete_inject(int s, const char *str, int pos)
                        break;
                break;
        case 3:
-               res = os_zalloc(3 * sizeof(char *));
+               res = os_calloc(3, sizeof(char *));
                if (res == NULL)
                        break;
                res[0] = os_strdup("ap");
@@ -813,6 +1030,127 @@ static char ** complete_inject(int s, const char *str, int pos)
 }
 
 
+static u8 * add_hex(u8 *pos, u8 *end, const char *str)
+{
+       const char *s;
+       int val;
+
+       s = str;
+       while (*s) {
+               while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n' ||
+                      *s == ':')
+                       s++;
+               if (*s == '\0')
+                       break;
+               if (*s == '#') {
+                       while (*s != '\0' && *s != '\r' && *s != '\n')
+                               s++;
+                       continue;
+               }
+
+               val = hex2byte(s);
+               if (val < 0) {
+                       printf("Invalid hex encoding '%s'\n", s);
+                       return NULL;
+               }
+               if (pos == end) {
+                       printf("Too long frame\n");
+                       return NULL;
+               }
+               *pos++ = val;
+               s += 2;
+       }
+
+       return pos;
+}
+
+
+static int cmd_send(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[WLANTEST_CTRL_MAX_CMD_LEN], *end, *pos, *len_pos;
+       int rlen;
+       enum wlantest_inject_protection prot;
+       int arg;
+
+       /* <prot> <raw frame as hex dump> */
+
+       if (argc < 2) {
+               printf("send needs two arguments: protected/unprotected, "
+                      "raw frame as hex dump\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_SEND);
+       pos += 4;
+
+       if (os_strcasecmp(argv[0], "normal") == 0)
+               prot = WLANTEST_INJECT_NORMAL;
+       else if (os_strcasecmp(argv[0], "protected") == 0)
+               prot = WLANTEST_INJECT_PROTECTED;
+       else if (os_strcasecmp(argv[0], "unprotected") == 0)
+               prot = WLANTEST_INJECT_UNPROTECTED;
+       else if (os_strcasecmp(argv[0], "incorrect") == 0)
+               prot = WLANTEST_INJECT_INCORRECT_KEY;
+       else {
+               printf("Unknown protection type '%s'\n", argv[1]);
+               printf("Protection types: normal protected unprotected "
+                      "incorrect\n");
+               return -1;
+       }
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_INJECT_PROTECTION, prot);
+
+       WPA_PUT_BE32(pos, WLANTEST_ATTR_FRAME);
+       pos += 4;
+       len_pos = pos;
+       pos += 4;
+
+       for (arg = 1; pos && arg < argc; arg++)
+               pos = add_hex(pos, end, argv[arg]);
+       if (pos == NULL)
+               return -1;
+
+       WPA_PUT_BE32(len_pos, pos - len_pos - 4);
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+       printf("OK\n");
+       return 0;
+}
+
+
+static char ** complete_send(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+
+       switch (arg) {
+       case 1:
+               res = os_calloc(5, sizeof(char *));
+               if (res == NULL)
+                       break;
+               res[0] = os_strdup("normal");
+               if (res[0] == NULL)
+                       break;
+               res[1] = os_strdup("protected");
+               if (res[1] == NULL)
+                       break;
+               res[2] = os_strdup("unprotected");
+               if (res[2] == NULL)
+                       break;
+               res[3] = os_strdup("incorrect");
+               if (res[3] == NULL)
+                       break;
+               break;
+       }
+
+       return res;
+}
+
+
 static int cmd_version(int s, int argc, char *argv[])
 {
        u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
@@ -878,36 +1216,413 @@ static int cmd_add_passphrase(int s, int argc, char *argv[])
 }
 
 
-struct wlantest_cli_cmd {
-       const char *cmd;
-       int (*handler)(int s, int argc, char *argv[]);
-       const char *usage;
-       char ** (*complete)(int s, const char *str, int pos);
-};
+static int cmd_add_wepkey(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *pos, *end;
+       int rlen;
 
-static const struct wlantest_cli_cmd wlantest_cli_commands[] = {
-       { "ping", cmd_ping, "= test connection to wlantest", NULL },
-       { "terminate", cmd_terminate, "= terminate wlantest", NULL },
-       { "list_bss", cmd_list_bss, "= get BSS list", NULL },
-       { "list_sta", cmd_list_sta, "<BSSID> = get STA list",
-         complete_list_sta },
-       { "flush", cmd_flush, "= drop all collected BSS data", NULL },
+       if (argc < 1) {
+               printf("add_wepkey needs one argument: WEP key\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_ADD_PASSPHRASE);
+       pos += 4;
+       pos = attr_add_str(pos, end, WLANTEST_ATTR_WEPKEY, argv[0]);
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+       return 0;
+}
+
+
+struct sta_infos {
+       const char *name;
+       enum wlantest_sta_info num;
+};
+
+static const struct sta_infos sta_infos[] = {
+       { "proto", WLANTEST_STA_INFO_PROTO },
+       { "pairwise", WLANTEST_STA_INFO_PAIRWISE },
+       { "key_mgmt", WLANTEST_STA_INFO_KEY_MGMT },
+       { "rsn_capab", WLANTEST_STA_INFO_RSN_CAPAB },
+       { "state", WLANTEST_STA_INFO_STATE },
+       { "gtk", WLANTEST_STA_INFO_GTK },
+       { NULL, 0 }
+};
+
+static int cmd_info_sta(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *end, *pos;
+       int rlen, i;
+       size_t len;
+       char info[100];
+
+       if (argc != 3) {
+               printf("sta_info needs at three arguments: "
+                      "counter name, BSSID, and STA address\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_INFO_STA);
+       pos += 4;
+
+       for (i = 0; sta_infos[i].name; i++) {
+               if (os_strcasecmp(sta_infos[i].name, argv[0]) == 0)
+                       break;
+       }
+       if (sta_infos[i].name == NULL) {
+               printf("Unknown STA info '%s'\n", argv[0]);
+               printf("Info fields:");
+               for (i = 0; sta_infos[i].name; i++)
+                       printf(" %s", sta_infos[i].name);
+               printf("\n");
+               return -1;
+       }
+
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_STA_INFO,
+                           sta_infos[i].num);
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_STA_ADDR, ETH_ALEN);
+       if (hwaddr_aton(argv[2], pos) < 0) {
+               printf("Invalid STA address '%s'\n", argv[2]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+
+       pos = attr_get(resp + 4, rlen - 4, WLANTEST_ATTR_INFO, &len);
+       if (pos == NULL)
+               return -1;
+       if (len >= sizeof(info))
+               len = sizeof(info) - 1;
+       os_memcpy(info, pos, len);
+       info[len] = '\0';
+       printf("%s\n", info);
+       return 0;
+}
+
+
+static char ** complete_info_sta(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+       int i, count;
+       u8 addr[ETH_ALEN];
+
+       switch (arg) {
+       case 1:
+               /* counter list */
+               count = ARRAY_SIZE(sta_infos);
+               res = os_calloc(count, sizeof(char *));
+               if (res == NULL)
+                       return NULL;
+               for (i = 0; sta_infos[i].name; i++) {
+                       res[i] = os_strdup(sta_infos[i].name);
+                       if (res[i] == NULL)
+                               break;
+               }
+               break;
+       case 2:
+               res = get_bssid_list(s);
+               break;
+       case 3:
+               if (hwaddr_aton(&str[get_prev_arg_pos(str, pos)], addr) < 0)
+                       break;
+               res = get_sta_list(s, addr, 0);
+               break;
+       }
+
+       return res;
+}
+
+
+struct bss_infos {
+       const char *name;
+       enum wlantest_bss_info num;
+};
+
+static const struct bss_infos bss_infos[] = {
+       { "proto", WLANTEST_BSS_INFO_PROTO },
+       { "pairwise", WLANTEST_BSS_INFO_PAIRWISE },
+       { "group", WLANTEST_BSS_INFO_GROUP },
+       { "group_mgmt", WLANTEST_BSS_INFO_GROUP_MGMT },
+       { "key_mgmt", WLANTEST_BSS_INFO_KEY_MGMT },
+       { "rsn_capab", WLANTEST_BSS_INFO_RSN_CAPAB },
+       { NULL, 0 }
+};
+
+static int cmd_info_bss(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *end, *pos;
+       int rlen, i;
+       size_t len;
+       char info[100];
+
+       if (argc != 2) {
+               printf("bss_info needs at two arguments: "
+                      "field name and BSSID\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_INFO_BSS);
+       pos += 4;
+
+       for (i = 0; bss_infos[i].name; i++) {
+               if (os_strcasecmp(bss_infos[i].name, argv[0]) == 0)
+                       break;
+       }
+       if (bss_infos[i].name == NULL) {
+               printf("Unknown BSS info '%s'\n", argv[0]);
+               printf("Info fields:");
+               for (i = 0; bss_infos[i].name; i++)
+                       printf(" %s", bss_infos[i].name);
+               printf("\n");
+               return -1;
+       }
+
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_BSS_INFO,
+                           bss_infos[i].num);
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+
+       pos = attr_get(resp + 4, rlen - 4, WLANTEST_ATTR_INFO, &len);
+       if (pos == NULL)
+               return -1;
+       if (len >= sizeof(info))
+               len = sizeof(info) - 1;
+       os_memcpy(info, pos, len);
+       info[len] = '\0';
+       printf("%s\n", info);
+       return 0;
+}
+
+
+static char ** complete_info_bss(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+       int i, count;
+
+       switch (arg) {
+       case 1:
+               /* counter list */
+               count = ARRAY_SIZE(bss_infos);
+               res = os_calloc(count, sizeof(char *));
+               if (res == NULL)
+                       return NULL;
+               for (i = 0; bss_infos[i].name; i++) {
+                       res[i] = os_strdup(bss_infos[i].name);
+                       if (res[i] == NULL)
+                               break;
+               }
+               break;
+       case 2:
+               res = get_bssid_list(s);
+               break;
+       }
+
+       return res;
+}
+
+
+static int cmd_get_tx_tid(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *end, *pos;
+       int rlen;
+       size_t len;
+
+       if (argc != 3) {
+               printf("get_tx_tid needs three arguments: "
+                      "BSSID, STA address, and TID\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_GET_TX_TID);
+       pos += 4;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+       if (hwaddr_aton(argv[0], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[0]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_STA_ADDR, ETH_ALEN);
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid STA address '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_TID, atoi(argv[2]));
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+
+       pos = attr_get(resp + 4, rlen - 4, WLANTEST_ATTR_COUNTER, &len);
+       if (pos == NULL || len != 4)
+               return -1;
+       printf("%u\n", WPA_GET_BE32(pos));
+       return 0;
+}
+
+
+static int cmd_get_rx_tid(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *end, *pos;
+       int rlen;
+       size_t len;
+
+       if (argc != 3) {
+               printf("get_tx_tid needs three arguments: "
+                      "BSSID, STA address, and TID\n");
+               return -1;
+       }
+
+       pos = buf;
+       end = buf + sizeof(buf);
+       WPA_PUT_BE32(pos, WLANTEST_CTRL_GET_RX_TID);
+       pos += 4;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+       if (hwaddr_aton(argv[0], pos) < 0) {
+               printf("Invalid BSSID '%s'\n", argv[0]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_hdr_add(pos, end, WLANTEST_ATTR_STA_ADDR, ETH_ALEN);
+       if (hwaddr_aton(argv[1], pos) < 0) {
+               printf("Invalid STA address '%s'\n", argv[1]);
+               return -1;
+       }
+       pos += ETH_ALEN;
+
+       pos = attr_add_be32(pos, end, WLANTEST_ATTR_TID, atoi(argv[2]));
+
+       rlen = cmd_send_and_recv(s, buf, pos - buf, resp, sizeof(resp));
+       if (rlen < 0)
+               return -1;
+
+       pos = attr_get(resp + 4, rlen - 4, WLANTEST_ATTR_COUNTER, &len);
+       if (pos == NULL || len != 4)
+               return -1;
+       printf("%u\n", WPA_GET_BE32(pos));
+       return 0;
+}
+
+
+static char ** complete_get_tid(int s, const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       char **res = NULL;
+       u8 addr[ETH_ALEN];
+
+       switch (arg) {
+       case 1:
+               res = get_bssid_list(s);
+               break;
+       case 2:
+               if (hwaddr_aton(&str[get_prev_arg_pos(str, pos)], addr) < 0)
+                       break;
+               res = get_sta_list(s, addr, 0);
+               break;
+       }
+
+       return res;
+}
+
+
+struct wlantest_cli_cmd {
+       const char *cmd;
+       int (*handler)(int s, int argc, char *argv[]);
+       const char *usage;
+       char ** (*complete)(int s, const char *str, int pos);
+};
+
+static const struct wlantest_cli_cmd wlantest_cli_commands[] = {
+       { "ping", cmd_ping, "= test connection to wlantest", NULL },
+       { "terminate", cmd_terminate, "= terminate wlantest", NULL },
+       { "list_bss", cmd_list_bss, "= get BSS list", NULL },
+       { "list_sta", cmd_list_sta, "<BSSID> = get STA list",
+         complete_list_sta },
+       { "flush", cmd_flush, "= drop all collected BSS data", NULL },
        { "clear_sta_counters", cmd_clear_sta_counters,
          "<BSSID> <STA> = clear STA counters", complete_clear_sta_counters },
        { "clear_bss_counters", cmd_clear_bss_counters,
          "<BSSID> = clear BSS counters", complete_clear_bss_counters },
        { "get_sta_counter", cmd_get_sta_counter,
          "<counter> <BSSID> <STA> = get STA counter value",
-         complete_get_sta_counter},
+         complete_get_sta_counter },
        { "get_bss_counter", cmd_get_bss_counter,
          "<counter> <BSSID> = get BSS counter value",
          complete_get_bss_counter },
        { "inject", cmd_inject,
          "<frame> <prot> <sender> <BSSID> <STA/ff:ff:ff:ff:ff:ff>",
          complete_inject },
+       { "send", cmd_send,
+         "<prot> <raw frame as hex dump>",
+         complete_send },
        { "version", cmd_version, "= get wlantest version", NULL },
        { "add_passphrase", cmd_add_passphrase,
          "<passphrase> = add a known passphrase", NULL },
+       { "add_wepkey", cmd_add_wepkey,
+         "<WEP key> = add a known WEP key", NULL },
+       { "info_sta", cmd_info_sta,
+         "<field> <BSSID> <STA> = get STA information",
+         complete_info_sta },
+       { "info_bss", cmd_info_bss,
+         "<field> <BSSID> = get BSS information",
+         complete_info_bss },
+       { "clear_tdls_counters", cmd_clear_tdls_counters,
+         "<BSSID> <STA1> <STA2> = clear TDLS counters",
+         complete_clear_tdls_counters },
+       { "get_tdls_counter", cmd_get_tdls_counter,
+         "<counter> <BSSID> <STA1> <STA2> = get TDLS counter value",
+         complete_get_tdls_counter },
+       { "get_bss_counter", cmd_get_bss_counter,
+         "<counter> <BSSID> = get BSS counter value",
+         complete_get_bss_counter },
+       { "relog", cmd_relog, "= re-open log-file (allow rolling logs)", NULL },
+       { "get_tx_tid", cmd_get_tx_tid,
+         "<BSSID> <STA> <TID> = get STA TX TID counter value",
+         complete_get_tid },
+       { "get_rx_tid", cmd_get_rx_tid,
+         "<BSSID> <STA> <TID> = get STA RX TID counter value",
+         complete_get_tid },
        { NULL, NULL, NULL, NULL }
 };
 
@@ -1018,11 +1733,9 @@ static void wlantest_cli_edit_eof_cb(void *ctx)
 static char ** wlantest_cli_cmd_list(void)
 {
        char **res;
-       int i, count;
+       int i;
 
-       count = sizeof(wlantest_cli_commands) /
-               sizeof(wlantest_cli_commands[0]);
-       res = os_zalloc(count * sizeof(char *));
+       res = os_calloc(ARRAY_SIZE(wlantest_cli_commands), sizeof(char *));
        if (res == NULL)
                return NULL;
 
@@ -1084,18 +1797,29 @@ static char ** wlantest_cli_edit_completion_cb(void *ctx, const char *str,
 static void wlantest_cli_interactive(int s)
 {
        struct wlantest_cli cli;
+       char *home, *hfile = NULL;
 
        if (eloop_init())
                return;
 
+       home = getenv("HOME");
+       if (home) {
+               const char *fname = ".wlantest_cli_history";
+               int hfile_len = os_strlen(home) + 1 + os_strlen(fname) + 1;
+               hfile = os_malloc(hfile_len);
+               if (hfile)
+                       os_snprintf(hfile, hfile_len, "%s/%s", home, fname);
+       }
+
        cli.s = s;
        eloop_register_signal_terminate(wlantest_cli_eloop_terminate, &cli);
-       edit_init(wlantest_cli_edit_cmd_cb, wlantest_cli_edit_eof_cb, &cli);
-       edit_set_completion_cb(wlantest_cli_edit_completion_cb);
+       edit_init(wlantest_cli_edit_cmd_cb, wlantest_cli_edit_eof_cb,
+                 wlantest_cli_edit_completion_cb, &cli, hfile, NULL);
 
        eloop_run();
 
-       edit_deinit();
+       edit_deinit(hfile, NULL);
+       os_free(hfile);
        eloop_destroy();
 }