#include "includes.h"
-#include "hostapd.h"
-#include "driver_i.h"
+#include "common.h"
#include "eloop.h"
#include "uuid.h"
-#include "wpa_ctrl.h"
-#include "ieee802_11_defs.h"
-#include "sta_info.h"
-#include "eapol_sm.h"
+#include "crypto/dh_groups.h"
+#include "common/wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
+#include "eapol_auth/eapol_auth_sm.h"
#include "wps/wps.h"
#include "wps/wps_defs.h"
#include "wps/wps_dev_attr.h"
+#include "hostapd.h"
+#include "driver_i.h"
+#include "sta_flags.h"
+#include "sta_info.h"
#include "wps_hostapd.h"
-#include "dh_groups.h"
#ifdef CONFIG_WPS_UPNP
static void hostapd_wps_upnp_deinit(struct hostapd_data *hapd);
#endif /* CONFIG_WPS_UPNP */
+static void hostapd_wps_probe_req_rx(void *ctx, const u8 *addr,
+ const u8 *ie, size_t ie_len);
+
static int hostapd_wps_new_psk_cb(void *ctx, const u8 *mac_addr, const u8 *psk,
size_t psk_len)
struct hostapd_data *hapd = ctx;
char uuid[40], txt[400];
int len;
+ char devtype[WPS_DEV_TYPE_BUFSIZE];
if (uuid_bin2str(uuid_e, uuid, sizeof(uuid)))
return;
wpa_printf(MSG_DEBUG, "WPS: PIN needed for E-UUID %s", uuid);
len = os_snprintf(txt, sizeof(txt), WPS_EVENT_PIN_NEEDED
- "%s " MACSTR " [%s|%s|%s|%s|%s|%d-%08X-%d]",
+ "%s " MACSTR " [%s|%s|%s|%s|%s|%s]",
uuid, MAC2STR(dev->mac_addr), dev->device_name,
dev->manufacturer, dev->model_name,
dev->model_number, dev->serial_number,
- dev->categ, dev->oui, dev->sub_categ);
+ wps_dev_type_bin2str(dev->pri_dev_type, devtype,
+ sizeof(devtype)));
if (len > 0 && len < (int) sizeof(txt))
- wpa_msg(hapd, MSG_INFO, "%s", txt);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, "%s", txt);
if (hapd->conf->wps_pin_requests) {
FILE *f;
return;
os_get_time(&t);
fprintf(f, "%ld\t%s\t" MACSTR "\t%s\t%s\t%s\t%s\t%s"
- "\t%d-%08X-%d\n",
+ "\t%s\n",
t.sec, uuid, MAC2STR(dev->mac_addr), dev->device_name,
dev->manufacturer, dev->model_name, dev->model_number,
dev->serial_number,
- dev->categ, dev->oui, dev->sub_categ);
+ wps_dev_type_bin2str(dev->pri_dev_type, devtype,
+ sizeof(devtype)));
fclose(f);
}
}
char uuid[40];
if (uuid_bin2str(uuid_e, uuid, sizeof(uuid)))
return;
- wpa_msg(hapd, MSG_INFO, WPS_EVENT_REG_SUCCESS MACSTR " %s",
+ wpa_msg(hapd->msg_ctx, MSG_INFO, WPS_EVENT_REG_SUCCESS MACSTR " %s",
MAC2STR(mac_addr), uuid);
}
if (_buf) {
wpa_snprintf_hex(_buf, blen,
cred->cred_attr, cred->cred_attr_len);
- wpa_msg(hapd, MSG_INFO, "%s%s",
+ wpa_msg(hapd->msg_ctx, MSG_INFO, "%s%s",
WPS_EVENT_NEW_AP_SETTINGS, _buf);
os_free(_buf);
}
} else
- wpa_msg(hapd, MSG_INFO, WPS_EVENT_NEW_AP_SETTINGS);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, WPS_EVENT_NEW_AP_SETTINGS);
if (hapd->conf->wps_cred_processing == 1)
return 0;
hapd->wps->ssid_len = cred->ssid_len;
hapd->wps->encr_types = cred->encr_type;
hapd->wps->auth_types = cred->auth_type;
- if (cred->key == NULL) {
+ if (cred->key_len == 0) {
os_free(hapd->wps->network_key);
hapd->wps->network_key = NULL;
hapd->wps->network_key_len = 0;
if (hapd->ap_pin_failures < 4)
return;
- wpa_msg(hapd, MSG_INFO, WPS_EVENT_AP_SETUP_LOCKED);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, WPS_EVENT_AP_SETUP_LOCKED);
hapd->wps->ap_setup_locked = 1;
wps_registrar_update_ie(hapd->wps->registrar);
if (os_strstr(m, "keypad"))
wps->config_methods |= WPS_CONFIG_KEYPAD;
}
- if (hapd->conf->device_type) {
- char *pos;
- u8 oui[4];
- /* <categ>-<OUI>-<subcateg> */
- wps->dev.categ = atoi(hapd->conf->device_type);
- pos = os_strchr(hapd->conf->device_type, '-');
- if (pos == NULL) {
- wpa_printf(MSG_ERROR, "WPS: Invalid device_type");
- os_free(wps);
- return -1;
- }
- pos++;
- if (hexstr2bin(pos, oui, 4)) {
- wpa_printf(MSG_ERROR, "WPS: Invalid device_type OUI");
- os_free(wps);
- return -1;
- }
- wps->dev.oui = WPA_GET_BE32(oui);
- pos = os_strchr(pos, '-');
- if (pos == NULL) {
- wpa_printf(MSG_ERROR, "WPS: Invalid device_type");
- os_free(wps);
- return -1;
- }
- pos++;
- wps->dev.sub_categ = atoi(pos);
+ if (hapd->conf->device_type &&
+ wps_dev_type_str2bin(hapd->conf->device_type,
+ wps->dev.pri_dev_type) < 0) {
+ wpa_printf(MSG_ERROR, "WPS: Invalid device_type");
+ os_free(wps);
+ return -1;
}
wps->dev.os_version = WPA_GET_BE32(hapd->conf->os_version);
wps->dev.rf_bands = hapd->iconf->hw_mode == HOSTAPD_MODE_IEEE80211A ?
}
#endif /* CONFIG_WPS_UPNP */
+ hostapd_register_probereq_cb(hapd, hostapd_wps_probe_req_rx, hapd);
+
hapd->wps = wps;
return 0;
#endif /* CONFIG_WPS_OOB */
-void hostapd_wps_probe_req_rx(struct hostapd_data *hapd, const u8 *addr,
- const u8 *ie, size_t ie_len)
+static void hostapd_wps_probe_req_rx(void *ctx, const u8 *addr,
+ const u8 *ie, size_t ie_len)
{
+ struct hostapd_data *hapd = ctx;
struct wpabuf *wps_ie;
- const u8 *end, *pos, *wps;
if (hapd->wps == NULL)
return;
- pos = ie;
- end = ie + ie_len;
- wps = NULL;
-
- while (pos + 1 < end) {
- if (pos + 2 + pos[1] > end)
- return;
- if (pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
- WPA_GET_BE32(&pos[2]) == WPS_DEV_OUI_WFA) {
- wps = pos;
- break;
- }
- pos += 2 + pos[1];
- }
-
- if (wps == NULL)
- return; /* No WPS IE in Probe Request */
-
- wps_ie = wpabuf_alloc(ie_len);
+ wps_ie = ieee802_11_vendor_ie_concat(ie, ie_len, WPS_DEV_OUI_WFA);
if (wps_ie == NULL)
return;
- /* There may be multiple WPS IEs in the message, so need to concatenate
- * their WPS Data fields */
- while (pos + 1 < end) {
- if (pos + 2 + pos[1] > end)
- break;
- if (pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
- WPA_GET_BE32(&pos[2]) == WPS_DEV_OUI_WFA)
- wpabuf_put_data(wps_ie, pos + 6, pos[1] - 4);
- pos += 2 + pos[1];
- }
-
if (wpabuf_len(wps_ie) > 0) {
wps_registrar_probe_req_rx(hapd->wps->registrar, addr, wps_ie);
#ifdef CONFIG_WPS_UPNP
}
-static struct wpabuf *
-hostapd_rx_req_get_ap_settings(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return NULL;
-}
-
-
-static int hostapd_rx_req_set_ap_settings(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static int hostapd_rx_req_del_ap_settings(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static struct wpabuf *
-hostapd_rx_req_get_sta_settings(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return NULL;
-}
-
-
-static int hostapd_rx_req_set_sta_settings(void *priv,
- const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static int hostapd_rx_req_del_sta_settings(void *priv,
- const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
static int hostapd_rx_req_put_wlan_response(
void *priv, enum upnp_wps_wlanevent_type ev_type,
const u8 *mac_addr, const struct wpabuf *msg,
wpa_printf(MSG_DEBUG, "WPS UPnP: PutWLANResponse ev_type=%d mac_addr="
MACSTR, ev_type, MAC2STR(mac_addr));
- wpa_hexdump_ascii(MSG_MSGDUMP, "WPS UPnP: PutWLANResponse NewMessage",
- wpabuf_head(msg), wpabuf_len(msg));
+ wpa_hexdump(MSG_MSGDUMP, "WPS UPnP: PutWLANResponse NewMessage",
+ wpabuf_head(msg), wpabuf_len(msg));
if (ev_type != UPNP_WPS_WLANEVENT_TYPE_EAP) {
wpa_printf(MSG_DEBUG, "WPS UPnP: Ignored unexpected "
"PutWLANResponse WLANEventType %d", ev_type);
}
-static int hostapd_rx_req_reboot_ap(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static int hostapd_rx_req_reset_ap(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static int hostapd_rx_req_reboot_sta(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
-static int hostapd_rx_req_reset_sta(void *priv, const struct wpabuf *msg)
-{
- wpa_printf(MSG_DEBUG, "WPS UPnP: TODO %s", __func__);
- return -1;
-}
-
-
static int hostapd_wps_upnp_init(struct hostapd_data *hapd,
struct wps_context *wps)
{
ctx->rx_req_get_device_info = hostapd_rx_req_get_device_info;
ctx->rx_req_put_message = hostapd_rx_req_put_message;
- ctx->rx_req_get_ap_settings = hostapd_rx_req_get_ap_settings;
- ctx->rx_req_set_ap_settings = hostapd_rx_req_set_ap_settings;
- ctx->rx_req_del_ap_settings = hostapd_rx_req_del_ap_settings;
- ctx->rx_req_get_sta_settings = hostapd_rx_req_get_sta_settings;
- ctx->rx_req_set_sta_settings = hostapd_rx_req_set_sta_settings;
- ctx->rx_req_del_sta_settings = hostapd_rx_req_del_sta_settings;
ctx->rx_req_put_wlan_response = hostapd_rx_req_put_wlan_response;
ctx->rx_req_set_selected_registrar =
hostapd_rx_req_set_selected_registrar;
- ctx->rx_req_reboot_ap = hostapd_rx_req_reboot_ap;
- ctx->rx_req_reset_ap = hostapd_rx_req_reset_ap;
- ctx->rx_req_reboot_sta = hostapd_rx_req_reboot_sta;
- ctx->rx_req_reset_sta = hostapd_rx_req_reset_sta;
hapd->wps_upnp = upnp_wps_device_init(ctx, wps, hapd);
if (hapd->wps_upnp == NULL) {
}
#endif /* CONFIG_WPS_UPNP */
+
+
+int hostapd_wps_get_mib_sta(struct hostapd_data *hapd, const u8 *addr,
+ char *buf, size_t buflen)
+{
+ return wps_registrar_get_info(hapd->wps->registrar, addr, buf, buflen);
+}
projects / libeap.git / blobdiff