driver_bsd.c: Enable AP mode wpa_supplicant
[mech_eap.git] / src / drivers / driver_bsd.c
index 81ac8ad..0bb60eb 100644 (file)
@@ -22,6 +22,7 @@
 #include "common/ieee802_11_defs.h"
 
 #include <net/if.h>
+#include <net/if_media.h>
 
 #ifdef __NetBSD__
 #include <net/if_ether.h>
@@ -35,8 +36,8 @@
 #include <netproto/802_11/ieee80211_dragonfly.h>
 #else /* __DragonFly__ */
 #include <net80211/ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
 #include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211_crypto.h>
 #endif /* __DragonFly__ */
 #if __FreeBSD__
 #include <net80211/ieee80211_freebsd.h>
@@ -45,6 +46,8 @@
 #include <net80211/ieee80211_netbsd.h>
 #endif
 
+#include "l2_packet/l2_packet.h"
+
 /* Generic functions for hostapd and wpa_supplicant */
 
 static int
@@ -142,67 +145,177 @@ bsd_set_ssid(int s, const char *ifname, const u8 *ssid, size_t ssid_len)
 #endif
 }
 
+static int
+bsd_get_if_media(int s, const char *ifname)
+{
+       struct ifmediareq ifmr;
 
-#ifdef HOSTAPD
+       os_memset(&ifmr, 0, sizeof(ifmr));
+       os_strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
 
-/*
- * Avoid conflicts with hostapd definitions by undefining couple of defines
- * from net80211 header files.
- */
-#undef RSN_VERSION
-#undef WPA_VERSION
-#undef WPA_OUI_TYPE
+       if (ioctl(s, SIOCGIFMEDIA, &ifmr) < 0) {
+               wpa_printf(MSG_ERROR, "%s: SIOCGIFMEDIA %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
 
-#include "l2_packet/l2_packet.h"
-#include "../../hostapd/sta_flags.h"
+       return ifmr.ifm_current;
+}
 
-struct bsd_driver_data {
-       struct hostapd_data *hapd;              /* back pointer */
+static int
+bsd_set_if_media(int s, const char *ifname, int media)
+{
+       struct ifreq ifr;
 
-       char    iface[IFNAMSIZ + 1];
-       struct l2_packet_data *sock_xmit;       /* raw packet xmit socket */
-       int     ioctl_sock;                     /* socket for ioctl() use */
-       int     wext_sock;                      /* socket for wireless events */
-};
+       os_memset(&ifr, 0, sizeof(ifr));
+       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       ifr.ifr_media = media;
 
-static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
-                         int reason_code);
+       if (ioctl(s, SIOCSIFMEDIA, &ifr) < 0) {
+               wpa_printf(MSG_ERROR, "%s: SIOCSIFMEDIA %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
+       return 0;
+}
 
 static int
-set80211var(struct bsd_driver_data *drv, int op, const void *arg, int arg_len)
+bsd_set_mediaopt(int s, const char *ifname, uint32_t mask, uint32_t mode)
 {
-       return bsd_set80211var(drv->ioctl_sock, drv->iface, op, arg, arg_len);
+       int media = bsd_get_if_media(s, ifname);
+
+       if (media < 0)
+               return -1;
+       media &= ~mask;
+       media |= mode;
+       if (bsd_set_if_media(s, ifname, media) < 0)
+               return -1;
+       return 0;
 }
 
 static int
-get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len)
+bsd_del_key(int s, const char *ifname, const u8 *addr, int key_idx)
 {
-       return bsd_get80211var(drv->ioctl_sock, drv->iface, op, arg, arg_len);
+       struct ieee80211req_del_key wk;
+
+       os_memset(&wk, 0, sizeof(wk));
+       if (addr == NULL) {
+               wpa_printf(MSG_DEBUG, "%s: key_idx=%d", __func__, key_idx);
+               wk.idk_keyix = key_idx;
+       } else {
+               wpa_printf(MSG_DEBUG, "%s: addr=" MACSTR, __func__,
+                          MAC2STR(addr));
+               os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
+               wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */
+       }
+
+       return bsd_set80211var(s, ifname, IEEE80211_IOC_DELKEY, &wk,
+                              sizeof(wk));
 }
 
 static int
-set80211param(struct bsd_driver_data *drv, int op, int arg)
+bsd_send_mlme_param(int s, const char *ifname, const u8 op, const u16 reason,
+                   const u8 *addr)
 {
-       return bsd_set80211param(drv->ioctl_sock, drv->iface, op, arg);
+       struct ieee80211req_mlme mlme;
+
+       os_memset(&mlme, 0, sizeof(mlme));
+       mlme.im_op = op;
+       mlme.im_reason = reason;
+       os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
+       return bsd_set80211var(s, ifname, IEEE80211_IOC_MLME, &mlme,
+                              sizeof(mlme));
 }
 
-static const char *
-ether_sprintf(const u8 *addr)
+static int
+bsd_ctrl_iface(int s, const char *ifname, int enable)
 {
-       static char buf[sizeof(MACSTR)];
+       struct ifreq ifr;
 
-       if (addr != NULL)
-               snprintf(buf, sizeof(buf), MACSTR, MAC2STR(addr));
+       os_memset(&ifr, 0, sizeof(ifr));
+       os_strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+
+       if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+               perror("ioctl[SIOCGIFFLAGS]");
+               return -1;
+       }
+
+       if (enable)
+               ifr.ifr_flags |= IFF_UP;
        else
-               snprintf(buf, sizeof(buf), MACSTR, 0,0,0,0,0,0);
-       return buf;
+               ifr.ifr_flags &= ~IFF_UP;
+
+       if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
+               perror("ioctl[SIOCSIFFLAGS]");
+               return -1;
+       }
+
+       return 0;
+}
+
+static int
+bsd_set_key(int s, const char *ifname, enum wpa_alg alg,
+           const unsigned char *addr, int key_idx, int set_tx, const u8 *seq,
+           size_t seq_len, const u8 *key, size_t key_len)
+{
+       struct ieee80211req_key wk;
+
+       wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%p key_idx=%d set_tx=%d "
+                  "seq_len=%zu key_len=%zu", __func__, alg, addr, key_idx,
+                  set_tx, seq_len, key_len);
+
+       os_memset(&wk, 0, sizeof(wk));
+       switch (alg) {
+       case WPA_ALG_WEP:
+               wk.ik_type = IEEE80211_CIPHER_WEP;
+               break;
+       case WPA_ALG_TKIP:
+               wk.ik_type = IEEE80211_CIPHER_TKIP;
+               break;
+       case WPA_ALG_CCMP:
+               wk.ik_type = IEEE80211_CIPHER_AES_CCM;
+               break;
+       default:
+               wpa_printf(MSG_ERROR, "%s: unknown alg=%d", __func__, alg);
+               return -1;
+       }
+
+       wk.ik_flags = IEEE80211_KEY_RECV;
+       if (set_tx)
+               wk.ik_flags |= IEEE80211_KEY_XMIT;
+
+       if (addr == NULL) {
+               os_memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
+               wk.ik_keyix = key_idx;
+       } else {
+               os_memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
+               /*
+                * Deduce whether group/global or unicast key by checking
+                * the address (yech).  Note also that we can only mark global
+                * keys default; doing this for a unicast key is an error.
+                */
+               if (os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
+                             IEEE80211_ADDR_LEN) == 0) {
+                       wk.ik_flags |= IEEE80211_KEY_GROUP;
+                       wk.ik_keyix = key_idx;
+               } else {
+                       wk.ik_keyix = key_idx == 0 ? IEEE80211_KEYIX_NONE :
+                               key_idx;
+               }
+       }
+       if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
+               wk.ik_flags |= IEEE80211_KEY_DEFAULT;
+       wk.ik_keylen = key_len;
+       os_memcpy(&wk.ik_keyrsc, seq, seq_len);
+       os_memcpy(wk.ik_keydata, key, key_len);
+
+       return bsd_set80211var(s, ifname, IEEE80211_IOC_WPAKEY, &wk,
+                              sizeof(wk));
 }
 
-/*
- * Configure WPA parameters.
- */
 static int
-bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
+bsd_configure_wpa(int s, const char *ifname, struct wpa_bss_params *params)
 {
        static const char *ciphernames[] =
                { "WEP", "TKIP", "AES-OCB", "AES-CCM", "CKIP", "NONE" };
@@ -231,7 +344,7 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        }
        wpa_printf(MSG_DEBUG, "%s: group key cipher=%s (%u)",
                   __func__, ciphernames[v], v);
-       if (set80211param(drv, IEEE80211_IOC_MCASTCIPHER, v)) {
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_MCASTCIPHER, v)) {
                printf("Unable to set group key cipher to %u (%s)\n",
                        v, ciphernames[v]);
                return -1;
@@ -239,7 +352,8 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        if (v == IEEE80211_CIPHER_WEP) {
                /* key length is done only for specific ciphers */
                v = (params->wpa_group == WPA_CIPHER_WEP104 ? 13 : 5);
-               if (set80211param(drv, IEEE80211_IOC_MCASTKEYLEN, v)) {
+               if (bsd_set80211param(s, ifname, IEEE80211_IOC_MCASTKEYLEN,
+                                     v)) {
                        printf("Unable to set group key length to %u\n", v);
                        return -1;
                }
@@ -253,14 +367,14 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
        if (params->wpa_pairwise & WPA_CIPHER_NONE)
                v |= 1<<IEEE80211_CIPHER_NONE;
        wpa_printf(MSG_DEBUG, "%s: pairwise key ciphers=0x%x", __func__, v);
-       if (set80211param(drv, IEEE80211_IOC_UCASTCIPHERS, v)) {
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_UCASTCIPHERS, v)) {
                printf("Unable to set pairwise key ciphers to 0x%x\n", v);
                return -1;
        }
 
        wpa_printf(MSG_DEBUG, "%s: key management algorithms=0x%x",
                   __func__, params->wpa_key_mgmt);
-       if (set80211param(drv, IEEE80211_IOC_KEYMGTALGS, params->wpa_key_mgmt))
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_KEYMGTALGS, params->wpa_key_mgmt))
        {
                printf("Unable to set key management algorithms to 0x%x\n",
                        params->wpa_key_mgmt);
@@ -272,190 +386,214 @@ bsd_configure_wpa(struct bsd_driver_data *drv, struct wpa_bss_params *params)
                v |= BIT(0);
        wpa_printf(MSG_DEBUG, "%s: rsn capabilities=0x%x",
                   __func__, params->rsn_preauth);
-       if (set80211param(drv, IEEE80211_IOC_RSNCAPS, v)) {
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_RSNCAPS, v)) {
                printf("Unable to set RSN capabilities to 0x%x\n", v);
                return -1;
        }
 
        wpa_printf(MSG_DEBUG, "%s: enable WPA= 0x%x", __func__, params->wpa);
-       if (set80211param(drv, IEEE80211_IOC_WPA, params->wpa)) {
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_WPA, params->wpa)) {
                printf("Unable to set WPA to %u\n", params->wpa);
                return -1;
        }
        return 0;
 }
 
-
-static int
-bsd_set_iface_flags(void *priv, int dev_up)
-{
-       struct bsd_driver_data *drv = priv;
-       struct ifreq ifr;
-
-       wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up);
-
-       if (drv->ioctl_sock < 0)
-               return -1;
-
-       memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
-
-       if (ioctl(drv->ioctl_sock, SIOCGIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCGIFFLAGS]");
-               return -1;
-       }
-
-       if (dev_up)
-               ifr.ifr_flags |= IFF_UP;
-       else
-               ifr.ifr_flags &= ~IFF_UP;
-
-       if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) {
-               perror("ioctl[SIOCSIFFLAGS]");
-               return -1;
-       }
-
-       return 0;
-}
-
 static int
-bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
+bsd_set_ieee8021x(int s, const char *ifname, struct wpa_bss_params *params)
 {
-       struct bsd_driver_data *drv = priv;
-
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, params->enabled);
 
        if (!params->enabled) {
                /* XXX restore state */
-               return set80211param(priv, IEEE80211_IOC_AUTHMODE,
+               return bsd_set80211param(s, ifname, IEEE80211_IOC_AUTHMODE,
                        IEEE80211_AUTH_AUTO);
        }
        if (!params->wpa && !params->ieee802_1x) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "No 802.1X or WPA enabled!");
+               wpa_printf(MSG_ERROR, "%s: No 802.1X or WPA enabled",
+                          __func__);
                return -1;
        }
-       if (params->wpa && bsd_configure_wpa(drv) != 0) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "Error configuring WPA state!");
+       if (params->wpa && bsd_configure_wpa(s, ifname, params) != 0) {
+               wpa_printf(MSG_ERROR, "%s: Failed to configure WPA state",
+                          __func__);
                return -1;
        }
-       if (set80211param(priv, IEEE80211_IOC_AUTHMODE,
+       if (bsd_set80211param(s, ifname, IEEE80211_IOC_AUTHMODE,
                (params->wpa ? IEEE80211_AUTH_WPA : IEEE80211_AUTH_8021X))) {
-               hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
-                       HOSTAPD_LEVEL_WARNING, "Error enabling WPA/802.1X!");
+               wpa_printf(MSG_ERROR, "%s: Failed to enable WPA/802.1X",
+                          __func__);
                return -1;
        }
-       return bsd_set_iface_flags(priv, 1);
+       return bsd_ctrl_iface(s, ifname, 1);
 }
 
 static int
-bsd_set_privacy(const char *ifname, void *priv, int enabled)
+bsd_set_sta_authorized(int s, const char *ifname, const u8 *addr,
+                      int total_flags, int flags_or, int flags_and)
 {
-       struct bsd_driver_data *drv = priv;
+       int authorized = -1;
 
-       wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
+       /* For now, only support setting Authorized flag */
+       if (flags_or & WPA_STA_AUTHORIZED)
+               authorized = 1;
+       if (!(flags_and & WPA_STA_AUTHORIZED))
+               authorized = 0;
 
-       return set80211param(drv, IEEE80211_IOC_PRIVACY, enabled);
+       if (authorized < 0)
+               return 0;
+
+       return bsd_send_mlme_param(s, ifname, authorized ?
+                                  IEEE80211_MLME_AUTHORIZE :
+                                  IEEE80211_MLME_UNAUTHORIZE, 0, addr);
+}
+
+static void
+bsd_new_sta(int s, const char *ifname, void *ctx, u8 addr[IEEE80211_ADDR_LEN])
+{
+       struct ieee80211req_wpaie ie;
+       int ielen = 0;
+       u8 *iebuf = NULL;
+
+       /*
+        * Fetch and validate any negotiated WPA/RSN parameters.
+        */
+       memset(&ie, 0, sizeof(ie));
+       memcpy(ie.wpa_macaddr, addr, IEEE80211_ADDR_LEN);
+       if (bsd_get80211var(s, ifname, IEEE80211_IOC_WPAIE,
+                           &ie, sizeof(ie)) < 0) {
+               printf("Failed to get WPA/RSN information element.\n");
+               goto no_ie;
+       }
+       iebuf = ie.wpa_ie;
+       ielen = ie.wpa_ie[1];
+       if (ielen == 0)
+               iebuf = NULL;
+       else
+               ielen += 2;
+
+no_ie:
+       drv_event_assoc(ctx, addr, iebuf, ielen);
 }
 
 static int
-bsd_set_sta_authorized(void *priv, const u8 *addr, int authorized)
+bsd_send_eapol(struct l2_packet_data *sock_xmit, const u8 *addr,
+              const u8 *data, size_t data_len)
 {
-       struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
+       wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", data, data_len);
+
+       return l2_packet_send(sock_xmit, addr, ETH_P_EAPOL, data, data_len);
+}
 
-       wpa_printf(MSG_DEBUG, "%s: addr=%s authorized=%d",
-                  __func__, ether_sprintf(addr), authorized);
+static int
+bsd_set_freq(int s, const char *ifname, u16 channel)
+{
+       struct ieee80211chanreq creq;
+       u32 mode;
 
-       if (authorized)
-               mlme.im_op = IEEE80211_MLME_AUTHORIZE;
+       if (channel < 14)
+               mode = IFM_IEEE80211_11G;
+       else if (channel == 14)
+               mode = IFM_IEEE80211_11B;
        else
-               mlme.im_op = IEEE80211_MLME_UNAUTHORIZE;
-       mlme.im_reason = 0;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+               mode = IFM_IEEE80211_11A;
+       if (bsd_set_mediaopt(s, ifname, IFM_MMASK, mode) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set modulation mode",
+                          __func__);
+               return -1;
+       }
+
+       os_memset(&creq, 0, sizeof(creq));
+       os_strlcpy(creq.i_name, ifname, sizeof(creq.i_name));
+       creq.i_channel = channel;
+       return ioctl(s, SIOCS80211CHANNEL, &creq);
 }
 
+
+#ifdef HOSTAPD
+
+/*
+ * Avoid conflicts with hostapd definitions by undefining couple of defines
+ * from net80211 header files.
+ */
+#undef RSN_VERSION
+#undef WPA_VERSION
+#undef WPA_OUI_TYPE
+
+struct bsd_driver_data {
+       struct hostapd_data *hapd;              /* back pointer */
+
+       char    iface[IFNAMSIZ + 1];
+       struct l2_packet_data *sock_xmit;       /* raw packet xmit socket */
+       int     ioctl_sock;                     /* socket for ioctl() use */
+       int     wext_sock;                      /* socket for wireless events */
+};
+
+static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
+                         int reason_code);
+
 static int
-bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags, int flags_or,
-                 int flags_and)
+get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len)
 {
-       /* For now, only support setting Authorized flag */
-       if (flags_or & WLAN_STA_AUTHORIZED)
-               return bsd_set_sta_authorized(priv, addr, 1);
-       if (!(flags_and & WLAN_STA_AUTHORIZED))
-               return bsd_set_sta_authorized(priv, addr, 0);
-       return 0;
+       return bsd_get80211var(drv->ioctl_sock, drv->iface, op, arg, arg_len);
 }
 
 static int
-bsd_del_key(void *priv, const u8 *addr, int key_idx)
+set80211param(struct bsd_driver_data *drv, int op, int arg)
+{
+       return bsd_set80211param(drv->ioctl_sock, drv->iface, op, arg);
+}
+
+static const char *
+ether_sprintf(const u8 *addr)
+{
+       static char buf[sizeof(MACSTR)];
+
+       if (addr != NULL)
+               snprintf(buf, sizeof(buf), MACSTR, MAC2STR(addr));
+       else
+               snprintf(buf, sizeof(buf), MACSTR, 0,0,0,0,0,0);
+       return buf;
+}
+
+static int
+hostapd_bsd_ctrl_iface(struct bsd_driver_data *drv, int enable)
+{
+       return bsd_ctrl_iface(drv->ioctl_sock, drv->iface, enable);
+}
+
+static int
+bsd_set_privacy(const char *ifname, void *priv, int enabled)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_del_key wk;
 
-       wpa_printf(MSG_DEBUG, "%s: addr=%s key_idx=%d",
-                  __func__, ether_sprintf(addr), key_idx);
+       wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
 
-       memset(&wk, 0, sizeof(wk));
-       if (addr != NULL) {
-               memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
-               wk.idk_keyix = (u_int8_t) IEEE80211_KEYIX_NONE; /* XXX */
-       } else {
-               wk.idk_keyix = key_idx;
-       }
+       return set80211param(drv, IEEE80211_IOC_PRIVACY, enabled);
+}
 
-       return set80211var(drv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk));
+static int
+hostapd_bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags,
+                         int flags_or, int flags_and)
+{
+       struct bsd_driver_data *drv = priv;
+
+       return bsd_set_sta_authorized(drv->ioctl_sock, drv->iface, addr,
+                                     total_flags, flags_or, flags_and);
 }
 
 static int
-bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
+hostapd_bsd_set_key(const char *ifname, void *priv, enum 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)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_key wk;
-       u_int8_t cipher;
 
        if (alg == WPA_ALG_NONE)
-               return bsd_del_key(drv, addr, key_idx);
-
-       wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%s key_idx=%d",
-                  __func__, alg, ether_sprintf(addr), key_idx);
-
-       if (alg == WPA_ALG_WEP)
-               cipher = IEEE80211_CIPHER_WEP;
-       else if (alg == WPA_ALG_TKIP)
-               cipher = IEEE80211_CIPHER_TKIP;
-       else if (alg == WPA_ALG_CCMP)
-               cipher = IEEE80211_CIPHER_AES_CCM;
-       else {
-               printf("%s: unknown/unsupported algorithm %d\n",
-                       __func__, alg);
-               return -1;
-       }
-
-       if (key_len > sizeof(wk.ik_keydata)) {
-               printf("%s: key length %d too big\n", __func__, (int) key_len);
-               return -3;
-       }
+               return bsd_del_key(drv->ioctl_sock, drv->iface, addr, key_idx);
 
-       memset(&wk, 0, sizeof(wk));
-       wk.ik_type = cipher;
-       wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT;
-       if (addr == NULL) {
-               memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
-               wk.ik_keyix = key_idx;
-               wk.ik_flags |= IEEE80211_KEY_DEFAULT;
-       } else {
-               memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
-               wk.ik_keyix = IEEE80211_KEYIX_NONE;
-       }
-       wk.ik_keylen = key_len;
-       memcpy(wk.ik_keydata, key, key_len);
-
-       return set80211var(drv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk));
+       return bsd_set_key(drv->ioctl_sock, drv->iface, alg, addr, key_idx,
+                          set_tx, seq, seq_len, key, key_len);
 }
 
 
@@ -543,15 +681,9 @@ static int
 bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr, int reason_code)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
-
-       wpa_printf(MSG_DEBUG, "%s: addr=%s reason_code=%d",
-                  __func__, ether_sprintf(addr), reason_code);
 
-       mlme.im_op = IEEE80211_MLME_DEAUTH;
-       mlme.im_reason = reason_code;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
+                                  IEEE80211_MLME_DEAUTH, reason_code, addr);
 }
 
 static int
@@ -559,50 +691,15 @@ bsd_sta_disassoc(void *priv, const u8 *own_addr, const u8 *addr,
                 int reason_code)
 {
        struct bsd_driver_data *drv = priv;
-       struct ieee80211req_mlme mlme;
-
-       wpa_printf(MSG_DEBUG, "%s: addr=%s reason_code=%d",
-                  __func__, ether_sprintf(addr), reason_code);
 
-       mlme.im_op = IEEE80211_MLME_DISASSOC;
-       mlme.im_reason = reason_code;
-       memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
-}
-
-static int
-bsd_new_sta(struct bsd_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
-{
-       struct hostapd_data *hapd = drv->hapd;
-       struct ieee80211req_wpaie ie;
-       int ielen = 0;
-       u8 *iebuf = NULL;
-
-       /*
-        * Fetch and validate any negotiated WPA/RSN parameters.
-        */
-       memset(&ie, 0, sizeof(ie));
-       memcpy(ie.wpa_macaddr, addr, IEEE80211_ADDR_LEN);
-       if (get80211var(drv, IEEE80211_IOC_WPAIE, &ie, sizeof(ie)) < 0) {
-               printf("Failed to get WPA/RSN information element.\n");
-               goto no_ie;
-       }
-       iebuf = ie.wpa_ie;
-       ielen = ie.wpa_ie[1];
-       if (ielen == 0)
-               iebuf = NULL;
-       else
-               ielen += 2;
-
-no_ie:
-       return hostapd_notif_assoc(hapd, addr, iebuf, ielen);
+       return bsd_send_mlme_param(drv->ioctl_sock, drv->iface,
+                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
 }
 
 static void
 bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
 {
        struct bsd_driver_data *drv = ctx;
-       struct hostapd_data *hapd = drv->hapd;
        char buf[2048];
        struct if_announcemsghdr *ifan;
        struct rt_msghdr *rtm;
@@ -610,6 +707,7 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
        struct ieee80211_join_event *join;
        struct ieee80211_leave_event *leave;
        int n;
+       union wpa_event_data data;
 
        n = read(sock, buf, sizeof(buf));
        if (n < 0) {
@@ -635,14 +733,15 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
                        break;
                case RTM_IEEE80211_LEAVE:
                        leave = (struct ieee80211_leave_event *) &ifan[1];
-                       hostapd_notif_disassoc(drv->hapd, leave->iev_addr);
+                       drv_event_disassoc(drv->hapd, leave->iev_addr);
                        break;
                case RTM_IEEE80211_JOIN:
 #ifdef RTM_IEEE80211_REJOIN
                case RTM_IEEE80211_REJOIN:
 #endif
                        join = (struct ieee80211_join_event *) &ifan[1];
-                       bsd_new_sta(drv, join->iev_addr);
+                       bsd_new_sta(drv->ioctl_sock, drv->iface, drv->hapd,
+                                   join->iev_addr);
                        break;
                case RTM_IEEE80211_REPLAY:
                        /* ignore */
@@ -653,7 +752,11 @@ bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
                                "Michael MIC failure wireless event: "
                                "keyix=%u src_addr=" MACSTR, mic->iev_keyix,
                                MAC2STR(mic->iev_src));
-                       hostapd_michael_mic_failure(hapd, mic->iev_src);
+                       os_memset(&data, 0, sizeof(data));
+                       data.michael_mic_failure.unicast = 1;
+                       data.michael_mic_failure.src = mic->iev_src;
+                       wpa_supplicant_event(drv->hapd,
+                                            EVENT_MICHAEL_MIC_FAILURE, &data);
                        break;
                }
                break;
@@ -687,55 +790,19 @@ bsd_wireless_event_deinit(struct bsd_driver_data *drv)
        close(drv->wext_sock);
 }
 
-
 static int
-bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len,
-              int encrypt, const u8 *own_addr)
+hostapd_bsd_send_eapol(void *priv, const u8 *addr, const u8 *data,
+                      size_t data_len, int encrypt, const u8 *own_addr)
 {
        struct bsd_driver_data *drv = priv;
-       unsigned char buf[3000];
-       unsigned char *bp = buf;
-       struct l2_ethhdr *eth;
-       size_t len;
-       int status;
-
-       /*
-        * Prepend the Etherent header.  If the caller left us
-        * space at the front we could just insert it but since
-        * we don't know we copy to a local buffer.  Given the frequency
-        * and size of frames this probably doesn't matter.
-        */
-       len = data_len + sizeof(struct l2_ethhdr);
-       if (len > sizeof(buf)) {
-               bp = malloc(len);
-               if (bp == NULL) {
-                       printf("EAPOL frame discarded, cannot malloc temp "
-                              "buffer of size %u!\n", (unsigned int) len);
-                       return -1;
-               }
-       }
-       eth = (struct l2_ethhdr *) bp;
-       memcpy(eth->h_dest, addr, ETH_ALEN);
-       memcpy(eth->h_source, own_addr, ETH_ALEN);
-       eth->h_proto = htons(ETH_P_EAPOL);
-       memcpy(eth+1, data, data_len);
-
-       wpa_hexdump(MSG_MSGDUMP, "TX EAPOL", bp, len);
-
-       status = l2_packet_send(drv->sock_xmit, addr, ETH_P_EAPOL, bp, len);
-
-       if (bp != buf)
-               free(bp);
-       return status;
+       return bsd_send_eapol(drv->sock_xmit, addr, data, data_len);
 }
 
 static void
 handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
 {
        struct bsd_driver_data *drv = ctx;
-       hostapd_eapol_receive(drv->hapd, src_addr,
-                             buf + sizeof(struct l2_ethhdr),
-                             len - sizeof(struct l2_ethhdr));
+       drv_event_eapol_rx(drv->hapd, src_addr, buf, len);
 }
 
 static int
@@ -760,6 +827,22 @@ hostapd_bsd_set_ssid(const char *ifname, void *priv, const u8 *buf, int len)
        return bsd_set_ssid(drv->ioctl_sock, drv->iface, buf, len);
 }
 
+static int
+hostapd_bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
+{
+       struct bsd_driver_data *drv = priv;
+
+       return bsd_set_ieee8021x(drv->ioctl_sock, drv->iface, params);
+}
+
+static int
+hostapd_bsd_set_freq(void *priv, struct hostapd_freq_params *freq)
+{
+       struct bsd_driver_data *drv = priv;
+
+       return bsd_set_freq(drv->ioctl_sock, drv->iface, freq->channel);
+}
+
 static void *
 bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 {
@@ -780,16 +863,25 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
        memcpy(drv->iface, params->ifname, sizeof(drv->iface));
 
        drv->sock_xmit = l2_packet_init(drv->iface, NULL, ETH_P_EAPOL,
-                                       handle_read, drv, 1);
+                                       handle_read, drv, 0);
        if (drv->sock_xmit == NULL)
                goto bad;
        if (l2_packet_get_own_addr(drv->sock_xmit, params->own_addr))
                goto bad;
 
-       bsd_set_iface_flags(drv, 0);    /* mark down during setup */
+       /* mark down during setup */
+       if (hostapd_bsd_ctrl_iface(drv, 0) < 0)
+               goto bad;
        if (bsd_wireless_event_init(drv))
                goto bad;
 
+       if (bsd_set_mediaopt(drv->ioctl_sock, drv->iface, IFM_OMASK,
+                            IFM_IEEE80211_HOSTAP) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
+               goto bad;
+       }
+
        return drv;
 bad:
        if (drv->sock_xmit != NULL)
@@ -797,7 +889,7 @@ bad:
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv != NULL)
-               free(drv);
+               os_free(drv);
        return NULL;
 }
 
@@ -808,41 +900,45 @@ bsd_deinit(void *priv)
        struct bsd_driver_data *drv = priv;
 
        bsd_wireless_event_deinit(drv);
-       (void) bsd_set_iface_flags(drv, 0);
+       hostapd_bsd_ctrl_iface(drv, 0);
        if (drv->ioctl_sock >= 0)
                close(drv->ioctl_sock);
        if (drv->sock_xmit != NULL)
                l2_packet_deinit(drv->sock_xmit);
-       free(drv);
+       os_free(drv);
 }
 
 const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .name                   = "bsd",
        .hapd_init              = bsd_init,
        .hapd_deinit            = bsd_deinit,
-       .set_ieee8021x          = bsd_set_ieee8021x,
+       .set_ieee8021x          = hostapd_bsd_set_ieee8021x,
        .set_privacy            = bsd_set_privacy,
-       .set_key                = bsd_set_key,
+       .set_key                = hostapd_bsd_set_key,
        .get_seqnum             = bsd_get_seqnum,
        .flush                  = bsd_flush,
        .set_generic_elem       = bsd_set_opt_ie,
-       .sta_set_flags          = bsd_sta_set_flags,
+       .sta_set_flags          = hostapd_bsd_sta_set_flags,
        .read_sta_data          = bsd_read_sta_driver_data,
-       .hapd_send_eapol        = bsd_send_eapol,
+       .hapd_send_eapol        = hostapd_bsd_send_eapol,
        .sta_disassoc           = bsd_sta_disassoc,
        .sta_deauth             = bsd_sta_deauth,
        .hapd_set_ssid          = hostapd_bsd_set_ssid,
        .hapd_get_ssid          = hostapd_bsd_get_ssid,
+       .set_freq               = hostapd_bsd_set_freq,
 };
 
 #else /* HOSTAPD */
 
 struct wpa_driver_bsd_data {
        int     sock;                   /* open socket for 802.11 ioctls */
+       struct l2_packet_data *sock_xmit;/* raw packet xmit socket */
        int     route;                  /* routing socket for events */
        char    ifname[IFNAMSIZ+1];     /* interface name */
        unsigned int ifindex;           /* interface index */
        void    *ctx;
+       struct wpa_driver_capa capa;    /* driver capability */
+       int     is_ap;                  /* Access point mode */
        int     prev_roaming;           /* roaming state to restore on deinit */
        int     prev_privacy;           /* privacy state to restore on deinit */
        int     prev_wpa;               /* wpa state to restore on deinit */
@@ -884,36 +980,6 @@ get80211param(struct wpa_driver_bsd_data *drv, int op)
 }
 
 static int
-getifflags(struct wpa_driver_bsd_data *drv, int *flags)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
-       if (ioctl(drv->sock, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
-               perror("SIOCGIFFLAGS");
-               return errno;
-       }
-       *flags = ifr.ifr_flags & 0xffff;
-       return 0;
-}
-
-static int
-setifflags(struct wpa_driver_bsd_data *drv, int flags)
-{
-       struct ifreq ifr;
-
-       os_memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
-       ifr.ifr_flags = flags & 0xffff;
-       if (ioctl(drv->sock, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-               perror("SIOCSIFFLAGS");
-               return errno;
-       }
-       return 0;
-}
-
-static int
 wpa_driver_bsd_get_bssid(void *priv, u8 *bssid)
 {
        struct wpa_driver_bsd_data *drv = priv;
@@ -963,7 +1029,11 @@ static int
 wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_data *drv,
        const u8 *wpa_ie, size_t wpa_ie_len)
 {
+#ifdef IEEE80211_IOC_APPIE
+       return set80211var(drv, IEEE80211_IOC_APPIE, wpa_ie, wpa_ie_len);
+#else /* IEEE80211_IOC_APPIE */
        return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len);
+#endif /* IEEE80211_IOC_APPIE */
 }
 
 static int
@@ -994,103 +1064,26 @@ wpa_driver_bsd_set_wpa(void *priv, int enabled)
 }
 
 static int
-wpa_driver_bsd_del_key(struct wpa_driver_bsd_data *drv, int key_idx,
-                      const unsigned char *addr)
-{
-       struct ieee80211req_del_key wk;
-
-       os_memset(&wk, 0, sizeof(wk));
-       if (addr != NULL &&
-           bcmp(addr, "\xff\xff\xff\xff\xff\xff", IEEE80211_ADDR_LEN) != 0) {
-               struct ether_addr ea;
-
-               os_memcpy(&ea, addr, IEEE80211_ADDR_LEN);
-               wpa_printf(MSG_DEBUG, "%s: addr=%s keyidx=%d",
-                       __func__, ether_ntoa(&ea), key_idx);
-               os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
-               wk.idk_keyix = (uint8_t) IEEE80211_KEYIX_NONE;
-       } else {
-               wpa_printf(MSG_DEBUG, "%s: keyidx=%d", __func__, key_idx);
-               wk.idk_keyix = key_idx;
-       }
-       return set80211var(drv, IEEE80211_IOC_DELKEY, &wk, sizeof(wk));
-}
-
-static int
-wpa_driver_bsd_set_key(const char *ifname, void *priv, wpa_alg alg,
+wpa_driver_bsd_set_key(const char *ifname, void *priv, enum wpa_alg alg,
                       const unsigned char *addr, int key_idx, int set_tx,
                       const u8 *seq, size_t seq_len,
                       const u8 *key, size_t key_len)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       struct ieee80211req_key wk;
-       struct ether_addr ea;
-       char *alg_name;
-       u_int8_t cipher;
-
-       if (alg == WPA_ALG_NONE)
-               return wpa_driver_bsd_del_key(drv, key_idx, addr);
-
-       switch (alg) {
-       case WPA_ALG_WEP:
-               alg_name = "WEP";
-               cipher = IEEE80211_CIPHER_WEP;
-               break;
-       case WPA_ALG_TKIP:
-               alg_name = "TKIP";
-               cipher = IEEE80211_CIPHER_TKIP;
-               break;
-       case WPA_ALG_CCMP:
-               alg_name = "CCMP";
-               cipher = IEEE80211_CIPHER_AES_CCM;
-               break;
-       default:
-               wpa_printf(MSG_DEBUG, "%s: unknown/unsupported algorithm %d",
-                       __func__, alg);
-               return -1;
-       }
 
-       os_memcpy(&ea, addr, IEEE80211_ADDR_LEN);
-       wpa_printf(MSG_DEBUG,
-               "%s: alg=%s addr=%s key_idx=%d set_tx=%d seq_len=%zu key_len=%zu",
-               __func__, alg_name, ether_ntoa(&ea), key_idx, set_tx,
-               seq_len, key_len);
-
-       if (seq_len > sizeof(u_int64_t)) {
-               wpa_printf(MSG_DEBUG, "%s: seq_len %zu too big",
-                       __func__, seq_len);
-               return -2;
-       }
-       if (key_len > sizeof(wk.ik_keydata)) {
-               wpa_printf(MSG_DEBUG, "%s: key length %zu too big",
-                       __func__, key_len);
-               return -3;
-       }
-
-       os_memset(&wk, 0, sizeof(wk));
-       wk.ik_type = cipher;
-       wk.ik_flags = IEEE80211_KEY_RECV;
-       if (set_tx)
-               wk.ik_flags |= IEEE80211_KEY_XMIT;
-       os_memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
-       /*
-        * Deduce whether group/global or unicast key by checking
-        * the address (yech).  Note also that we can only mark global
-        * keys default; doing this for a unicast key is an error.
-        */
-       if (bcmp(addr, "\xff\xff\xff\xff\xff\xff", IEEE80211_ADDR_LEN) == 0) {
-               wk.ik_flags |= IEEE80211_KEY_GROUP;
-               wk.ik_keyix = key_idx;
-       } else {
-               wk.ik_keyix = (key_idx == 0 ? IEEE80211_KEYIX_NONE : key_idx);
+       if (alg == WPA_ALG_NONE) {
+               if (addr == NULL ||
+                   os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
+                             IEEE80211_ADDR_LEN) == 0)
+                       return bsd_del_key(drv->sock, drv->ifname, NULL,
+                                          key_idx);
+               else
+                       return bsd_del_key(drv->sock, drv->ifname, addr,
+                                          key_idx);
        }
-       if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
-               wk.ik_flags |= IEEE80211_KEY_DEFAULT;
-       wk.ik_keylen = key_len;
-       os_memcpy(&wk.ik_keyrsc, seq, seq_len);
-       os_memcpy(wk.ik_keydata, key, key_len);
 
-       return set80211var(drv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk));
+       return bsd_set_key(drv->sock, drv->ifname, alg, addr, key_idx, set_tx,
+                          seq, seq_len, key, key_len);
 }
 
 static int
@@ -1116,28 +1109,18 @@ static int
 wpa_driver_bsd_deauthenticate(void *priv, const u8 *addr, int reason_code)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s", __func__);
-       os_memset(&mlme, 0, sizeof(mlme));
-       mlme.im_op = IEEE80211_MLME_DEAUTH;
-       mlme.im_reason = reason_code;
-       os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->sock, drv->ifname,
+                                  IEEE80211_MLME_DEAUTH, reason_code, addr);
 }
 
 static int
 wpa_driver_bsd_disassociate(void *priv, const u8 *addr, int reason_code)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       struct ieee80211req_mlme mlme;
 
-       wpa_printf(MSG_DEBUG, "%s", __func__);
-       os_memset(&mlme, 0, sizeof(mlme));
-       mlme.im_op = IEEE80211_MLME_DISASSOC;
-       mlme.im_reason = reason_code;
-       os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
-       return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme));
+       return bsd_send_mlme_param(drv->sock, drv->ifname,
+                                  IEEE80211_MLME_DISASSOC, reason_code, addr);
 }
 
 static int
@@ -1146,10 +1129,10 @@ wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
        struct wpa_driver_bsd_data *drv = priv;
        int authmode;
 
-       if ((auth_alg & AUTH_ALG_OPEN_SYSTEM) &&
-           (auth_alg & AUTH_ALG_SHARED_KEY))
+       if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
+           (auth_alg & WPA_AUTH_ALG_SHARED))
                authmode = IEEE80211_AUTH_AUTO;
-       else if (auth_alg & AUTH_ALG_SHARED_KEY)
+       else if (auth_alg & WPA_AUTH_ALG_SHARED)
                authmode = IEEE80211_AUTH_SHARED;
        else
                authmode = IEEE80211_AUTH_OPEN;
@@ -1157,11 +1140,21 @@ wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
        return set80211param(drv, IEEE80211_IOC_AUTHMODE, authmode);
 }
 
+static void
+handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
+{
+       struct wpa_driver_bsd_data *drv = ctx;
+
+       drv_event_eapol_rx(drv->ctx, src_addr, buf, len);
+}
+
 static int
 wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
 {
        struct wpa_driver_bsd_data *drv = priv;
        struct ieee80211req_mlme mlme;
+       u32 mode;
+       u16 channel;
        int privacy;
        int ret = 0;
 
@@ -1175,6 +1168,47 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
                , params->key_mgmt_suite
        );
 
+       switch (params->mode) {
+       case IEEE80211_MODE_INFRA:
+               mode = 0 /* STA */;
+               break;
+       case IEEE80211_MODE_IBSS:
+               mode = IFM_IEEE80211_IBSS;
+               break;
+       case IEEE80211_MODE_AP:
+               mode = IFM_IEEE80211_HOSTAP;
+               break;
+       default:
+               wpa_printf(MSG_ERROR, "%s: unknown operation mode", __func__);
+               return -1;
+       }
+       if (bsd_set_mediaopt(drv->sock, drv->ifname, IFM_OMASK, mode) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
+               return -1;
+       }
+
+       if (params->mode == IEEE80211_MODE_AP) {
+               if (params->freq >= 2412 && params->freq <= 2472)
+                       channel = (params->freq - 2407) / 5;
+               else if (params->freq == 2484)
+                       channel = 14;
+               else if ((params->freq >= 5180 && params->freq <= 5240) ||
+                        (params->freq >= 5745 && params->freq <= 5825))
+                       channel = (params->freq - 5000) / 5;
+               else
+                       channel = 0;
+               if (bsd_set_freq(drv->sock, drv->ifname, channel) < 0)
+                       return -1;
+
+               drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
+                                               handle_read, drv, 0);
+               if (drv->sock_xmit == NULL)
+                       return -1;
+               drv->is_ap = 1;
+               return 0;
+       }
+
        if (wpa_driver_bsd_set_drop_unencrypted(drv, params->drop_unencrypted)
            < 0)
                ret = -1;
@@ -1211,15 +1245,34 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
 }
 
 static int
+wpa_driver_bsd_ctrl_iface(struct wpa_driver_bsd_data *drv, int enable)
+{
+       return bsd_ctrl_iface(drv->sock, drv->ifname, enable);
+}
+
+static int
 wpa_driver_bsd_scan(void *priv, struct wpa_driver_scan_params *params)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       int flags;
        const u8 *ssid = params->ssids[0].ssid;
        size_t ssid_len = params->ssids[0].ssid_len;
 
+       if (set80211param(drv, IEEE80211_IOC_ROAMING,
+                         IEEE80211_ROAMING_MANUAL) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set "
+                          "wpa_supplicant-based roaming: %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
+       if (wpa_driver_bsd_set_wpa(drv, 1) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set wpa: %s", __func__,
+                          strerror(errno));
+               return -1;
+       }
+
        /* NB: interface must be marked UP to do a scan */
-       if (getifflags(drv, &flags) != 0 || setifflags(drv, flags | IFF_UP) != 0)
+       if (wpa_driver_bsd_ctrl_iface(drv, 1) < 0)
                return -1;
 
        /* set desired ssid before scan */
@@ -1240,6 +1293,8 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
        struct rt_msghdr *rtm;
        union wpa_event_data event;
        struct ieee80211_michael_event *mic;
+       struct ieee80211_leave_event *leave;
+       struct ieee80211_join_event *join;
        int n;
 
        n = read(sock, buf, sizeof(buf));
@@ -1282,14 +1337,32 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
                switch (ifan->ifan_what) {
                case RTM_IEEE80211_ASSOC:
                case RTM_IEEE80211_REASSOC:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_ASSOC, NULL);
                        break;
                case RTM_IEEE80211_DISASSOC:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL);
                        break;
                case RTM_IEEE80211_SCAN:
+                       if (drv->is_ap)
+                               break;
                        wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL);
                        break;
+               case RTM_IEEE80211_LEAVE:
+                       leave = (struct ieee80211_leave_event *) &ifan[1];
+                       drv_event_disassoc(ctx, leave->iev_addr);
+                       break;
+               case RTM_IEEE80211_JOIN:
+#ifdef RTM_IEEE80211_REJOIN
+               case RTM_IEEE80211_REJOIN:
+#endif
+                       join = (struct ieee80211_join_event *) &ifan[1];
+                       bsd_new_sta(drv->sock, drv->ifname, ctx,
+                                   join->iev_addr);
+                       break;
                case RTM_IEEE80211_REPLAY:
                        /* ignore */
                        break;
@@ -1414,6 +1487,27 @@ wpa_driver_bsd_get_scan_results2(void *priv)
        return res;
 }
 
+static int wpa_driver_bsd_capa(struct wpa_driver_bsd_data *drv)
+{
+       /* For now, assume TKIP, CCMP, WPA, WPA2 are supported */
+       drv->capa.key_mgmt = WPA_DRIVER_CAPA_KEY_MGMT_WPA |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
+               WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK;
+       drv->capa.enc = WPA_DRIVER_CAPA_ENC_WEP40 |
+               WPA_DRIVER_CAPA_ENC_WEP104 |
+               WPA_DRIVER_CAPA_ENC_TKIP |
+               WPA_DRIVER_CAPA_ENC_CCMP;
+       drv->capa.auth = WPA_DRIVER_AUTH_OPEN |
+               WPA_DRIVER_AUTH_SHARED |
+               WPA_DRIVER_AUTH_LEAP;
+
+       //drv->capa.max_scan_ssids = info.max_scan_ssids;
+       drv->capa.flags |= WPA_DRIVER_FLAGS_AP;
+
+       return 0;
+}
+
 static void *
 wpa_driver_bsd_init(void *ctx, const char *ifname)
 {
@@ -1448,6 +1542,10 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
        drv->ctx = ctx;
        os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
 
+       /* Down interface during setup. */
+       if (wpa_driver_bsd_ctrl_iface(drv, 0) < 0)
+               goto fail;
+
        if (!GETPARAM(drv, IEEE80211_IOC_ROAMING, drv->prev_roaming)) {
                wpa_printf(MSG_DEBUG, "%s: failed to get roaming state: %s",
                        __func__, strerror(errno));
@@ -1463,19 +1561,16 @@ wpa_driver_bsd_init(void *ctx, const char *ifname)
                        __func__, strerror(errno));
                goto fail;
        }
-       if (set80211param(drv, IEEE80211_IOC_ROAMING, IEEE80211_ROAMING_MANUAL) < 0) {
-               wpa_printf(MSG_DEBUG, "%s: failed to set wpa_supplicant-based "
-                          "roaming: %s", __func__, strerror(errno));
-               goto fail;
-       }
 
-       if (set80211param(drv, IEEE80211_IOC_WPA, 1+2) < 0) {
-               wpa_printf(MSG_DEBUG, "%s: failed to enable WPA support %s",
-                          __func__, strerror(errno));
+       if (bsd_set_mediaopt(drv->sock, drv->ifname, IFM_OMASK,
+                            0 /* STA */) < 0) {
+               wpa_printf(MSG_ERROR, "%s: failed to set operation mode",
+                          __func__);
                goto fail;
        }
 
-       wpa_driver_bsd_set_wpa(drv, 1);
+       if (wpa_driver_bsd_capa(drv))
+               goto fail;
 
        return drv;
 fail:
@@ -1490,25 +1585,74 @@ static void
 wpa_driver_bsd_deinit(void *priv)
 {
        struct wpa_driver_bsd_data *drv = priv;
-       int flags;
 
        wpa_driver_bsd_set_wpa(drv, 0);
        eloop_unregister_read_sock(drv->route);
 
        /* NB: mark interface down */
-       if (getifflags(drv, &flags) == 0)
-               (void) setifflags(drv, flags &~ IFF_UP);
+       wpa_driver_bsd_ctrl_iface(drv, 0);
 
        wpa_driver_bsd_set_wpa_internal(drv, drv->prev_wpa, drv->prev_privacy);
        if (set80211param(drv, IEEE80211_IOC_ROAMING, drv->prev_roaming) < 0)
                wpa_printf(MSG_DEBUG, "%s: failed to restore roaming state",
                        __func__);
 
+       if (drv->sock_xmit != NULL)
+               l2_packet_deinit(drv->sock_xmit);
        (void) close(drv->route);               /* ioctl socket */
        (void) close(drv->sock);                /* event socket */
        os_free(drv);
 }
 
+static int
+wpa_driver_bsd_get_capa(void *priv, struct wpa_driver_capa *capa)
+{
+       struct wpa_driver_bsd_data *drv = priv;
+
+       os_memcpy(capa, &drv->capa, sizeof(*capa));
+       return 0;
+}
+
+static int
+wpa_driver_bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
+{
+       struct wpa_driver_bsd_data *drv = priv;
+
+       return bsd_set_ieee8021x(drv->sock, drv->ifname, params);
+}
+
+static int
+wpa_driver_bsd_hapd_set_ssid(const char *ifname, void *priv, const u8 *buf,
+                            int len)
+{
+       return wpa_driver_bsd_set_ssid(priv, buf, len);
+}
+
+static int
+wpa_driver_bsd_hapd_get_ssid(const char *ifname, void *priv, u8 *buf, int len)
+{
+       return wpa_driver_bsd_get_ssid(priv, buf);
+}
+
+static int
+wpa_driver_bsd_send_eapol(void *priv, const u8 *addr, const u8 *data,
+                         size_t data_len, int encrypt, const u8 *own_addr)
+{
+       struct wpa_driver_bsd_data *drv = priv;
+
+       return bsd_send_eapol(drv->sock_xmit, addr, data, data_len);
+}
+
+static int
+wpa_driver_bsd_sta_set_flags(void *priv, const u8 *addr, int total_flags,
+                            int flags_or, int flags_and)
+{
+       struct wpa_driver_bsd_data *drv = priv;
+
+       return bsd_set_sta_authorized(drv->sock, drv->ifname, addr,
+                                     total_flags, flags_or, flags_and);
+}
+
 
 const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .name                   = "bsd",
@@ -1524,6 +1668,12 @@ const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .deauthenticate         = wpa_driver_bsd_deauthenticate,
        .disassociate           = wpa_driver_bsd_disassociate,
        .associate              = wpa_driver_bsd_associate,
+       .get_capa               = wpa_driver_bsd_get_capa,
+       .set_ieee8021x          = wpa_driver_bsd_set_ieee8021x,
+       .hapd_set_ssid          = wpa_driver_bsd_hapd_set_ssid,
+       .hapd_get_ssid          = wpa_driver_bsd_hapd_get_ssid,
+       .hapd_send_eapol        = wpa_driver_bsd_send_eapol,
+       .sta_set_flags          = wpa_driver_bsd_sta_set_flags,
 };
 
 #endif /* HOSTAPD */