* Copyright (c) 2002-2004, Instant802 Networks, Inc.
* Copyright (c) 2005-2006, Devicescape Software, Inc.
* Copyright (c) 2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2007-2008, Intel Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "hw_features.h"
#include "driver.h"
#include "sta_info.h"
-#include "ieee802_11h.h"
+#include "wps_hostapd.h"
static u8 ieee802_11_erp_info(struct hostapd_data *hapd)
}
+static u8 * hostapd_eid_country_add(u8 *pos, u8 *end, int chan_spacing,
+ struct hostapd_channel_data *start,
+ struct hostapd_channel_data *prev)
+{
+ if (end - pos < 3)
+ return pos;
+
+ /* first channel number */
+ *pos++ = start->chan;
+ /* number of channels */
+ *pos++ = (prev->chan - start->chan) / chan_spacing + 1;
+ /* maximum transmit power level */
+ *pos++ = start->max_tx_power;
+
+ return pos;
+}
+
+
static u8 * hostapd_eid_country(struct hostapd_data *hapd, u8 *eid,
int max_len)
{
u8 *pos = eid;
-
- if ((!hapd->iconf->ieee80211d && !hapd->iface->dfs_enable) ||
- max_len < 6)
+ u8 *end = eid + max_len;
+ int i;
+ struct hostapd_hw_modes *mode;
+ struct hostapd_channel_data *start, *prev;
+ int chan_spacing = 1;
+
+ if (!hapd->iconf->ieee80211d || max_len < 6 ||
+ hapd->iface->current_mode == NULL)
return eid;
*pos++ = WLAN_EID_COUNTRY;
os_memcpy(pos, hapd->iconf->country, 3); /* e.g., 'US ' */
pos += 3;
- if ((pos - eid) & 1)
- *pos++ = 0; /* pad for 16-bit alignment */
-
- eid[1] = (pos - eid) - 2;
-
- return pos;
-}
-
-
-static u8 * hostapd_eid_power_constraint(struct hostapd_data *hapd, u8 *eid)
+ mode = hapd->iface->current_mode;
+ if (mode->mode == HOSTAPD_MODE_IEEE80211A)
+ chan_spacing = 4;
+
+ start = prev = NULL;
+ for (i = 0; i < mode->num_channels; i++) {
+ struct hostapd_channel_data *chan = &mode->channels[i];
+ if (chan->flag & HOSTAPD_CHAN_DISABLED)
+ continue;
+ if (start && prev &&
+ prev->chan + chan_spacing == chan->chan &&
+ start->max_tx_power == chan->max_tx_power) {
+ prev = chan;
+ continue; /* can use same entry */
+ }
-{
- if (!hapd->iface->dfs_enable)
- return eid;
- *eid++ = WLAN_EID_PWR_CONSTRAINT;
- *eid++ = 1;
- *eid++ = hapd->iface->pwr_const;
- return eid;
-}
+ if (start) {
+ pos = hostapd_eid_country_add(pos, end, chan_spacing,
+ start, prev);
+ start = NULL;
+ }
+ /* Start new group */
+ start = prev = chan;
+ }
-static u8 * hostapd_eid_tpc_report(struct hostapd_data *hapd, u8 *eid)
+ if (start) {
+ pos = hostapd_eid_country_add(pos, end, chan_spacing,
+ start, prev);
+ }
-{
- if (!hapd->iface->dfs_enable)
- return eid;
- *eid++ = WLAN_EID_TPC_REPORT;
- *eid++ = 2;
- *eid++ = hapd->iface->tx_power; /* TX POWER */
- *eid++ = 0; /* Link Margin */
- return eid;
-}
+ if ((pos - eid) & 1) {
+ if (end - pos < 1)
+ return eid;
+ *pos++ = 0; /* pad for 16-bit alignment */
+ }
-static u8 * hostapd_eid_channel_switch(struct hostapd_data *hapd, u8 *eid)
+ eid[1] = (pos - eid) - 2;
-{
- if (!hapd->iface->dfs_enable || !hapd->iface->channel_switch)
- return eid;
- *eid++ = WLAN_EID_CHANNEL_SWITCH;
- *eid++ = 3;
- *eid++ = CHAN_SWITCH_MODE_QUIET;
- *eid++ = hapd->iface->channel_switch; /* New channel */
- /* 0 - very soon; 1 - before next TBTT; num - after num beacons */
- *eid++ = 0;
- return eid;
+ return pos;
}
ie = mgmt->u.probe_req.variable;
ie_len = len - (IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req));
+ hostapd_wps_probe_req_rx(hapd, mgmt->sa, ie, ie_len);
+
if (!hapd->iconf->send_probe_response)
return;
- if (ieee802_11_parse_elems(hapd, ie, ie_len, &elems, 0) == ParseFailed)
- {
+ if (ieee802_11_parse_elems(ie, ie_len, &elems, 0) == ParseFailed) {
wpa_printf(MSG_DEBUG, "Could not parse ProbeReq from " MACSTR,
MAC2STR(mgmt->sa));
return;
pos = hostapd_eid_country(hapd, pos, epos - pos);
- pos = hostapd_eid_power_constraint(hapd, pos);
- pos = hostapd_eid_tpc_report(hapd, pos);
-
/* ERP Information element */
pos = hostapd_eid_erp_info(hapd, pos);
pos = hostapd_eid_wpa(hapd, pos, epos - pos, sta);
/* Wi-Fi Wireless Multimedia Extensions */
- if (hapd->conf->wme_enabled)
- pos = hostapd_eid_wme(hapd, pos);
+ pos = hostapd_eid_wme(hapd, pos);
-#ifdef CONFIG_IEEE80211N
- if (hapd->conf->ieee80211n) {
- pos = hostapd_eid_ht_capabilities_info(hapd, pos);
- pos = hostapd_eid_ht_operation(hapd, pos);
+ pos = hostapd_eid_ht_capabilities_info(hapd, pos);
+ pos = hostapd_eid_ht_operation(hapd, pos);
+
+#ifdef CONFIG_WPS
+ if (hapd->conf->wps_state && hapd->wps_probe_resp_ie) {
+ os_memcpy(pos, hapd->wps_probe_resp_ie,
+ hapd->wps_probe_resp_ie_len);
+ pos += hapd->wps_probe_resp_ie_len;
}
-#endif /* CONFIG_IEEE80211N */
+#endif /* CONFIG_WPS */
if (hostapd_send_mgmt_frame(hapd, resp, pos - (u8 *) resp, 0) < 0)
perror("handle_probe_req: send");
tailpos = hostapd_eid_country(hapd, tailpos,
tail + BEACON_TAIL_BUF_SIZE - tailpos);
- tailpos = hostapd_eid_power_constraint(hapd, tailpos);
- tailpos = hostapd_eid_channel_switch(hapd, tailpos);
- tailpos = hostapd_eid_tpc_report(hapd, tailpos);
-
/* ERP Information element */
tailpos = hostapd_eid_erp_info(hapd, tailpos);
tailpos, NULL);
/* Wi-Fi Wireless Multimedia Extensions */
- if (hapd->conf->wme_enabled)
- tailpos = hostapd_eid_wme(hapd, tailpos);
+ tailpos = hostapd_eid_wme(hapd, tailpos);
#ifdef CONFIG_IEEE80211N
- if (hapd->conf->ieee80211n) {
+ if (hapd->iconf->ieee80211n) {
+ u8 *ht_capab, *ht_oper;
+ ht_capab = tailpos;
tailpos = hostapd_eid_ht_capabilities_info(hapd, tailpos);
+
+ ht_oper = tailpos;
tailpos = hostapd_eid_ht_operation(hapd, tailpos);
- if (hostapd_set_ht_capability(
- hapd->conf->iface, hapd,
- &hapd->conf->ht_capabilities.data)) {
+ if (tailpos > ht_oper && ht_oper > ht_capab &&
+ hostapd_set_ht_params(hapd->conf->iface, hapd,
+ ht_capab + 2, ht_capab[1],
+ ht_oper + 2, ht_oper[1])) {
wpa_printf(MSG_ERROR, "Could not set HT capabilities "
"for kernel driver");
}
- if (hostapd_set_ht_operation(
- hapd->conf->iface, hapd,
- &hapd->conf->ht_operation.data))
- wpa_printf(MSG_ERROR, "Could not set HT operation for "
- "kernel driver");
}
#endif /* CONFIG_IEEE80211N */
+#ifdef CONFIG_WPS
+ if (hapd->conf->wps_state && hapd->wps_beacon_ie) {
+ os_memcpy(tailpos, hapd->wps_beacon_ie,
+ hapd->wps_beacon_ie_len);
+ tailpos += hapd->wps_beacon_ie_len;
+ }
+#endif /* CONFIG_WPS */
+
tail_len = tailpos > tail ? tailpos - tail : 0;
if (hostapd_set_beacon(hapd->conf->iface, hapd, (u8 *) head, head_len,