atheros: Prefer WSC IE in (Re)Association Request frame

[mech_eap.git] / src / drivers / driver_atheros.c

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index ad78c2a..27107aa 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -74,6 +74,7 @@ struct madwifi_driver_data {
 
 static int madwifi_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
                              int reason_code);
+static int madwifi_set_privacy(void *priv, int enabled);
 
 static const char * athr_get_ioctl_name(int op)
 {
@@ -343,8 +344,11 @@ madwifi_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 
        if (!params->enabled) {
                /* XXX restore state */
-               return set80211param(priv, IEEE80211_PARAM_AUTHMODE,
-                       IEEE80211_AUTH_AUTO);
+               if (set80211param(priv, IEEE80211_PARAM_AUTHMODE,
+                                 IEEE80211_AUTH_AUTO) < 0)
+                       return -1;
+               /* IEEE80211_AUTH_AUTO ends up enabling Privacy; clear that */
+               return madwifi_set_privacy(drv, 0);
        }
        if (!params->wpa && !params->ieee802_1x) {
                hostapd_logger(drv->hapd, NULL, HOSTAPD_MODULE_DRIVER,
@@ -733,7 +737,7 @@ static int
 madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 {
        struct madwifi_driver_data *drv = priv;
-       u8 buf[256];
+       u8 buf[500];
        struct ieee80211req_getset_appiebuf *beac_ie;
 
        wpa_printf(MSG_DEBUG, "%s buflen = %lu", __func__,
@@ -750,8 +754,12 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 
 static int
 madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
-                     const struct wpabuf *proberesp)
+                     const struct wpabuf *proberesp,
+                     const struct wpabuf *assocresp)
 {
+       madwifi_set_wps_ie(priv, assocresp ? wpabuf_head(assocresp) : NULL,
+                          assocresp ? wpabuf_len(assocresp) : 0,
+                          IEEE80211_APPIE_FRAME_ASSOC_RESP);
        if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,
                               beacon ? wpabuf_len(beacon) : 0,
                               IEEE80211_APPIE_FRAME_BEACON))
@@ -791,6 +799,10 @@ madwifi_new_sta(struct madwifi_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
                    ie.wpa_ie, IEEE80211_MAX_OPT_IE);
        wpa_hexdump(MSG_MSGDUMP, "madwifi req RSN IE",
                    ie.rsn_ie, IEEE80211_MAX_OPT_IE);
+#ifdef ATH_WPS_IE
+       wpa_hexdump(MSG_MSGDUMP, "madwifi req WPS IE",
+                   ie.wps_ie, IEEE80211_MAX_OPT_IE);
+#endif /* ATH_WPS_IE */
        iebuf = ie.wpa_ie;
        /* madwifi seems to return some random data if WPA/RSN IE is not set.
         * Assume the IE was not included if the IE type is unknown. */
@@ -805,6 +817,16 @@ madwifi_new_sta(struct madwifi_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
        }
 
        ielen = iebuf[1];
+
+#ifdef ATH_WPS_IE
+       /* if WPS IE is present, preference is given to WPS */
+       if (ie.wps_ie &&
+           (ie.wps_ie[1] > 0 && (ie.wps_ie[0] == WLAN_EID_VENDOR_SPECIFIC))) {
+               iebuf = ie.wps_ie;
+               ielen = ie.wps_ie[1];
+       }
+#endif /* ATH_WPS_IE */
+
        if (ielen == 0)
                iebuf = NULL;
        else
@@ -1184,6 +1206,8 @@ madwifi_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 
        return drv;
 bad:
+       if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)
+               l2_packet_deinit(drv->sock_recv);
        if (drv->sock_xmit != NULL)
                l2_packet_deinit(drv->sock_xmit);
        if (drv->ioctl_sock >= 0)
@@ -1271,7 +1295,7 @@ madwifi_commit(void *priv)
 const struct wpa_driver_ops wpa_driver_atheros_ops = {
        .name                   = "atheros",
        .hapd_init              = madwifi_init,
-       .deinit                 = madwifi_deinit,
+       .hapd_deinit            = madwifi_deinit,
        .set_ieee8021x          = madwifi_set_ieee8021x,
        .set_privacy            = madwifi_set_privacy,
        .set_key                = madwifi_set_key,