jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
hostap/src/ap/drv_callbacks.c

484 lines
12 KiB
C
Raw Normal View History

Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
/*
* hostapd / Callback functions for driver wrappers
* Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
*
* 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
* published by the Free Software Foundation.
*
* Alternatively, this software may be distributed under the terms of BSD
* license.
*
* See README and COPYING for more details.
*/
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "utils/includes.h"
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "utils/common.h"
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
#include "radius/radius.h"
Replace src/ap/driver_i.h with non-inlined functions in ap_drv_ops.c
2009-12-25 23:21:22 +01:00
#include "drivers/driver.h"
Include header files explicitly in *.c, not via header files
2009-12-25 23:31:51 +01:00
#include "common/ieee802_11_defs.h"
Allow hostapd_notif_assoc() to be called with all IEs This makes the call simpler for driver wrappers since there is no need to parse the IEs anymore before indicating association. In addition, this allows association processing to be extended to use other IEs in the future.
2010-04-03 20:03:13 +02:00
#include "common/ieee802_11_common.h"
Add AP-STA-DISCONNECT event for driver-based MLME
2010-04-03 20:05:50 +02:00
#include "common/wpa_ctrl.h"
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 16:16:14 +02:00
#include "wps/wps.h"
Rename some src/ap files to avoid duplicate file names Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
2009-12-25 23:05:40 +01:00
#include "hostapd.h"
#include "ieee802_11.h"
#include "sta_info.h"
#include "accounting.h"
#include "tkip_countermeasures.h"
#include "iapp.h"
#include "ieee802_1x.h"
#include "wpa_auth.h"
#include "wmm.h"
#include "wps_hostapd.h"
Remove ap_config.h dependency from driver_i.h This adds explicit #include line for ap_config.h into the src/ap/*.c files that actually use the definitions from there.
2009-12-25 23:12:25 +01:00
#include "ap_config.h"
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
const u8 *ie, size_t ielen)
{
struct sta_info *sta;
int new_assoc, res;
Allow hostapd_notif_assoc() to be called with all IEs This makes the call simpler for driver wrappers since there is no need to parse the IEs anymore before indicating association. In addition, this allows association processing to be extended to use other IEs in the future.
2010-04-03 20:03:13 +02:00
struct ieee802_11_elems elems;
P2P: Save a copy of P2P IE(s) data from (Re)Association Request
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
const u8 *all_ies = ie;
size_t all_ies_len = ielen;
#endif /* CONFIG_P2P */
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
Avoid hostapd segfault on invalid driver association event Running hostapd and wpa_supplicant on the same interface at the same time is not expected to work, but it should not cause hostapd to crash. Ignore station mode association events (no addr field) to avoid this.
2010-04-07 09:01:49 +02:00
if (addr == NULL) {
/*
* This could potentially happen with unexpected event from the
* driver wrapper. This was seen at least in one case where the
* driver ended up being set to station mode while hostapd was
* running, so better make sure we stop processing such an
* event here.
*/
wpa_printf(MSG_DEBUG, "hostapd_notif_assoc: Skip event with "
"no address");
return -1;
}
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO, "associated");
Allow hostapd_notif_assoc() to be called with all IEs This makes the call simpler for driver wrappers since there is no need to parse the IEs anymore before indicating association. In addition, this allows association processing to be extended to use other IEs in the future.
2010-04-03 20:03:13 +02:00
ieee802_11_parse_elems(ie, ielen, &elems, 0);
if (elems.wps_ie) {
ie = elems.wps_ie - 2;
ielen = elems.wps_ie_len + 2;
wpa_printf(MSG_DEBUG, "STA included WPS IE in (Re)AssocReq");
} else if (elems.rsn_ie) {
ie = elems.rsn_ie - 2;
ielen = elems.rsn_ie_len + 2;
wpa_printf(MSG_DEBUG, "STA included RSN IE in (Re)AssocReq");
} else if (elems.wpa_ie) {
ie = elems.wpa_ie - 2;
ielen = elems.wpa_ie_len + 2;
wpa_printf(MSG_DEBUG, "STA included WPA IE in (Re)AssocReq");
} else {
ie = NULL;
ielen = 0;
wpa_printf(MSG_DEBUG, "STA did not include WPS/RSN/WPA IE in "
"(Re)AssocReq");
}
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
sta = ap_get_sta(hapd, addr);
if (sta) {
accounting_sta_stop(hapd, sta);
} else {
sta = ap_sta_add(hapd, addr);
if (sta == NULL)
return -1;
}
sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
P2P: Save a copy of P2P IE(s) data from (Re)Association Request
2010-07-18 23:30:25 +02:00
#ifdef CONFIG_P2P
if (elems.p2p) {
wpabuf_free(sta->p2p_ie);
sta->p2p_ie = ieee802_11_vendor_ie_concat(all_ies, all_ies_len,
P2P_IE_VENDOR_TYPE);
}
#endif /* CONFIG_P2P */
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
if (hapd->conf->wpa) {
if (ie == NULL || ielen == 0) {
if (hapd->conf->wps_state) {
wpa_printf(MSG_DEBUG, "STA did not include "
"WPA/RSN IE in (Re)Association "
"Request - possible WPS use");
sta->flags |= WLAN_STA_MAYBE_WPS;
goto skip_wpa_check;
}
wpa_printf(MSG_DEBUG, "No WPA/RSN IE from STA");
return -1;
}
if (hapd->conf->wps_state && ie[0] == 0xdd && ie[1] >= 4 &&
os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
sta->flags |= WLAN_STA_WPS;
goto skip_wpa_check;
}
if (sta->wpa_sm == NULL)
sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
sta->addr);
if (sta->wpa_sm == NULL) {
wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
"machine");
return -1;
}
res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
ie, ielen, NULL, 0);
if (res != WPA_IE_OK) {
Disassociate STA if it associated with invalid/missing WPA/RSN IE When using drivers that process management frames internally (e.g., madwifi, atheros, bsd), the driver may accept association with IEs that do not match the security policy. Instead of silently leaving the station associated, explicitly disassociate it to clear the driver entry immediately.
2009-11-11 16:33:55 +01:00
int resp;
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
wpa_printf(MSG_DEBUG, "WPA/RSN information element "
"rejected? (res %u)", res);
wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
Disassociate STA if it associated with invalid/missing WPA/RSN IE When using drivers that process management frames internally (e.g., madwifi, atheros, bsd), the driver may accept association with IEs that do not match the security policy. Instead of silently leaving the station associated, explicitly disassociate it to clear the driver entry immediately.
2009-11-11 16:33:55 +01:00
if (res == WPA_INVALID_GROUP)
resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
else if (res == WPA_INVALID_PAIRWISE)
resp = WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID;
else if (res == WPA_INVALID_AKMP)
resp = WLAN_REASON_AKMP_NOT_VALID;
#ifdef CONFIG_IEEE80211W
else if (res == WPA_MGMT_FRAME_PROTECTION_VIOLATION)
resp = WLAN_REASON_INVALID_IE;
else if (res == WPA_INVALID_MGMT_GROUP_CIPHER)
resp = WLAN_REASON_GROUP_CIPHER_NOT_VALID;
#endif /* CONFIG_IEEE80211W */
else
resp = WLAN_REASON_INVALID_IE;
Remove direct driver calls from sta_info.c
2009-12-24 23:30:16 +01:00
hapd->drv.sta_disassoc(hapd, sta->addr, resp);
Disassociate STA if it associated with invalid/missing WPA/RSN IE When using drivers that process management frames internally (e.g., madwifi, atheros, bsd), the driver may accept association with IEs that do not match the security policy. Instead of silently leaving the station associated, explicitly disassociate it to clear the driver entry immediately.
2009-11-11 16:33:55 +01:00
ap_free_sta(hapd, sta);
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
return -1;
}
Fix WPS in non-WPA modes with drivers that implement MLME Need to set WLAN_STA_WPS and WLAN_STA_MAYBE_WPS flags even if WPA is not enabled. This allows open and static WEP modes to initiate WPS negotiation with madwifi-like drivers.
2009-02-23 19:57:07 +01:00
} else if (hapd->conf->wps_state) {
WPS 2.0: Validate WPS attributes in management frames and WSC messages If CONFIG_WPS_STRICT is set, validate WPS IE(s) in management frames and reject the frames if any of the mandatory attributes is missing or if an included attribute uses an invalid value. In addition, verify that all mandatory attributes are included and have valid values in the WSC messages.
2010-05-26 16:16:14 +02:00
#ifdef CONFIG_WPS_STRICT
struct wpabuf *wps;
wps = ieee802_11_vendor_ie_concat(ie, ielen,
WPS_IE_VENDOR_TYPE);
if (wps && wps_validate_assoc_req(wps) < 0) {
hapd->drv.sta_disassoc(hapd, sta->addr,
WLAN_REASON_INVALID_IE);
ap_free_sta(hapd, sta);
wpabuf_free(wps);
return -1;
}
wpabuf_free(wps);
#endif /* CONFIG_WPS_STRICT */
Fix WPS in non-WPA modes with drivers that implement MLME Need to set WLAN_STA_WPS and WLAN_STA_MAYBE_WPS flags even if WPA is not enabled. This allows open and static WEP modes to initiate WPS negotiation with madwifi-like drivers.
2009-02-23 19:57:07 +01:00
if (ie && ielen > 4 && ie[0] == 0xdd && ie[1] >= 4 &&
os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
sta->flags |= WLAN_STA_WPS;
} else
sta->flags |= WLAN_STA_MAYBE_WPS;
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
}
skip_wpa_check:
new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
hostapd_new_assoc_sta(hapd, sta, !new_assoc);
ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
return 0;
}
void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
{
struct sta_info *sta;
hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO, "disassociated");
sta = ap_get_sta(hapd, addr);
if (sta == NULL) {
wpa_printf(MSG_DEBUG, "Disassociation notification for "
"unknown STA " MACSTR, MAC2STR(addr));
return;
}
sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
Add AP-STA-DISCONNECT event for driver-based MLME
2010-04-03 20:05:50 +02:00
wpa_msg(hapd->msg_ctx, MSG_INFO, AP_STA_DISCONNECTED MACSTR,
MAC2STR(sta->addr));
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC);
sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST;
ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
ap_free_sta(hapd, sta);
}
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef HOSTAPD
Replace NEED_MLME with NEED_AP_MLME This makes it clearer that it's about the AP, not client-side MLME, even when built into the client (wpa_supplicant).
2009-08-14 19:01:41 +02:00
#ifdef NEED_AP_MLME
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
static const u8 * get_hdr_bssid(const struct ieee80211_hdr *hdr, size_t len)
{
u16 fc, type, stype;
/*
* PS-Poll frames are 16 bytes. All other frames are
* 24 bytes or longer.
*/
if (len < 16)
return NULL;
fc = le_to_host16(hdr->frame_control);
type = WLAN_FC_GET_TYPE(fc);
stype = WLAN_FC_GET_STYPE(fc);
switch (type) {
case WLAN_FC_TYPE_DATA:
if (len < 24)
return NULL;
switch (fc & (WLAN_FC_FROMDS | WLAN_FC_TODS)) {
hostapd: Add WDS (4-address frame) mode with per-station interfaces This mode allows associated stations to use 4-address frames to allow layer 2 bridging to be used. At least for the time being, this is only supported with driver=nl80211.
2009-12-24 10:46:22 +01:00
case WLAN_FC_FROMDS | WLAN_FC_TODS:
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
case WLAN_FC_TODS:
return hdr->addr1;
case WLAN_FC_FROMDS:
return hdr->addr2;
default:
return NULL;
}
case WLAN_FC_TYPE_CTRL:
if (stype != WLAN_FC_STYPE_PSPOLL)
return NULL;
return hdr->addr1;
case WLAN_FC_TYPE_MGMT:
return hdr->addr3;
default:
return NULL;
}
}
#define HAPD_BROADCAST ((struct hostapd_data *) -1)
static struct hostapd_data * get_hapd_bssid(struct hostapd_iface *iface,
const u8 *bssid)
{
size_t i;
if (bssid == NULL)
return NULL;
if (bssid[0] == 0xff && bssid[1] == 0xff && bssid[2] == 0xff &&
bssid[3] == 0xff && bssid[4] == 0xff && bssid[5] == 0xff)
return HAPD_BROADCAST;
for (i = 0; i < iface->num_bss; i++) {
if (os_memcmp(bssid, iface->bss[i]->own_addr, ETH_ALEN) == 0)
return iface->bss[i];
}
return NULL;
}
static void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd,
Remove struct ieee80211_hdr dependency from EVENT_RX_FROM_UNKNOWN It is simpler to just pass in u8* to the beginning of the header.
2010-01-03 11:17:20 +01:00
const u8 *frame, size_t len)
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
{
Remove struct ieee80211_hdr dependency from EVENT_RX_FROM_UNKNOWN It is simpler to just pass in u8* to the beginning of the header.
2010-01-03 11:17:20 +01:00
const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *) frame;
hostapd: Add WDS (4-address frame) mode with per-station interfaces This mode allows associated stations to use 4-address frames to allow layer 2 bridging to be used. At least for the time being, this is only supported with driver=nl80211.
2009-12-24 10:46:22 +01:00
u16 fc = le_to_host16(hdr->frame_control);
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
hapd = get_hapd_bssid(hapd->iface, get_hdr_bssid(hdr, len));
if (hapd == NULL || hapd == HAPD_BROADCAST)
return;
hostapd: Add WDS (4-address frame) mode with per-station interfaces This mode allows associated stations to use 4-address frames to allow layer 2 bridging to be used. At least for the time being, this is only supported with driver=nl80211.
2009-12-24 10:46:22 +01:00
ieee802_11_rx_from_unknown(hapd, hdr->addr2,
(fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) ==
(WLAN_FC_TODS | WLAN_FC_FROMDS));
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
}
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
static void hostapd_mgmt_rx(struct hostapd_data *hapd, struct rx_mgmt *rx_mgmt)
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
{
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
struct hostapd_iface *iface = hapd->iface;
Mark management frame processing functions to use const buffer
2009-12-13 22:25:30 +01:00
const struct ieee80211_hdr *hdr;
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
const u8 *bssid;
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
struct hostapd_frame_info fi;
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
hdr = (const struct ieee80211_hdr *) rx_mgmt->frame;
bssid = get_hdr_bssid(hdr, rx_mgmt->frame_len);
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
if (bssid == NULL)
return;
hapd = get_hapd_bssid(iface, bssid);
if (hapd == NULL) {
u16 fc;
fc = le_to_host16(hdr->frame_control);
/*
* Drop frames to unknown BSSIDs except for Beacon frames which
* could be used to update neighbor information.
*/
if (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT &&
WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_BEACON)
hapd = iface->bss[0];
else
return;
}
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
os_memset(&fi, 0, sizeof(fi));
fi.datarate = rx_mgmt->datarate;
fi.ssi_signal = rx_mgmt->ssi_signal;
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
if (hapd == HAPD_BROADCAST) {
size_t i;
for (i = 0; i < iface->num_bss; i++)
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
ieee802_11_mgmt(iface->bss[i], rx_mgmt->frame,
rx_mgmt->frame_len, &fi);
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
} else
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
ieee802_11_mgmt(hapd, rx_mgmt->frame, rx_mgmt->frame_len, &fi);
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
}
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
static void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, const u8 *buf,
size_t len, u16 stype, int ok)
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
{
Move more multi-BSSID processing into drv_callbacks.c This simplifies driver wrapper operations and removes last direct struct hostapd_data dereferences from driver_nl80211.c. In addition, some of the TX callbacks are now fixed for secondary BSSes.
2009-04-17 12:29:29 +02:00
struct ieee80211_hdr *hdr;
hdr = (struct ieee80211_hdr *) buf;
hapd = get_hapd_bssid(hapd->iface, get_hdr_bssid(hdr, len));
if (hapd == NULL || hapd == HAPD_BROADCAST)
return;
Moved driver callback functions from hostapd.c to a new file
2009-01-09 16:27:03 +01:00
ieee802_11_mgmt_cb(hapd, buf, len, stype, ok);
}
nl80211: Fix EAPOL frame RX for secondary BSSes Need to figure out which BSS should process the frame based on the source address (STA/Supplicant MAC address).
2009-04-03 20:04:25 +02:00
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#endif /* NEED_AP_MLME */
Clean up HT40 scan and share nl80211 scanning code Instead of adding a new driver_ops for fetching neighbor BSS data (that nl80211 driver interface had to scan during initialization), share the same scan operations that wpa_supplicant is using. This gets rid of duplicated scan code in driver_nl80211.c (and better yet, removes large part of old WEXT code). hostapd interface initialization is now completed in a callback, if needed, i.e., he_features channel/hw_mode selection can use as much time as needed. This can also help with radar detection in the future.
2009-04-16 15:22:40 +02:00
Replace hostapd_probe_req_rx() with EVENT_RX_PROBE_REQ driver event
2010-01-03 11:11:44 +01:00
static int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa,
const u8 *ie, size_t ie_len)
{
size_t i;
int ret = 0;
for (i = 0; hapd->probereq_cb && i < hapd->num_probereq_cb; i++) {
if (hapd->probereq_cb[i].cb(hapd->probereq_cb[i].ctx,
sa, ie, ie_len) > 0) {
ret = 1;
break;
}
}
return ret;
}
Use driver event, EVENT_EAPOL_RX, for EAPOL frame indication
2010-01-03 16:44:40 +01:00
static int hostapd_event_new_sta(struct hostapd_data *hapd, const u8 *addr)
{
struct sta_info *sta = ap_get_sta(hapd, addr);
if (sta)
return 0;
wpa_printf(MSG_DEBUG, "Data frame from unknown STA " MACSTR
" - adding a new STA", MAC2STR(addr));
sta = ap_sta_add(hapd, addr);
if (sta) {
hostapd_new_assoc_sta(hapd, sta, 0);
} else {
wpa_printf(MSG_DEBUG, "Failed to add STA entry for " MACSTR,
MAC2STR(addr));
return -1;
}
return 0;
}
static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
const u8 *data, size_t data_len)
{
struct hostapd_iface *iface = hapd->iface;
size_t j;
for (j = 0; j < iface->num_bss; j++) {
if (ap_get_sta(iface->bss[j], src)) {
hapd = iface->bss[j];
break;
}
}
ieee802_1x_receive(hapd, src, data, data_len);
}
Remove unnecessary wpa_event_type typedef
2010-01-03 12:10:12 +01:00
void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
Clean up HT40 scan and share nl80211 scanning code Instead of adding a new driver_ops for fetching neighbor BSS data (that nl80211 driver interface had to scan during initialization), share the same scan operations that wpa_supplicant is using. This gets rid of duplicated scan code in driver_nl80211.c (and better yet, removes large part of old WEXT code). hostapd interface initialization is now completed in a callback, if needed, i.e., he_features channel/hw_mode selection can use as much time as needed. This can also help with radar detection in the future.
2009-04-16 15:22:40 +02:00
union wpa_event_data *data)
{
struct hostapd_data *hapd = ctx;
switch (event) {
case EVENT_MICHAEL_MIC_FAILURE:
michael_mic_failure(hapd, data->michael_mic_failure.src, 1);
break;
case EVENT_SCAN_RESULTS:
if (hapd->iface->scan_cb)
hapd->iface->scan_cb(hapd->iface);
break;
Replace direct driver call to wpa_ft_rrb_rx() with driver event This avoids need to include hostapd/wpa.h into the driver wrappers.
2009-12-12 21:43:26 +01:00
#ifdef CONFIG_IEEE80211R
Fix EVENT_FT_RRB_RX processing
2009-12-13 20:19:02 +01:00
case EVENT_FT_RRB_RX:
Replace direct driver call to wpa_ft_rrb_rx() with driver event This avoids need to include hostapd/wpa.h into the driver wrappers.
2009-12-12 21:43:26 +01:00
wpa_ft_rrb_rx(hapd->wpa_auth, data->ft_rrb_rx.src,
data->ft_rrb_rx.data, data->ft_rrb_rx.data_len);
break;
#endif /* CONFIG_IEEE80211R */
Replace hostapd_button_pushed() with generic driver event
2009-12-13 20:21:10 +01:00
case EVENT_WPS_BUTTON_PUSHED:
hostapd_wps_button_pushed(hapd);
break;
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#ifdef NEED_AP_MLME
case EVENT_TX_STATUS:
switch (data->tx_status.type) {
case WLAN_FC_TYPE_MGMT:
hostapd_mgmt_tx_cb(hapd, data->tx_status.data,
data->tx_status.data_len,
data->tx_status.stype,
data->tx_status.ack);
break;
case WLAN_FC_TYPE_DATA:
hostapd_tx_status(hapd, data->tx_status.dst,
data->tx_status.data,
data->tx_status.data_len,
data->tx_status.ack);
break;
}
break;
case EVENT_RX_FROM_UNKNOWN:
Remove struct ieee80211_hdr dependency from EVENT_RX_FROM_UNKNOWN It is simpler to just pass in u8* to the beginning of the header.
2010-01-03 11:17:20 +01:00
hostapd_rx_from_unknown_sta(hapd, data->rx_from_unknown.frame,
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
data->rx_from_unknown.len);
break;
case EVENT_RX_MGMT:
Move struct hostapd_frame_info definition away from driver API This is internal data structure for hostapd/AP functionality and does not need to be defined in driver.h.
2010-01-03 11:37:02 +01:00
hostapd_mgmt_rx(hapd, &data->rx_mgmt);
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
break;
#endif /* NEED_AP_MLME */
Replace hostapd_probe_req_rx() with EVENT_RX_PROBE_REQ driver event
2010-01-03 11:11:44 +01:00
case EVENT_RX_PROBE_REQ:
hostapd_probe_req_rx(hapd, data->rx_probe_req.sa,
data->rx_probe_req.ie,
data->rx_probe_req.ie_len);
break;
Replace hostapd_notif_new_sta() with new driver event, EVENT_NEW_STA
2010-01-03 15:46:18 +01:00
case EVENT_NEW_STA:
Use driver event, EVENT_EAPOL_RX, for EAPOL frame indication
2010-01-03 16:44:40 +01:00
hostapd_event_new_sta(hapd, data->new_sta.addr);
break;
case EVENT_EAPOL_RX:
hostapd_event_eapol_rx(hapd, data->eapol_rx.src,
data->eapol_rx.data,
data->eapol_rx.data_len);
break;
Use generic driver event notification for AP mode assoc/disassoc
2010-01-03 17:22:22 +01:00
case EVENT_ASSOC:
hostapd_notif_assoc(hapd, data->assoc_info.addr,
data->assoc_info.req_ies,
data->assoc_info.req_ies_len);
break;
case EVENT_DISASSOC:
if (data)
hostapd_notif_disassoc(hapd, data->disassoc_info.addr);
break;
case EVENT_DEAUTH:
if (data)
hostapd_notif_disassoc(hapd, data->deauth_info.addr);
break;
Clean up HT40 scan and share nl80211 scanning code Instead of adding a new driver_ops for fetching neighbor BSS data (that nl80211 driver interface had to scan during initialization), share the same scan operations that wpa_supplicant is using. This gets rid of duplicated scan code in driver_nl80211.c (and better yet, removes large part of old WEXT code). hostapd interface initialization is now completed in a callback, if needed, i.e., he_features channel/hw_mode selection can use as much time as needed. This can also help with radar detection in the future.
2009-04-16 15:22:40 +02:00
default:
wpa_printf(MSG_DEBUG, "Unknown event %d", event);
break;
}
}
Use generic driver events for TX status and RX reporting Replace driver wrapper calls to hostapd_tx_status(), hostapd_rx_from_unknown_sta(), hostapd_mgmt_rx(), and hostapd_mgmt_tx_cb() with new generic driver events EVENT_TX_STATUS, EVENT_RX_FROM_UNKNOWN, and EVENT_RX_MGMT. This cleans up lot of the driver wrapper code to be less dependent on whether it is being used within wpa_supplicant AP mode or hostapd.
2009-12-13 22:05:39 +01:00
#endif /* HOSTAPD */
Reference in a new issue Copy permalink