Merge wpa_supplicant and hostapd driver wrapper implementations
[wpasupplicant] / src / drivers / driver_test.c
index 9bd4ff3..700e98d 100644 (file)
@@ -12,7 +12,7 @@
  * See README and COPYING for more details.
  */
 
-/* Make dure we get winsock2.h for Windows build to get sockaddr_storage */
+/* Make sure we get winsock2.h for Windows build to get sockaddr_storage */
 #include "build_config.h"
 #ifdef CONFIG_NATIVE_WINDOWS
 #include <winsock2.h>
 #include "ieee802_11_defs.h"
 
 
+#ifdef HOSTAPD
+
+#include "../../hostapd/hostapd.h"
+#include "../../hostapd/config.h"
+#include "../../hostapd/wpa.h"
+#include "../../hostapd/hw_features.h"
+#include "../../hostapd/wps_hostapd.h"
+
+
+struct test_client_socket {
+       struct test_client_socket *next;
+       u8 addr[ETH_ALEN];
+       struct sockaddr_un un;
+       socklen_t unlen;
+       struct test_driver_bss *bss;
+};
+
+struct test_driver_bss {
+       struct test_driver_bss *next;
+       char ifname[IFNAMSIZ + 1];
+       u8 bssid[ETH_ALEN];
+       u8 *ie;
+       size_t ielen;
+       u8 *wps_beacon_ie;
+       size_t wps_beacon_ie_len;
+       u8 *wps_probe_resp_ie;
+       size_t wps_probe_resp_ie_len;
+       u8 ssid[32];
+       size_t ssid_len;
+       int privacy;
+};
+
+struct test_driver_data {
+       struct hostapd_data *hapd;
+       struct test_client_socket *cli;
+       int test_socket;
+       struct test_driver_bss *bss;
+       char *socket_dir;
+       char *own_socket_path;
+       int udp_port;
+};
+
+
+static void test_driver_free_bss(struct test_driver_bss *bss)
+{
+       free(bss->ie);
+       free(bss->wps_beacon_ie);
+       free(bss->wps_probe_resp_ie);
+       free(bss);
+}
+
+
+static void test_driver_free_priv(struct test_driver_data *drv)
+{
+       struct test_driver_bss *bss, *prev;
+
+       if (drv == NULL)
+               return;
+
+       bss = drv->bss;
+       while (bss) {
+               prev = bss;
+               bss = bss->next;
+               test_driver_free_bss(prev);
+       }
+       free(drv->own_socket_path);
+       free(drv->socket_dir);
+       free(drv);
+}
+
+
+static struct test_client_socket *
+test_driver_get_cli(struct test_driver_data *drv, struct sockaddr_un *from,
+                   socklen_t fromlen)
+{
+       struct test_client_socket *cli = drv->cli;
+
+       while (cli) {
+               if (cli->unlen == fromlen &&
+                   strncmp(cli->un.sun_path, from->sun_path,
+                           fromlen - sizeof(cli->un.sun_family)) == 0)
+                       return cli;
+               cli = cli->next;
+       }
+
+       return NULL;
+}
+
+
+static int test_driver_send_eapol(void *priv, const u8 *addr, const u8 *data,
+                                 size_t data_len, int encrypt,
+                                 const u8 *own_addr)
+{
+       struct test_driver_data *drv = priv;
+       struct test_client_socket *cli;
+       struct msghdr msg;
+       struct iovec io[3];
+       struct l2_ethhdr eth;
+
+       if (drv->test_socket < 0)
+               return -1;
+
+       cli = drv->cli;
+       while (cli) {
+               if (memcmp(cli->addr, addr, ETH_ALEN) == 0)
+                       break;
+               cli = cli->next;
+       }
+
+       if (!cli) {
+               wpa_printf(MSG_DEBUG, "%s: no destination client entry",
+                          __func__);
+               return -1;
+       }
+
+       memcpy(eth.h_dest, addr, ETH_ALEN);
+       memcpy(eth.h_source, own_addr, ETH_ALEN);
+       eth.h_proto = host_to_be16(ETH_P_EAPOL);
+
+       io[0].iov_base = "EAPOL ";
+       io[0].iov_len = 6;
+       io[1].iov_base = &eth;
+       io[1].iov_len = sizeof(eth);
+       io[2].iov_base = (u8 *) data;
+       io[2].iov_len = data_len;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = io;
+       msg.msg_iovlen = 3;
+       msg.msg_name = &cli->un;
+       msg.msg_namelen = cli->unlen;
+       return sendmsg(drv->test_socket, &msg, 0);
+}
+
+
+static int test_driver_send_ether(void *priv, const u8 *dst, const u8 *src,
+                                 u16 proto, const u8 *data, size_t data_len)
+{
+       struct test_driver_data *drv = priv;
+       struct msghdr msg;
+       struct iovec io[3];
+       struct l2_ethhdr eth;
+       char desttxt[30];
+       struct sockaddr_un addr;
+       struct dirent *dent;
+       DIR *dir;
+       int ret = 0, broadcast = 0, count = 0;
+
+       if (drv->test_socket < 0 || drv->socket_dir == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d "
+                          "socket_dir=%p)",
+                          __func__, drv->test_socket, drv->socket_dir);
+               return -1;
+       }
+
+       broadcast = memcmp(dst, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) == 0;
+       snprintf(desttxt, sizeof(desttxt), MACSTR, MAC2STR(dst));
+
+       memcpy(eth.h_dest, dst, ETH_ALEN);
+       memcpy(eth.h_source, src, ETH_ALEN);
+       eth.h_proto = host_to_be16(proto);
+
+       io[0].iov_base = "ETHER ";
+       io[0].iov_len = 6;
+       io[1].iov_base = &eth;
+       io[1].iov_len = sizeof(eth);
+       io[2].iov_base = (u8 *) data;
+       io[2].iov_len = data_len;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = io;
+       msg.msg_iovlen = 3;
+
+       dir = opendir(drv->socket_dir);
+       if (dir == NULL) {
+               perror("test_driver: opendir");
+               return -1;
+       }
+       while ((dent = readdir(dir))) {
+#ifdef _DIRENT_HAVE_D_TYPE
+               /* Skip the file if it is not a socket. Also accept
+                * DT_UNKNOWN (0) in case the C library or underlying file
+                * system does not support d_type. */
+               if (dent->d_type != DT_SOCK && dent->d_type != DT_UNKNOWN)
+                       continue;
+#endif /* _DIRENT_HAVE_D_TYPE */
+               if (strcmp(dent->d_name, ".") == 0 ||
+                   strcmp(dent->d_name, "..") == 0)
+                       continue;
+
+               memset(&addr, 0, sizeof(addr));
+               addr.sun_family = AF_UNIX;
+               snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s",
+                        drv->socket_dir, dent->d_name);
+
+               if (strcmp(addr.sun_path, drv->own_socket_path) == 0)
+                       continue;
+               if (!broadcast && strstr(dent->d_name, desttxt) == NULL)
+                       continue;
+
+               wpa_printf(MSG_DEBUG, "%s: Send ether frame to %s",
+                          __func__, dent->d_name);
+
+               msg.msg_name = &addr;
+               msg.msg_namelen = sizeof(addr);
+               ret = sendmsg(drv->test_socket, &msg, 0);
+               if (ret < 0)
+                       perror("driver_test: sendmsg");
+               count++;
+       }
+       closedir(dir);
+
+       if (!broadcast && count == 0) {
+               wpa_printf(MSG_DEBUG, "%s: Destination " MACSTR " not found",
+                          __func__, MAC2STR(dst));
+               return -1;
+       }
+
+       return ret;
+}
+
+
+static int test_driver_send_mgmt_frame(void *priv, const void *buf,
+                                      size_t len, int flags)
+{
+       struct test_driver_data *drv = priv;
+       struct msghdr msg;
+       struct iovec io[2];
+       const u8 *dest;
+       int ret = 0, broadcast = 0;
+       char desttxt[30];
+       struct sockaddr_un addr;
+       struct dirent *dent;
+       DIR *dir;
+       struct ieee80211_hdr *hdr;
+       u16 fc;
+
+       if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+                          " socket_dir=%p)",
+                          __func__, drv->test_socket, (unsigned long) len,
+                          drv->socket_dir);
+               return -1;
+       }
+
+       dest = buf;
+       dest += 4;
+       broadcast = memcmp(dest, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) == 0;
+       snprintf(desttxt, sizeof(desttxt), MACSTR, MAC2STR(dest));
+
+       io[0].iov_base = "MLME ";
+       io[0].iov_len = 5;
+       io[1].iov_base = (void *) buf;
+       io[1].iov_len = len;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = io;
+       msg.msg_iovlen = 2;
+
+       dir = opendir(drv->socket_dir);
+       if (dir == NULL) {
+               perror("test_driver: opendir");
+               return -1;
+       }
+       while ((dent = readdir(dir))) {
+#ifdef _DIRENT_HAVE_D_TYPE
+               /* Skip the file if it is not a socket. Also accept
+                * DT_UNKNOWN (0) in case the C library or underlying file
+                * system does not support d_type. */
+               if (dent->d_type != DT_SOCK && dent->d_type != DT_UNKNOWN)
+                       continue;
+#endif /* _DIRENT_HAVE_D_TYPE */
+               if (strcmp(dent->d_name, ".") == 0 ||
+                   strcmp(dent->d_name, "..") == 0)
+                       continue;
+
+               memset(&addr, 0, sizeof(addr));
+               addr.sun_family = AF_UNIX;
+               snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s",
+                        drv->socket_dir, dent->d_name);
+
+               if (strcmp(addr.sun_path, drv->own_socket_path) == 0)
+                       continue;
+               if (!broadcast && strstr(dent->d_name, desttxt) == NULL)
+                       continue;
+
+               wpa_printf(MSG_DEBUG, "%s: Send management frame to %s",
+                          __func__, dent->d_name);
+
+               msg.msg_name = &addr;
+               msg.msg_namelen = sizeof(addr);
+               ret = sendmsg(drv->test_socket, &msg, 0);
+               if (ret < 0)
+                       perror("driver_test: sendmsg");
+       }
+       closedir(dir);
+
+       hdr = (struct ieee80211_hdr *) buf;
+       fc = le_to_host16(hdr->frame_control);
+       hostapd_mgmt_tx_cb(drv->hapd, (u8 *) buf, len, WLAN_FC_GET_STYPE(fc),
+                          ret >= 0);
+
+       return ret;
+}
+
+
+static void test_driver_scan(struct test_driver_data *drv,
+                            struct sockaddr_un *from, socklen_t fromlen,
+                            char *data)
+{
+       char buf[512], *pos, *end;
+       int ret;
+       struct test_driver_bss *bss;
+       u8 sa[ETH_ALEN];
+       u8 ie[512];
+       size_t ielen;
+
+       /* data: optional [ ' ' | STA-addr | ' ' | IEs(hex) ] */
+
+       wpa_printf(MSG_DEBUG, "test_driver: SCAN");
+
+       if (*data) {
+               if (*data != ' ' ||
+                   hwaddr_aton(data + 1, sa)) {
+                       wpa_printf(MSG_DEBUG, "test_driver: Unexpected SCAN "
+                                  "command format");
+                       return;
+               }
+
+               data += 18;
+               while (*data == ' ')
+                       data++;
+               ielen = os_strlen(data) / 2;
+               if (ielen > sizeof(ie))
+                       ielen = sizeof(ie);
+               if (hexstr2bin(data, ie, ielen) < 0)
+                       ielen = 0;
+
+               wpa_printf(MSG_DEBUG, "test_driver: Scan from " MACSTR,
+                          MAC2STR(sa));
+               wpa_hexdump(MSG_MSGDUMP, "test_driver: scan IEs", ie, ielen);
+
+               hostapd_wps_probe_req_rx(drv->hapd, sa, ie, ielen);
+       }
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               pos = buf;
+               end = buf + sizeof(buf);
+
+               /* reply: SCANRESP BSSID SSID IEs */
+               ret = snprintf(pos, end - pos, "SCANRESP " MACSTR " ",
+                              MAC2STR(bss->bssid));
+               if (ret < 0 || ret >= end - pos)
+                       return;
+               pos += ret;
+               pos += wpa_snprintf_hex(pos, end - pos,
+                                       bss->ssid, bss->ssid_len);
+               ret = snprintf(pos, end - pos, " ");
+               if (ret < 0 || ret >= end - pos)
+                       return;
+               pos += ret;
+               pos += wpa_snprintf_hex(pos, end - pos, bss->ie, bss->ielen);
+               pos += wpa_snprintf_hex(pos, end - pos, bss->wps_probe_resp_ie,
+                                       bss->wps_probe_resp_ie_len);
+
+               if (bss->privacy) {
+                       ret = snprintf(pos, end - pos, " PRIVACY");
+                       if (ret < 0 || ret >= end - pos)
+                               return;
+                       pos += ret;
+               }
+
+               sendto(drv->test_socket, buf, pos - buf, 0,
+                      (struct sockaddr *) from, fromlen);
+       }
+}
+
+
+static struct hostapd_data * test_driver_get_hapd(struct test_driver_data *drv,
+                                                 struct test_driver_bss *bss)
+{
+       struct hostapd_iface *iface = drv->hapd->iface;
+       struct hostapd_data *hapd = NULL;
+       size_t i;
+
+       if (bss == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: bss == NULL", __func__);
+               return NULL;
+       }
+
+       for (i = 0; i < iface->num_bss; i++) {
+               hapd = iface->bss[i];
+               if (memcmp(hapd->own_addr, bss->bssid, ETH_ALEN) == 0)
+                       break;
+       }
+       if (i == iface->num_bss) {
+               wpa_printf(MSG_DEBUG, "%s: no matching interface entry found "
+                          "for BSSID " MACSTR, __func__, MAC2STR(bss->bssid));
+               return NULL;
+       }
+
+       return hapd;
+}
+
+
+static int test_driver_new_sta(struct test_driver_data *drv,
+                              struct test_driver_bss *bss, const u8 *addr,
+                              const u8 *ie, size_t ielen)
+{
+       struct hostapd_data *hapd;
+
+       hapd = test_driver_get_hapd(drv, bss);
+       if (hapd == NULL)
+               return -1;
+
+       return hostapd_notif_assoc(hapd, addr, ie, ielen);
+}
+
+
+static void test_driver_assoc(struct test_driver_data *drv,
+                             struct sockaddr_un *from, socklen_t fromlen,
+                             char *data)
+{
+       struct test_client_socket *cli;
+       u8 ie[256], ssid[32];
+       size_t ielen, ssid_len = 0;
+       char *pos, *pos2, cmd[50];
+       struct test_driver_bss *bss;
+
+       /* data: STA-addr SSID(hex) IEs(hex) */
+
+       cli = os_zalloc(sizeof(*cli));
+       if (cli == NULL)
+               return;
+
+       if (hwaddr_aton(data, cli->addr)) {
+               printf("test_socket: Invalid MAC address '%s' in ASSOC\n",
+                      data);
+               free(cli);
+               return;
+       }
+       pos = data + 17;
+       while (*pos == ' ')
+               pos++;
+       pos2 = strchr(pos, ' ');
+       ielen = 0;
+       if (pos2) {
+               ssid_len = (pos2 - pos) / 2;
+               if (hexstr2bin(pos, ssid, ssid_len) < 0) {
+                       wpa_printf(MSG_DEBUG, "%s: Invalid SSID", __func__);
+                       free(cli);
+                       return;
+               }
+               wpa_hexdump_ascii(MSG_DEBUG, "test_driver_assoc: SSID",
+                                 ssid, ssid_len);
+
+               pos = pos2 + 1;
+               ielen = strlen(pos) / 2;
+               if (ielen > sizeof(ie))
+                       ielen = sizeof(ie);
+               if (hexstr2bin(pos, ie, ielen) < 0)
+                       ielen = 0;
+       }
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               if (bss->ssid_len == ssid_len &&
+                   memcmp(bss->ssid, ssid, ssid_len) == 0)
+                       break;
+       }
+       if (bss == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: No matching SSID found from "
+                          "configured BSSes", __func__);
+               free(cli);
+               return;
+       }
+
+       cli->bss = bss;
+       memcpy(&cli->un, from, sizeof(cli->un));
+       cli->unlen = fromlen;
+       cli->next = drv->cli;
+       drv->cli = cli;
+       wpa_hexdump_ascii(MSG_DEBUG, "test_socket: ASSOC sun_path",
+                         (const u8 *) cli->un.sun_path,
+                         cli->unlen - sizeof(cli->un.sun_family));
+
+       snprintf(cmd, sizeof(cmd), "ASSOCRESP " MACSTR " 0",
+                MAC2STR(bss->bssid));
+       sendto(drv->test_socket, cmd, strlen(cmd), 0,
+              (struct sockaddr *) from, fromlen);
+
+       if (test_driver_new_sta(drv, bss, cli->addr, ie, ielen) < 0) {
+               wpa_printf(MSG_DEBUG, "test_driver: failed to add new STA");
+       }
+}
+
+
+static void test_driver_disassoc(struct test_driver_data *drv,
+                                struct sockaddr_un *from, socklen_t fromlen)
+{
+       struct test_client_socket *cli;
+
+       cli = test_driver_get_cli(drv, from, fromlen);
+       if (!cli)
+               return;
+
+       hostapd_notif_disassoc(drv->hapd, cli->addr);
+}
+
+
+static void test_driver_eapol(struct test_driver_data *drv,
+                             struct sockaddr_un *from, socklen_t fromlen,
+                             u8 *data, size_t datalen)
+{
+       struct test_client_socket *cli;
+       if (datalen > 14) {
+               /* Skip Ethernet header */
+               wpa_printf(MSG_DEBUG, "test_driver: dst=" MACSTR " src="
+                          MACSTR " proto=%04x",
+                          MAC2STR(data), MAC2STR(data + ETH_ALEN),
+                          WPA_GET_BE16(data + 2 * ETH_ALEN));
+               data += 14;
+               datalen -= 14;
+       }
+       cli = test_driver_get_cli(drv, from, fromlen);
+       if (cli) {
+               struct hostapd_data *hapd;
+               hapd = test_driver_get_hapd(drv, cli->bss);
+               if (hapd == NULL)
+                       return;
+               hostapd_eapol_receive(hapd, cli->addr, data, datalen);
+       } else {
+               wpa_printf(MSG_DEBUG, "test_socket: EAPOL from unknown "
+                          "client");
+       }
+}
+
+
+static void test_driver_ether(struct test_driver_data *drv,
+                             struct sockaddr_un *from, socklen_t fromlen,
+                             u8 *data, size_t datalen)
+{
+       struct l2_ethhdr *eth;
+
+       if (datalen < sizeof(*eth))
+               return;
+
+       eth = (struct l2_ethhdr *) data;
+       wpa_printf(MSG_DEBUG, "test_driver: RX ETHER dst=" MACSTR " src="
+                  MACSTR " proto=%04x",
+                  MAC2STR(eth->h_dest), MAC2STR(eth->h_source),
+                  be_to_host16(eth->h_proto));
+
+#ifdef CONFIG_IEEE80211R
+       if (be_to_host16(eth->h_proto) == ETH_P_RRB) {
+               wpa_ft_rrb_rx(drv->hapd->wpa_auth, eth->h_source,
+                             data + sizeof(*eth), datalen - sizeof(*eth));
+       }
+#endif /* CONFIG_IEEE80211R */
+}
+
+
+static void test_driver_mlme(struct test_driver_data *drv,
+                            struct sockaddr_un *from, socklen_t fromlen,
+                            u8 *data, size_t datalen)
+{
+       struct ieee80211_hdr *hdr;
+       u16 fc;
+
+       hdr = (struct ieee80211_hdr *) data;
+
+       if (test_driver_get_cli(drv, from, fromlen) == NULL && datalen >= 16) {
+               struct test_client_socket *cli;
+               cli = os_zalloc(sizeof(*cli));
+               if (cli == NULL)
+                       return;
+               wpa_printf(MSG_DEBUG, "Adding client entry for " MACSTR,
+                          MAC2STR(hdr->addr2));
+               memcpy(cli->addr, hdr->addr2, ETH_ALEN);
+               memcpy(&cli->un, from, sizeof(cli->un));
+               cli->unlen = fromlen;
+               cli->next = drv->cli;
+               drv->cli = cli;
+       }
+
+       wpa_hexdump(MSG_MSGDUMP, "test_driver_mlme: received frame",
+                   data, datalen);
+       fc = le_to_host16(hdr->frame_control);
+       if (WLAN_FC_GET_TYPE(fc) != WLAN_FC_TYPE_MGMT) {
+               wpa_printf(MSG_ERROR, "%s: received non-mgmt frame",
+                          __func__);
+               return;
+       }
+       hostapd_mgmt_rx(drv->hapd, data, datalen, WLAN_FC_GET_STYPE(fc), NULL);
+}
+
+
+static void test_driver_receive_unix(int sock, void *eloop_ctx, void *sock_ctx)
+{
+       struct test_driver_data *drv = eloop_ctx;
+       char buf[2000];
+       int res;
+       struct sockaddr_un from;
+       socklen_t fromlen = sizeof(from);
+
+       res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
+                      (struct sockaddr *) &from, &fromlen);
+       if (res < 0) {
+               perror("recvfrom(test_socket)");
+               return;
+       }
+       buf[res] = '\0';
+
+       wpa_printf(MSG_DEBUG, "test_driver: received %u bytes", res);
+
+       if (strncmp(buf, "SCAN", 4) == 0) {
+               test_driver_scan(drv, &from, fromlen, buf + 4);
+       } else if (strncmp(buf, "ASSOC ", 6) == 0) {
+               test_driver_assoc(drv, &from, fromlen, buf + 6);
+       } else if (strcmp(buf, "DISASSOC") == 0) {
+               test_driver_disassoc(drv, &from, fromlen);
+       } else if (strncmp(buf, "EAPOL ", 6) == 0) {
+               test_driver_eapol(drv, &from, fromlen, (u8 *) buf + 6,
+                                 res - 6);
+       } else if (strncmp(buf, "ETHER ", 6) == 0) {
+               test_driver_ether(drv, &from, fromlen, (u8 *) buf + 6,
+                                 res - 6);
+       } else if (strncmp(buf, "MLME ", 5) == 0) {
+               test_driver_mlme(drv, &from, fromlen, (u8 *) buf + 5, res - 5);
+       } else {
+               wpa_hexdump_ascii(MSG_DEBUG, "Unknown test_socket command",
+                                 (u8 *) buf, res);
+       }
+}
+
+
+static struct test_driver_bss *
+test_driver_get_bss(struct test_driver_data *drv, const char *ifname)
+{
+       struct test_driver_bss *bss;
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               if (strcmp(bss->ifname, ifname) == 0)
+                       return bss;
+       }
+       return NULL;
+}
+
+
+static int test_driver_set_generic_elem(const char *ifname, void *priv,
+                                       const u8 *elem, size_t elem_len)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       bss = test_driver_get_bss(drv, ifname);
+       if (bss == NULL)
+               return -1;
+
+       free(bss->ie);
+
+       if (elem == NULL) {
+               bss->ie = NULL;
+               bss->ielen = 0;
+               return 0;
+       }
+
+       bss->ie = malloc(elem_len);
+       if (bss->ie == NULL) {
+               bss->ielen = 0;
+               return -1;
+       }
+
+       memcpy(bss->ie, elem, elem_len);
+       bss->ielen = elem_len;
+       return 0;
+}
+
+
+static int test_driver_set_wps_beacon_ie(const char *ifname, void *priv,
+                                        const u8 *ie, size_t len)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       wpa_hexdump(MSG_DEBUG, "test_driver: Beacon WPS IE", ie, len);
+       bss = test_driver_get_bss(drv, ifname);
+       if (bss == NULL)
+               return -1;
+
+       free(bss->wps_beacon_ie);
+
+       if (ie == NULL) {
+               bss->wps_beacon_ie = NULL;
+               bss->wps_beacon_ie_len = 0;
+               return 0;
+       }
+
+       bss->wps_beacon_ie = malloc(len);
+       if (bss->wps_beacon_ie == NULL) {
+               bss->wps_beacon_ie_len = 0;
+               return -1;
+       }
+
+       memcpy(bss->wps_beacon_ie, ie, len);
+       bss->wps_beacon_ie_len = len;
+       return 0;
+}
+
+
+static int test_driver_set_wps_probe_resp_ie(const char *ifname, void *priv,
+                                            const u8 *ie, size_t len)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       wpa_hexdump(MSG_DEBUG, "test_driver: ProbeResp WPS IE", ie, len);
+       bss = test_driver_get_bss(drv, ifname);
+       if (bss == NULL)
+               return -1;
+
+       free(bss->wps_probe_resp_ie);
+
+       if (ie == NULL) {
+               bss->wps_probe_resp_ie = NULL;
+               bss->wps_probe_resp_ie_len = 0;
+               return 0;
+       }
+
+       bss->wps_probe_resp_ie = malloc(len);
+       if (bss->wps_probe_resp_ie == NULL) {
+               bss->wps_probe_resp_ie_len = 0;
+               return -1;
+       }
+
+       memcpy(bss->wps_probe_resp_ie, ie, len);
+       bss->wps_probe_resp_ie_len = len;
+       return 0;
+}
+
+
+static int test_driver_sta_deauth(void *priv, const u8 *addr, int reason)
+{
+       struct test_driver_data *drv = priv;
+       struct test_client_socket *cli;
+
+       if (drv->test_socket < 0)
+               return -1;
+
+       cli = drv->cli;
+       while (cli) {
+               if (memcmp(cli->addr, addr, ETH_ALEN) == 0)
+                       break;
+               cli = cli->next;
+       }
+
+       if (!cli)
+               return -1;
+
+       return sendto(drv->test_socket, "DEAUTH", 6, 0,
+                     (struct sockaddr *) &cli->un, cli->unlen);
+}
+
+
+static int test_driver_sta_disassoc(void *priv, const u8 *addr, int reason)
+{
+       struct test_driver_data *drv = priv;
+       struct test_client_socket *cli;
+
+       if (drv->test_socket < 0)
+               return -1;
+
+       cli = drv->cli;
+       while (cli) {
+               if (memcmp(cli->addr, addr, ETH_ALEN) == 0)
+                       break;
+               cli = cli->next;
+       }
+
+       if (!cli)
+               return -1;
+
+       return sendto(drv->test_socket, "DISASSOC", 8, 0,
+                     (struct sockaddr *) &cli->un, cli->unlen);
+}
+
+
+static struct hostapd_hw_modes *
+test_driver_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
+{
+       struct hostapd_hw_modes *modes;
+
+       *num_modes = 3;
+       *flags = 0;
+       modes = os_zalloc(*num_modes * sizeof(struct hostapd_hw_modes));
+       if (modes == NULL)
+               return NULL;
+       modes[0].mode = HOSTAPD_MODE_IEEE80211G;
+       modes[0].num_channels = 1;
+       modes[0].num_rates = 1;
+       modes[0].channels = os_zalloc(sizeof(struct hostapd_channel_data));
+       modes[0].rates = os_zalloc(sizeof(struct hostapd_rate_data));
+       if (modes[0].channels == NULL || modes[0].rates == NULL) {
+               hostapd_free_hw_features(modes, *num_modes);
+               return NULL;
+       }
+       modes[0].channels[0].chan = 1;
+       modes[0].channels[0].freq = 2412;
+       modes[0].channels[0].flag = 0;
+       modes[0].rates[0].rate = 10;
+       modes[0].rates[0].flags = HOSTAPD_RATE_BASIC | HOSTAPD_RATE_SUPPORTED |
+               HOSTAPD_RATE_CCK | HOSTAPD_RATE_MANDATORY;
+
+       modes[1].mode = HOSTAPD_MODE_IEEE80211B;
+       modes[1].num_channels = 1;
+       modes[1].num_rates = 1;
+       modes[1].channels = os_zalloc(sizeof(struct hostapd_channel_data));
+       modes[1].rates = os_zalloc(sizeof(struct hostapd_rate_data));
+       if (modes[1].channels == NULL || modes[1].rates == NULL) {
+               hostapd_free_hw_features(modes, *num_modes);
+               return NULL;
+       }
+       modes[1].channels[0].chan = 1;
+       modes[1].channels[0].freq = 2412;
+       modes[1].channels[0].flag = 0;
+       modes[1].rates[0].rate = 10;
+       modes[1].rates[0].flags = HOSTAPD_RATE_BASIC | HOSTAPD_RATE_SUPPORTED |
+               HOSTAPD_RATE_CCK | HOSTAPD_RATE_MANDATORY;
+
+       modes[2].mode = HOSTAPD_MODE_IEEE80211A;
+       modes[2].num_channels = 1;
+       modes[2].num_rates = 1;
+       modes[2].channels = os_zalloc(sizeof(struct hostapd_channel_data));
+       modes[2].rates = os_zalloc(sizeof(struct hostapd_rate_data));
+       if (modes[2].channels == NULL || modes[2].rates == NULL) {
+               hostapd_free_hw_features(modes, *num_modes);
+               return NULL;
+       }
+       modes[2].channels[0].chan = 60;
+       modes[2].channels[0].freq = 5300;
+       modes[2].channels[0].flag = 0;
+       modes[2].rates[0].rate = 60;
+       modes[2].rates[0].flags = HOSTAPD_RATE_BASIC | HOSTAPD_RATE_SUPPORTED |
+               HOSTAPD_RATE_MANDATORY;
+
+       return modes;
+}
+
+
+static int test_driver_bss_add(void *priv, const char *ifname, const u8 *bssid)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       wpa_printf(MSG_DEBUG, "%s(ifname=%s bssid=" MACSTR ")",
+                  __func__, ifname, MAC2STR(bssid));
+
+       bss = os_zalloc(sizeof(*bss));
+       if (bss == NULL)
+               return -1;
+
+       os_strlcpy(bss->ifname, ifname, IFNAMSIZ);
+       memcpy(bss->bssid, bssid, ETH_ALEN);
+
+       bss->next = drv->bss;
+       drv->bss = bss;
+
+       return 0;
+}
+
+
+static int test_driver_bss_remove(void *priv, const char *ifname)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss, *prev;
+       struct test_client_socket *cli, *prev_c;
+
+       wpa_printf(MSG_DEBUG, "%s(ifname=%s)", __func__, ifname);
+
+       for (prev = NULL, bss = drv->bss; bss; prev = bss, bss = bss->next) {
+               if (strcmp(bss->ifname, ifname) != 0)
+                       continue;
+
+               if (prev)
+                       prev->next = bss->next;
+               else
+                       drv->bss = bss->next;
+
+               for (prev_c = NULL, cli = drv->cli; cli;
+                    prev_c = cli, cli = cli->next) {
+                       if (cli->bss != bss)
+                               continue;
+                       if (prev_c)
+                               prev_c->next = cli->next;
+                       else
+                               drv->cli = cli->next;
+                       free(cli);
+                       break;
+               }
+
+               test_driver_free_bss(bss);
+               return 0;
+       }
+
+       return -1;
+}
+
+
+static int test_driver_if_add(const char *iface, void *priv,
+                             enum hostapd_driver_if_type type, char *ifname,
+                             const u8 *addr)
+{
+       wpa_printf(MSG_DEBUG, "%s(iface=%s type=%d ifname=%s)",
+                  __func__, iface, type, ifname);
+       return 0;
+}
+
+
+static int test_driver_if_update(void *priv, enum hostapd_driver_if_type type,
+                                char *ifname, const u8 *addr)
+{
+       wpa_printf(MSG_DEBUG, "%s(type=%d ifname=%s)", __func__, type, ifname);
+       return 0;
+}
+
+
+static int test_driver_if_remove(void *priv, enum hostapd_driver_if_type type,
+                                const char *ifname, const u8 *addr)
+{
+       wpa_printf(MSG_DEBUG, "%s(type=%d ifname=%s)", __func__, type, ifname);
+       return 0;
+}
+
+
+static int test_driver_valid_bss_mask(void *priv, const u8 *addr,
+                                     const u8 *mask)
+{
+       return 0;
+}
+
+
+static int test_driver_set_ssid(const char *ifname, void *priv, const u8 *buf,
+                               int len)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       wpa_printf(MSG_DEBUG, "%s(ifname=%s)", __func__, ifname);
+       wpa_hexdump_ascii(MSG_DEBUG, "test_driver_set_ssid: SSID", buf, len);
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               if (strcmp(bss->ifname, ifname) != 0)
+                       continue;
+
+               if (len < 0 || (size_t) len > sizeof(bss->ssid))
+                       return -1;
+
+               memcpy(bss->ssid, buf, len);
+               bss->ssid_len = len;
+
+               return 0;
+       }
+
+       return -1;
+}
+
+
+static int test_driver_set_privacy(const char *ifname, void *priv, int enabled)
+{
+       struct test_driver_data *drv = priv;
+       struct test_driver_bss *bss;
+
+       wpa_printf(MSG_DEBUG, "%s(ifname=%s enabled=%d)",
+                  __func__, ifname, enabled);
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               if (strcmp(bss->ifname, ifname) != 0)
+                       continue;
+
+               bss->privacy = enabled;
+
+               return 0;
+       }
+
+       return -1;
+}
+
+
+static int test_driver_set_key(const char *iface, void *priv, wpa_alg alg,
+                              const u8 *addr, int key_idx, int set_tx,
+                              const u8 *seq, size_t seq_len,
+                              const u8 *key, size_t key_len)
+{
+       wpa_printf(MSG_DEBUG, "%s(iface=%s alg=%d idx=%d set_tx=%d)",
+                  __func__, iface, alg, key_idx, set_tx);
+       if (addr)
+               wpa_printf(MSG_DEBUG, "   addr=" MACSTR, MAC2STR(addr));
+       if (key)
+               wpa_hexdump_key(MSG_DEBUG, "   key", key, key_len);
+       return 0;
+}
+
+
+static int test_driver_set_sta_vlan(void *priv, const u8 *addr,
+                                   const char *ifname, int vlan_id)
+{
+       wpa_printf(MSG_DEBUG, "%s(addr=" MACSTR " ifname=%s vlan_id=%d)",
+                  __func__, MAC2STR(addr), ifname, vlan_id);
+       return 0;
+}
+
+
+static int test_driver_sta_add(const char *ifname, void *priv,
+                              struct hostapd_sta_add_params *params)
+{
+       struct test_driver_data *drv = priv;
+       struct test_client_socket *cli;
+       struct test_driver_bss *bss;
+
+       wpa_printf(MSG_DEBUG, "%s(ifname=%s addr=" MACSTR " aid=%d "
+                  "capability=0x%x flags=0x%x listen_interval=%d)",
+                  __func__, ifname, MAC2STR(params->addr), params->aid,
+                  params->capability, params->flags,
+                  params->listen_interval);
+       wpa_hexdump(MSG_DEBUG, "test_driver_sta_add - supp_rates",
+                   params->supp_rates, params->supp_rates_len);
+
+       cli = drv->cli;
+       while (cli) {
+               if (os_memcmp(cli->addr, params->addr, ETH_ALEN) == 0)
+                       break;
+               cli = cli->next;
+       }
+       if (!cli) {
+               wpa_printf(MSG_DEBUG, "%s: no matching client entry",
+                          __func__);
+               return -1;
+       }
+
+       for (bss = drv->bss; bss; bss = bss->next) {
+               if (strcmp(ifname, bss->ifname) == 0)
+                       break;
+       }
+       if (bss == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: No matching interface found from "
+                          "configured BSSes", __func__);
+               return -1;
+       }
+
+       cli->bss = bss;
+
+       return 0;
+}
+
+
+static void * test_driver_init(struct hostapd_data *hapd)
+{
+       struct test_driver_data *drv;
+       struct sockaddr_un addr_un;
+       struct sockaddr_in addr_in;
+       struct sockaddr *addr;
+       socklen_t alen;
+
+       drv = os_zalloc(sizeof(struct test_driver_data));
+       if (drv == NULL) {
+               printf("Could not allocate memory for test driver data\n");
+               return NULL;
+       }
+       drv->bss = os_zalloc(sizeof(*drv->bss));
+       if (drv->bss == NULL) {
+               printf("Could not allocate memory for test driver BSS data\n");
+               free(drv);
+               return NULL;
+       }
+
+       drv->hapd = hapd;
+
+       /* Generate a MAC address to help testing with multiple APs */
+       hapd->own_addr[0] = 0x02; /* locally administered */
+       sha1_prf((const u8 *) hapd->conf->iface, strlen(hapd->conf->iface),
+                "hostapd test bssid generation",
+                (const u8 *) hapd->conf->ssid.ssid, hapd->conf->ssid.ssid_len,
+                hapd->own_addr + 1, ETH_ALEN - 1);
+
+       os_strlcpy(drv->bss->ifname, hapd->conf->iface, IFNAMSIZ);
+       memcpy(drv->bss->bssid, hapd->own_addr, ETH_ALEN);
+
+       if (hapd->conf->test_socket) {
+               if (strlen(hapd->conf->test_socket) >=
+                   sizeof(addr_un.sun_path)) {
+                       printf("Too long test_socket path\n");
+                       test_driver_free_priv(drv);
+                       return NULL;
+               }
+               if (strncmp(hapd->conf->test_socket, "DIR:", 4) == 0) {
+                       size_t len = strlen(hapd->conf->test_socket) + 30;
+                       drv->socket_dir = strdup(hapd->conf->test_socket + 4);
+                       drv->own_socket_path = malloc(len);
+                       if (drv->own_socket_path) {
+                               snprintf(drv->own_socket_path, len,
+                                        "%s/AP-" MACSTR,
+                                        hapd->conf->test_socket + 4,
+                                        MAC2STR(hapd->own_addr));
+                       }
+               } else if (strncmp(hapd->conf->test_socket, "UDP:", 4) == 0) {
+                       drv->udp_port = atoi(hapd->conf->test_socket + 4);
+               } else {
+                       drv->own_socket_path = strdup(hapd->conf->test_socket);
+               }
+               if (drv->own_socket_path == NULL && drv->udp_port == 0) {
+                       test_driver_free_priv(drv);
+                       return NULL;
+               }
+
+               drv->test_socket = socket(drv->udp_port ? PF_INET : PF_UNIX,
+                                         SOCK_DGRAM, 0);
+               if (drv->test_socket < 0) {
+                       perror("socket");
+                       test_driver_free_priv(drv);
+                       return NULL;
+               }
+
+               if (drv->udp_port) {
+                       os_memset(&addr_in, 0, sizeof(addr_in));
+                       addr_in.sin_family = AF_INET;
+                       addr_in.sin_port = htons(drv->udp_port);
+                       addr = (struct sockaddr *) &addr_in;
+                       alen = sizeof(addr_in);
+               } else {
+                       os_memset(&addr_un, 0, sizeof(addr_un));
+                       addr_un.sun_family = AF_UNIX;
+                       os_strlcpy(addr_un.sun_path, drv->own_socket_path,
+                                  sizeof(addr_un.sun_path));
+                       addr = (struct sockaddr *) &addr_un;
+                       alen = sizeof(addr_un);
+               }
+               if (bind(drv->test_socket, addr, alen) < 0) {
+                       perror("bind(PF_UNIX)");
+                       close(drv->test_socket);
+                       if (drv->own_socket_path)
+                               unlink(drv->own_socket_path);
+                       test_driver_free_priv(drv);
+                       return NULL;
+               }
+               eloop_register_read_sock(drv->test_socket,
+                                        test_driver_receive_unix, drv, NULL);
+       } else
+               drv->test_socket = -1;
+
+       return drv;
+}
+
+
+static void test_driver_deinit(void *priv)
+{
+       struct test_driver_data *drv = priv;
+       struct test_client_socket *cli, *prev;
+
+       cli = drv->cli;
+       while (cli) {
+               prev = cli;
+               cli = cli->next;
+               free(prev);
+       }
+
+       if (drv->test_socket >= 0) {
+               eloop_unregister_read_sock(drv->test_socket);
+               close(drv->test_socket);
+               if (drv->own_socket_path)
+                       unlink(drv->own_socket_path);
+       }
+
+       /* There should be only one BSS remaining at this point. */
+       if (drv->bss == NULL)
+               wpa_printf(MSG_ERROR, "%s: drv->bss == NULL", __func__);
+       else if (drv->bss->next)
+               wpa_printf(MSG_ERROR, "%s: drv->bss->next != NULL", __func__);
+
+       test_driver_free_priv(drv);
+}
+
+
+const struct wpa_driver_ops wpa_driver_test_ops = {
+       .name = "test",
+       .hapd_init = test_driver_init,
+       .hapd_deinit = test_driver_deinit,
+       .hapd_send_eapol = test_driver_send_eapol,
+       .send_mgmt_frame = test_driver_send_mgmt_frame,
+       .set_generic_elem = test_driver_set_generic_elem,
+       .sta_deauth = test_driver_sta_deauth,
+       .sta_disassoc = test_driver_sta_disassoc,
+       .get_hw_feature_data = test_driver_get_hw_feature_data,
+       .bss_add = test_driver_bss_add,
+       .bss_remove = test_driver_bss_remove,
+       .if_add = test_driver_if_add,
+       .if_update = test_driver_if_update,
+       .if_remove = test_driver_if_remove,
+       .valid_bss_mask = test_driver_valid_bss_mask,
+       .hapd_set_ssid = test_driver_set_ssid,
+       .set_privacy = test_driver_set_privacy,
+       .hapd_set_key = test_driver_set_key,
+       .set_sta_vlan = test_driver_set_sta_vlan,
+       .sta_add = test_driver_sta_add,
+       .send_ether = test_driver_send_ether,
+       .set_wps_beacon_ie = test_driver_set_wps_beacon_ie,
+       .set_wps_probe_resp_ie = test_driver_set_wps_probe_resp_ie,
+};
+
+#else /* HOSTAPD */
+
 struct wpa_driver_test_global {
        int dummy;
 };
@@ -65,6 +1274,8 @@ struct wpa_driver_test_data {
        int associated;
        u8 *probe_req_ie;
        size_t probe_req_ie_len;
+       int ibss;
+       int privacy;
 };
 
 
@@ -132,8 +1343,18 @@ static void wpa_driver_scan_dir(struct wpa_driver_test_data *drv,
        end[-1] = '\0';
 
        while ((dent = readdir(dir))) {
-               if (os_strncmp(dent->d_name, "AP-", 3) != 0)
+               if (os_strncmp(dent->d_name, "AP-", 3) != 0 &&
+                   os_strncmp(dent->d_name, "STA-", 4) != 0)
                        continue;
+               if (drv->own_socket_path) {
+                       size_t olen, dlen;
+                       olen = os_strlen(drv->own_socket_path);
+                       dlen = os_strlen(dent->d_name);
+                       if (olen >= dlen &&
+                           os_strcmp(dent->d_name,
+                                     drv->own_socket_path + olen - dlen) == 0)
+                               continue;
+               }
                wpa_printf(MSG_DEBUG, "%s: SCAN %s", __func__, dent->d_name);
 
                os_memset(&addr, 0, sizeof(addr));
@@ -151,10 +1372,18 @@ static void wpa_driver_scan_dir(struct wpa_driver_test_data *drv,
 #endif /* DRIVER_TEST_UNIX */
 
 
-static int wpa_driver_test_scan(void *priv, const u8 *ssid, size_t ssid_len)
+static int wpa_driver_test_scan(void *priv,
+                               struct wpa_driver_scan_params *params)
 {
        struct wpa_driver_test_data *drv = priv;
+       size_t i;
+
        wpa_printf(MSG_DEBUG, "%s: priv=%p", __func__, priv);
+       for (i = 0; i < params->num_ssids; i++)
+               wpa_hexdump(MSG_DEBUG, "Scan SSID",
+                           params->ssids[i].ssid, params->ssids[i].ssid_len);
+       wpa_hexdump(MSG_DEBUG, "Scan extra IE(s)",
+                   params->extra_ies, params->extra_ies_len);
 
        drv->num_scanres = 0;
 
@@ -264,8 +1493,21 @@ static int wpa_driver_test_associate(
        } else
                drv->assoc_wpa_ie_len = 0;
 
+       drv->ibss = params->mode == IEEE80211_MODE_IBSS;
+       drv->privacy = params->key_mgmt_suite &
+               (WPA_KEY_MGMT_IEEE8021X |
+                WPA_KEY_MGMT_PSK |
+                WPA_KEY_MGMT_WPA_NONE |
+                WPA_KEY_MGMT_FT_IEEE8021X |
+                WPA_KEY_MGMT_FT_PSK |
+                WPA_KEY_MGMT_IEEE8021X_SHA256 |
+                WPA_KEY_MGMT_PSK_SHA256);
+       if (params->wep_key_len[params->wep_tx_keyidx])
+               drv->privacy = 1;
+
 #ifdef DRIVER_TEST_UNIX
-       if (drv->test_dir && params->bssid) {
+       if (drv->test_dir && params->bssid &&
+           params->mode != IEEE80211_MODE_IBSS) {
                os_memset(&drv->hostapd_addr, 0, sizeof(drv->hostapd_addr));
                drv->hostapd_addr.sun_family = AF_UNIX;
                os_snprintf(drv->hostapd_addr.sun_path,
@@ -315,6 +1557,17 @@ static int wpa_driver_test_associate(
                drv->ssid_len = params->ssid_len;
        } else {
                drv->associated = 1;
+               if (params->mode == IEEE80211_MODE_IBSS) {
+                       os_memcpy(drv->ssid, params->ssid, params->ssid_len);
+                       drv->ssid_len = params->ssid_len;
+                       if (params->bssid)
+                               os_memcpy(drv->bssid, params->bssid, ETH_ALEN);
+                       else {
+                               os_get_random(drv->bssid, ETH_ALEN);
+                               drv->bssid[0] &= ~0x01;
+                               drv->bssid[0] |= 0x02;
+                       }
+               }
                wpa_supplicant_event(drv->ctx, EVENT_ASSOC, NULL);
        }
 
@@ -464,8 +1717,10 @@ static void wpa_driver_test_scanresp(struct wpa_driver_test_data *drv,
                pos = pos2 + 1;
                while (*pos == ' ')
                        pos++;
-               if (os_strncmp(pos, "PRIVACY", 7) == 0)
+               if (os_strstr(pos, "PRIVACY"))
                        res->caps |= IEEE80211_CAP_PRIVACY;
+               if (os_strstr(pos, "IBSS"))
+                       res->caps |= IEEE80211_CAP_IBSS;
        }
 
        os_free(drv->scanres[drv->num_scanres]);
@@ -534,6 +1789,54 @@ static void wpa_driver_test_mlme(struct wpa_driver_test_data *drv,
 }
 
 
+static void wpa_driver_test_scan_cmd(struct wpa_driver_test_data *drv,
+                                    struct sockaddr *from,
+                                    socklen_t fromlen,
+                                    const u8 *data, size_t data_len)
+{
+       char buf[512], *pos, *end;
+       int ret;
+
+       /* data: optional [ STA-addr | ' ' | IEs(hex) ] */
+
+       if (!drv->ibss)
+               return;
+
+       pos = buf;
+       end = buf + sizeof(buf);
+
+       /* reply: SCANRESP BSSID SSID IEs */
+       ret = snprintf(pos, end - pos, "SCANRESP " MACSTR " ",
+                      MAC2STR(drv->bssid));
+       if (ret < 0 || ret >= end - pos)
+               return;
+       pos += ret;
+       pos += wpa_snprintf_hex(pos, end - pos,
+                               drv->ssid, drv->ssid_len);
+       ret = snprintf(pos, end - pos, " ");
+       if (ret < 0 || ret >= end - pos)
+               return;
+       pos += ret;
+       pos += wpa_snprintf_hex(pos, end - pos, drv->assoc_wpa_ie,
+                               drv->assoc_wpa_ie_len);
+
+       if (drv->privacy) {
+               ret = snprintf(pos, end - pos, " PRIVACY");
+               if (ret < 0 || ret >= end - pos)
+                       return;
+               pos += ret;
+       }
+
+       ret = snprintf(pos, end - pos, " IBSS");
+       if (ret < 0 || ret >= end - pos)
+               return;
+       pos += ret;
+
+       sendto(drv->test_socket, buf, pos - buf, 0,
+              (struct sockaddr *) from, fromlen);
+}
+
+
 static void wpa_driver_test_receive_unix(int sock, void *eloop_ctx,
                                         void *sock_ctx)
 {
@@ -576,6 +1879,10 @@ static void wpa_driver_test_receive_unix(int sock, void *eloop_ctx,
        } else if (os_strncmp(buf, "MLME ", 5) == 0) {
                wpa_driver_test_mlme(drv, (struct sockaddr *) &from, fromlen,
                                     (const u8 *) buf + 5, res - 5);
+       } else if (os_strncmp(buf, "SCAN ", 5) == 0) {
+               wpa_driver_test_scan_cmd(drv, (struct sockaddr *) &from,
+                                        fromlen,
+                                        (const u8 *) buf + 5, res - 5);
        } else {
                wpa_hexdump_ascii(MSG_DEBUG, "Unknown test_socket command",
                                  (u8 *) buf, res);
@@ -842,6 +2149,9 @@ static int wpa_driver_test_send_eapol(void *priv, const u8 *dest, u16 proto,
        struct l2_ethhdr eth;
        struct sockaddr *addr;
        socklen_t alen;
+#ifdef DRIVER_TEST_UNIX
+       struct sockaddr_un addr_un;
+#endif /* DRIVER_TEST_UNIX */
 
        wpa_hexdump(MSG_MSGDUMP, "test_send_eapol TX frame", data, data_len);
 
@@ -874,7 +2184,6 @@ static int wpa_driver_test_send_eapol(void *priv, const u8 *dest, u16 proto,
                }
        } else {
 #ifdef DRIVER_TEST_UNIX
-               struct sockaddr_un addr_un;
                struct stat st;
                os_memset(&addr_un, 0, sizeof(addr_un));
                addr_un.sun_family = AF_UNIX;
@@ -924,6 +2233,7 @@ static int wpa_driver_test_get_capa(void *priv, struct wpa_driver_capa *capa)
                WPA_DRIVER_AUTH_LEAP;
        if (drv->use_mlme)
                capa->flags |= WPA_DRIVER_FLAGS_USER_SPACE_MLME;
+       capa->max_scan_ssids = 2;
 
        return 0;
 }
@@ -946,37 +2256,37 @@ static int wpa_driver_test_mlme_setprotection(void *priv, const u8 *addr,
 
 
 #ifdef CONFIG_CLIENT_MLME
-static struct wpa_hw_modes *
+static struct hostapd_hw_modes *
 wpa_driver_test_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
 {
-       struct wpa_hw_modes *modes;
+       struct hostapd_hw_modes *modes;
 
        *num_modes = 1;
        *flags = 0;
-       modes = os_zalloc(*num_modes * sizeof(struct wpa_hw_modes));
+       modes = os_zalloc(*num_modes * sizeof(struct hostapd_hw_modes));
        if (modes == NULL)
                return NULL;
-       modes[0].mode = WPA_MODE_IEEE80211G;
+       modes[0].mode = HOSTAPD_MODE_IEEE80211G;
        modes[0].num_channels = 1;
        modes[0].num_rates = 1;
-       modes[0].channels = os_zalloc(sizeof(struct wpa_channel_data));
-       modes[0].rates = os_zalloc(sizeof(struct wpa_rate_data));
+       modes[0].channels = os_zalloc(sizeof(struct hostapd_channel_data));
+       modes[0].rates = os_zalloc(sizeof(struct hostapd_rate_data));
        if (modes[0].channels == NULL || modes[0].rates == NULL) {
                wpa_supplicant_sta_free_hw_features(modes, *num_modes);
                return NULL;
        }
        modes[0].channels[0].chan = 1;
        modes[0].channels[0].freq = 2412;
-       modes[0].channels[0].flag = WPA_CHAN_W_SCAN | WPA_CHAN_W_ACTIVE_SCAN;
+       modes[0].channels[0].flag = 0;
        modes[0].rates[0].rate = 10;
-       modes[0].rates[0].flags = WPA_RATE_BASIC | WPA_RATE_SUPPORTED |
-               WPA_RATE_CCK | WPA_RATE_MANDATORY;
+       modes[0].rates[0].flags = HOSTAPD_RATE_BASIC | HOSTAPD_RATE_SUPPORTED |
+               HOSTAPD_RATE_CCK | HOSTAPD_RATE_MANDATORY;
 
        return modes;
 }
 
 
-static int wpa_driver_test_set_channel(void *priv, wpa_hw_mode phymode,
+static int wpa_driver_test_set_channel(void *priv, hostapd_hw_mode phymode,
                                       int chan, int freq)
 {
        wpa_printf(MSG_DEBUG, "%s: phymode=%d chan=%d freq=%d",
@@ -1147,6 +2457,29 @@ static void wpa_driver_test_global_deinit(void *priv)
 }
 
 
+static struct wpa_interface_info *
+wpa_driver_test_get_interfaces(void *global_priv)
+{
+       /* struct wpa_driver_test_global *global = priv; */
+       struct wpa_interface_info *iface;
+
+       iface = os_zalloc(sizeof(*iface));
+       if (iface == NULL)
+               return iface;
+       iface->ifname = os_strdup("sta0");
+       iface->desc = os_strdup("test interface 0");
+       iface->drv_name = "test";
+       iface->next = os_zalloc(sizeof(*iface));
+       if (iface->next) {
+               iface->next->ifname = os_strdup("sta1");
+               iface->next->desc = os_strdup("test interface 1");
+               iface->next->drv_name = "test";
+       }
+
+       return iface;
+}
+
+
 const struct wpa_driver_ops wpa_driver_test_ops = {
        "test",
        "wpa_supplicant test driver",
@@ -1159,7 +2492,7 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
        wpa_driver_test_set_param,
        NULL /* set_countermeasures */,
        NULL /* set_drop_unencrypted */,
-       wpa_driver_test_scan,
+       NULL /* scan */,
        NULL /* get_scan_results */,
        wpa_driver_test_deauthenticate,
        wpa_driver_test_disassociate,
@@ -1200,5 +2533,67 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
        NULL /* set_country */,
        wpa_driver_test_global_init,
        wpa_driver_test_global_deinit,
-       wpa_driver_test_init2
+       wpa_driver_test_init2,
+       wpa_driver_test_get_interfaces,
+       wpa_driver_test_scan,
+       NULL /* authenticate */,
+       NULL /* set_beacon */,
+       NULL /* set_beacon_int */,
+       NULL /* hapd_init */,
+       NULL /* init_bssid */,
+       NULL /* hapd_deinit */,
+       NULL /* set_ieee8021x */,
+       NULL /* set_privacy */,
+       NULL /* hapd_set_key */,
+       NULL /* get_seqnum */,
+       NULL /* get_seqnum_igtk */,
+       NULL /* flush */,
+       NULL /* set_generic_elem */,
+       NULL /* read_sta_data */,
+       NULL /* hapd_send_eapol */,
+       NULL /* sta_deauth */,
+       NULL /* sta_disassoc */,
+       NULL /* sta_remove */,
+       NULL /* hapd_get_ssid */,
+       NULL /* hapd_set_ssid */,
+       NULL /* hapd_set_countermeasures */,
+       NULL /* send_mgmt_frame */,
+       NULL /* sta_add */,
+       NULL /* get_inact_sec */,
+       NULL /* sta_clear_stats */,
+       NULL /* set_freq */,
+       NULL /* set_rts */,
+       NULL /* set_frag */,
+       NULL /* set_retry */,
+       NULL /* sta_set_flags */,
+       NULL /* set_rate_sets */,
+       NULL /* hapd_set_country */,
+       NULL /* set_ieee80211d */,
+       NULL /* hapd_set_beacon */,
+       NULL /* set_internal_bridge */,
+       NULL /* hapd_set_beacon_int */,
+       NULL /* set_broadcast_ssid */,
+       NULL /* set_cts_protect */,
+       NULL /* set_preamble */,
+       NULL /* set_short_slot_time */,
+       NULL /* set_tx_queue_params */,
+       NULL /* bss_add */,
+       NULL /* bss_remove */,
+       NULL /* valid_bss_mask */,
+       NULL /* passive_scan */,
+       NULL /* hapd_get_hw_feature_data */,
+       NULL /* if_add */,
+       NULL /* if_update */,
+       NULL /* if_remove */,
+       NULL /* set_sta_vlan */,
+       NULL /* commit */,
+       NULL /* send_ether */,
+       NULL /* set_radius_acl_auth */,
+       NULL /* set_radius_acl_expire */,
+       NULL /* set_ht_params */,
+       NULL /* set_wps_beacon_ie */,
+       NULL /* set_wps_probe_resp_ie */,
+       NULL /* get_neighbor_bss */
 };
+
+#endif /* HOSTAPD */