WPS: Add MAC address to validation error message for Probe Request

[libeap.git] / hostapd / ctrl_iface.c

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 9c47ba8..bd25e1c 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -34,6 +34,7 @@
 #include "ap/accounting.h"
 #include "ap/wps_hostapd.h"
 #include "ap/ctrl_iface_ap.h"
+#include "wps/wps_defs.h"
 #include "ctrl_iface.h"
 
 
@@ -155,6 +156,59 @@ static int hostapd_ctrl_iface_new_sta(struct hostapd_data *hapd,
 }
 
 
+#ifdef CONFIG_P2P_MANAGER
+static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
+                                 u8 minor_reason_code, const u8 *addr)
+{
+       struct ieee80211_mgmt *mgmt;
+       int ret;
+       u8 *pos;
+
+       if (hapd->driver->send_frame == NULL)
+               return -1;
+
+       mgmt = os_zalloc(sizeof(*mgmt) + 100);
+       if (mgmt == NULL)
+               return -1;
+
+       wpa_printf(MSG_DEBUG, "P2P: Disconnect STA " MACSTR " with minor "
+                  "reason code %u (stype=%u)",
+                  MAC2STR(addr), minor_reason_code, stype);
+
+       mgmt->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT, stype);
+       os_memcpy(mgmt->da, addr, ETH_ALEN);
+       os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN);
+       os_memcpy(mgmt->bssid, hapd->own_addr, ETH_ALEN);
+       if (stype == WLAN_FC_STYPE_DEAUTH) {
+               mgmt->u.deauth.reason_code =
+                       host_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
+               pos = (u8 *) (&mgmt->u.deauth.reason_code + 1);
+       } else {
+               mgmt->u.disassoc.reason_code =
+                       host_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
+               pos = (u8 *) (&mgmt->u.disassoc.reason_code + 1);
+       }
+
+       *pos++ = WLAN_EID_VENDOR_SPECIFIC;
+       *pos++ = 4 + 3 + 1;
+       WPA_PUT_BE24(pos, OUI_WFA);
+       pos += 3;
+       *pos++ = P2P_OUI_TYPE;
+
+       *pos++ = P2P_ATTR_MINOR_REASON_CODE;
+       WPA_PUT_LE16(pos, 1);
+       pos += 2;
+       *pos++ = minor_reason_code;
+
+       ret = hapd->driver->send_frame(hapd->drv_priv, (u8 *) mgmt,
+                                      pos - (u8 *) mgmt, 1);
+       os_free(mgmt);
+
+       return ret < 0 ? -1 : 0;
+}
+#endif /* CONFIG_P2P_MANAGER */
+
+
 static int hostapd_ctrl_iface_deauthenticate(struct hostapd_data *hapd,
                                             const char *txtaddr)
 {
@@ -191,6 +245,14 @@ static int hostapd_ctrl_iface_deauthenticate(struct hostapd_data *hapd,
                return 0;
        }
 
+#ifdef CONFIG_P2P_MANAGER
+       pos = os_strstr(txtaddr, " p2p=");
+       if (pos) {
+               return p2p_manager_disconnect(hapd, WLAN_FC_STYPE_DEAUTH,
+                                             atoi(pos + 5), addr);
+       }
+#endif /* CONFIG_P2P_MANAGER */
+
        hapd->drv.sta_deauth(hapd, addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
        sta = ap_get_sta(hapd, addr);
        if (sta)
@@ -237,6 +299,14 @@ static int hostapd_ctrl_iface_disassociate(struct hostapd_data *hapd,
                return 0;
        }
 
+#ifdef CONFIG_P2P_MANAGER
+       pos = os_strstr(txtaddr, " p2p=");
+       if (pos) {
+               return p2p_manager_disconnect(hapd, WLAN_FC_STYPE_DISASSOC,
+                                             atoi(pos + 5), addr);
+       }
+#endif /* CONFIG_P2P_MANAGER */
+
        hapd->drv.sta_disassoc(hapd, addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
        sta = ap_get_sta(hapd, addr);
        if (sta)
@@ -275,6 +345,8 @@ static int hostapd_ctrl_iface_wps_pin(struct hostapd_data *hapd, char *txt)
        char *pin = os_strchr(txt, ' ');
        char *timeout_txt;
        int timeout;
+       u8 addr_buf[ETH_ALEN], *addr = NULL;
+       char *pos;
 
        if (pin == NULL)
                return -1;
@@ -284,10 +356,16 @@ static int hostapd_ctrl_iface_wps_pin(struct hostapd_data *hapd, char *txt)
        if (timeout_txt) {
                *timeout_txt++ = '\0';
                timeout = atoi(timeout_txt);
+               pos = os_strchr(timeout_txt, ' ');
+               if (pos) {
+                       *pos++ = '\0';
+                       if (hwaddr_aton(pos, addr_buf) == 0)
+                               addr = addr_buf;
+               }
        } else
                timeout = 0;
 
-       return hostapd_wps_add_pin(hapd, txt, pin, timeout);
+       return hostapd_wps_add_pin(hapd, addr, txt, pin, timeout);
 }
 
 
@@ -369,6 +447,46 @@ static int hostapd_ctrl_iface_wps_ap_pin(struct hostapd_data *hapd, char *txt,
 #endif /* CONFIG_WPS */
 
 
+static int hostapd_ctrl_iface_set(struct hostapd_data *wpa_s, char *cmd)
+{
+       char *value;
+       int ret = 0;
+
+       value = os_strchr(cmd, ' ');
+       if (value == NULL)
+               return -1;
+       *value++ = '\0';
+
+       wpa_printf(MSG_DEBUG, "CTRL_IFACE SET '%s'='%s'", cmd, value);
+       if (0) {
+#ifdef CONFIG_WPS_TESTING
+       } else if (os_strcasecmp(cmd, "wps_version_number") == 0) {
+               long int val;
+               val = strtol(value, NULL, 0);
+               if (val < 0 || val > 0xff) {
+                       ret = -1;
+                       wpa_printf(MSG_DEBUG, "WPS: Invalid "
+                                  "wps_version_number %ld", val);
+               } else {
+                       wps_version_number = val;
+                       wpa_printf(MSG_DEBUG, "WPS: Testing - force WPS "
+                                  "version %u.%u",
+                                  (wps_version_number & 0xf0) >> 4,
+                                  wps_version_number & 0x0f);
+               }
+       } else if (os_strcasecmp(cmd, "wps_testing_dummy_cred") == 0) {
+               wps_testing_dummy_cred = atoi(value);
+               wpa_printf(MSG_DEBUG, "WPS: Testing - dummy_cred=%d",
+                          wps_testing_dummy_cred);
+#endif /* CONFIG_WPS_TESTING */
+       } else {
+               ret = -1;
+       }
+
+       return ret;
+}
+
+
 static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                                       void *sock_ctx)
 {
@@ -483,6 +601,9 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                reply_len = hostapd_ctrl_iface_wps_ap_pin(hapd, buf + 11,
                                                          reply, reply_size);
 #endif /* CONFIG_WPS */
+       } else if (os_strncmp(buf, "SET ", 4) == 0) {
+               if (hostapd_ctrl_iface_set(hapd, buf + 4))
+                       reply_len = -1;
        } else {
                os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
                reply_len = 16;