#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 "ieee802_11_common.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 "eapol_auth/eapol_auth_sm_i.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_info.h"
#include "wps_hostapd.h"
-#include "dh_groups.h"
#ifdef CONFIG_WPS_UPNP
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_ctx, MSG_INFO, "%s", txt);
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);
}
}
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 ?
#ifdef CONFIG_WPS_UPNP
-static struct wpabuf *
-hostapd_rx_req_get_device_info(void *priv, struct upnp_wps_peer *peer)
-{
- struct hostapd_data *hapd = priv;
- struct wps_config cfg;
- struct wps_data *wps;
- enum wsc_op_code op_code;
- struct wpabuf *m1;
-
- /*
- * Request for DeviceInfo, i.e., M1 TLVs. This is a start of WPS
- * registration over UPnP with the AP acting as an Enrollee. It should
- * be noted that this is frequently used just to get the device data,
- * i.e., there may not be any intent to actually complete the
- * registration.
- */
-
- if (peer->wps)
- wps_deinit(peer->wps);
-
- os_memset(&cfg, 0, sizeof(cfg));
- cfg.wps = hapd->wps;
- cfg.pin = (u8 *) hapd->conf->ap_pin;
- cfg.pin_len = os_strlen(hapd->conf->ap_pin);
- wps = wps_init(&cfg);
- if (wps == NULL)
- return NULL;
-
- m1 = wps_get_msg(wps, &op_code);
- if (m1 == NULL) {
- wps_deinit(wps);
- return NULL;
- }
-
- peer->wps = wps;
-
- return m1;
-}
-
-
-static struct wpabuf *
-hostapd_rx_req_put_message(void *priv, struct upnp_wps_peer *peer,
- const struct wpabuf *msg)
-{
- enum wps_process_res res;
- enum wsc_op_code op_code;
-
- /* PutMessage: msg = InMessage, return OutMessage */
- res = wps_process_msg(peer->wps, WSC_UPnP, msg);
- if (res == WPS_FAILURE)
- return NULL;
- return wps_get_msg(peer->wps, &op_code);
-}
-
-
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,
}
-static int hostapd_rx_req_set_selected_registrar(void *priv,
- const struct wpabuf *msg)
-{
- struct hostapd_data *hapd = priv;
- return wps_registrar_set_selected_registrar(hapd->wps->registrar, msg);
-}
-
-
static int hostapd_wps_upnp_init(struct hostapd_data *hapd,
struct wps_context *wps)
{
if (ctx == NULL)
return -1;
- 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_put_wlan_response = hostapd_rx_req_put_wlan_response;
- ctx->rx_req_set_selected_registrar =
- hostapd_rx_req_set_selected_registrar;
+ if (hapd->conf->ap_pin)
+ ctx->ap_pin = os_strdup(hapd->conf->ap_pin);
hapd->wps_upnp = upnp_wps_device_init(ctx, wps, hapd);
if (hapd->wps_upnp == NULL) {
projects / libeap.git / blobdiff