wlantest: Add add_passphrase command

This can be used to add a new known passphrase without having to
restart wlantest.

diff --git a/wlantest/ctrl.c b/wlantest/ctrl.c
index e2cd2835ae41a1886fac74fb4c16c167003222a0..156b0000ff27367804cd21c523d8eb6622632dd0 100644 (file)
--- a/wlantest/ctrl.c
+++ b/wlantest/ctrl.c
@@ -686,6 +686,53 @@ static void ctrl_version(struct wlantest *wt, int sock)
 }
 
 
+static void ctrl_add_passphrase(struct wlantest *wt, int sock, u8 *cmd,
+                               size_t clen)
+{
+       u8 *passphrase;
+       size_t len;
+       struct wlantest_passphrase *p, *pa;
+       u8 *bssid;
+
+       passphrase = attr_get(cmd, clen, WLANTEST_ATTR_PASSPHRASE, &len);
+       if (passphrase == NULL || len < 8 || len > 63) {
+               ctrl_send_simple(wt, sock, WLANTEST_CTRL_INVALID_CMD);
+               return;
+       }
+
+       p = os_zalloc(sizeof(*p));
+       if (p == NULL) {
+               ctrl_send_simple(wt, sock, WLANTEST_CTRL_FAILURE);
+               return;
+       }
+       os_memcpy(p->passphrase, passphrase, len);
+       wpa_printf(MSG_INFO, "Add passphrase '%s'", p->passphrase);
+
+       bssid = attr_get_macaddr(cmd, clen, WLANTEST_ATTR_BSSID);
+       if (bssid) {
+               os_memcpy(p->bssid, bssid, ETH_ALEN);
+               wpa_printf(MSG_INFO, "Limit passphrase for BSSID " MACSTR,
+                          MAC2STR(p->bssid));
+       }
+
+       dl_list_for_each(pa, &wt->passphrase, struct wlantest_passphrase, list)
+       {
+               if (os_strcmp(p->passphrase, pa->passphrase) == 0 &&
+                   os_memcmp(p->bssid, pa->bssid, ETH_ALEN) == 0) {
+                       wpa_printf(MSG_INFO, "Passphrase was already known");
+                       os_free(p);
+                       p = NULL;
+                       break;
+               }
+       }
+
+       if (p)
+               dl_list_add(&wt->passphrase, &p->list);
+
+       ctrl_send_simple(wt, sock, WLANTEST_CTRL_SUCCESS);
+}
+
+
 static void ctrl_read(int sock, void *eloop_ctx, void *sock_ctx)
 {
        struct wlantest *wt = eloop_ctx;
@@ -751,6 +798,9 @@ static void ctrl_read(int sock, void *eloop_ctx, void *sock_ctx)
        case WLANTEST_CTRL_VERSION:
                ctrl_version(wt, sock);
                break;
+       case WLANTEST_CTRL_ADD_PASSPHRASE:
+               ctrl_add_passphrase(wt, sock, buf + 4, len - 4);
+               break;
        default:
                ctrl_send_simple(wt, sock, WLANTEST_CTRL_UNKNOWN_CMD);
                break;

diff --git a/wlantest/wlantest_cli.c b/wlantest/wlantest_cli.c
index 3aa783b3e8636167825a5b11b45024d8ee166969..39ec8dba4704632feee7aea54774f664e9e7bd2c 100644 (file)
--- a/wlantest/wlantest_cli.c
+++ b/wlantest/wlantest_cli.c
@@ -59,6 +59,23 @@ static u8 * attr_hdr_add(u8 *pos, u8 *end, enum wlantest_ctrl_attr attr,
 }
 
 
+static u8 * attr_add_str(u8 *pos, u8 *end, enum wlantest_ctrl_attr attr,
+                        const char *str)
+{
+       size_t len = os_strlen(str);
+
+       if (pos == NULL || end - pos < 8 + len)
+               return NULL;
+       WPA_PUT_BE32(pos, attr);
+       pos += 4;
+       WPA_PUT_BE32(pos, len);
+       pos += 4;
+       os_memcpy(pos, str, len);
+       pos += len;
+       return pos;
+}
+
+
 static u8 * attr_add_be32(u8 *pos, u8 *end, enum wlantest_ctrl_attr attr,
                          u32 val)
 {
@@ -556,6 +573,45 @@ static int cmd_version(int s, int argc, char *argv[])
 }
 
 
+static int cmd_add_passphrase(int s, int argc, char *argv[])
+{
+       u8 resp[WLANTEST_CTRL_MAX_RESP_LEN];
+       u8 buf[100], *pos, *end;
+       size_t len;
+       int rlen;
+
+       if (argc < 1) {
+               printf("add_passphrase needs one argument: passphrase\n");
+               return -1;
+       }
+
+       len = os_strlen(argv[0]);
+       if (len < 8 || len > 63) {
+               printf("Invalid passphrase '%s'\n", argv[0]);
+               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_PASSPHRASE,
+                          argv[0]);
+       if (argc > 1) {
+               pos = attr_hdr_add(pos, end, WLANTEST_ATTR_BSSID, ETH_ALEN);
+               if (hwaddr_aton(argv[1], pos) < 0) {
+                       printf("Invalid BSSID '%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;
+       return 0;
+}
+
+
 struct wlantest_cli_cmd {
        const char *cmd;
        int (*handler)(int s, int argc, char *argv[]);
@@ -579,6 +635,8 @@ static const struct wlantest_cli_cmd wlantest_cli_commands[] = {
        { "inject", cmd_inject,
          "<frame> <prot> <sender> <BSSID> <STA/ff:ff:ff:ff:ff:ff>" },
        { "version", cmd_version, "= get wlantest version" },
+       { "add_passphrase", cmd_add_passphrase,
+         "<passphrase> = add a known passphrase" },
        { NULL, NULL, NULL }
 };
 

diff --git a/wlantest/wlantest_ctrl.h b/wlantest/wlantest_ctrl.h
index e4d571b70be045fc32a4894eb0dbdac2b7d54970..73451c439c7abc2dd37bcd5cf3d089161df5cbee 100644 (file)
--- a/wlantest/wlantest_ctrl.h
+++ b/wlantest/wlantest_ctrl.h
@@ -35,6 +35,7 @@ enum wlantest_ctrl_cmd {
        WLANTEST_CTRL_GET_BSS_COUNTER,
        WLANTEST_CTRL_INJECT,
        WLANTEST_CTRL_VERSION,
+       WLANTEST_CTRL_ADD_PASSPHRASE,
 };
 
 enum wlantest_ctrl_attr {
@@ -47,6 +48,7 @@ enum wlantest_ctrl_attr {
        WLANTEST_ATTR_INJECT_SENDER_AP,
        WLANTEST_ATTR_INJECT_PROTECTION,
        WLANTEST_ATTR_VERSION,
+       WLANTEST_ATTR_PASSPHRASE,
 };
 
 enum wlantest_bss_counter {