912b34f000
Commit 88b32a99d3 added support for using
some Action frame processing in hostapd for drivers that handle most of
SME/MLME internally (it added FT, this has since be extended for SA
Query and WNM). However, this was added in a way that ended up getting
both the hostapd_rx_action() and hostapd_action_rx() called for Action
frames. This could result in an attempt to process FT, SA Query, and WNM
Action frames twice.
There is need for more significant cleanup in Action frame processing in
hostapd depending on the driver type, but as a simple step to avoid
issues, skip the hostapd_action_rx() call if hostapd_rx_action()
processed the frame.
Signed-hostap: Jouni Malinen <j@w1.fi>
85 lines
3.6 KiB
C
85 lines
3.6 KiB
C
/*
|
|
* hostapd / IEEE 802.11 Management
|
|
* Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
|
|
*
|
|
* This software may be distributed under the terms of the BSD license.
|
|
* See README for more details.
|
|
*/
|
|
|
|
#ifndef IEEE802_11_H
|
|
#define IEEE802_11_H
|
|
|
|
struct hostapd_iface;
|
|
struct hostapd_data;
|
|
struct sta_info;
|
|
struct hostapd_frame_info;
|
|
struct ieee80211_ht_capabilities;
|
|
|
|
int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
|
|
struct hostapd_frame_info *fi);
|
|
void ieee802_11_mgmt_cb(struct hostapd_data *hapd, const u8 *buf, size_t len,
|
|
u16 stype, int ok);
|
|
void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len);
|
|
#ifdef NEED_AP_MLME
|
|
int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen);
|
|
int ieee802_11_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
|
|
char *buf, size_t buflen);
|
|
#else /* NEED_AP_MLME */
|
|
static inline int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf,
|
|
size_t buflen)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int ieee802_11_get_mib_sta(struct hostapd_data *hapd,
|
|
struct sta_info *sta,
|
|
char *buf, size_t buflen)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* NEED_AP_MLME */
|
|
u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
|
|
int probe);
|
|
u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_qos_map_set(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_ext_supp_rates(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_vht_capabilities(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid);
|
|
int hostapd_ht_operation_update(struct hostapd_iface *iface);
|
|
void ieee802_11_send_sa_query_req(struct hostapd_data *hapd,
|
|
const u8 *addr, const u8 *trans_id);
|
|
void hostapd_get_ht_capab(struct hostapd_data *hapd,
|
|
struct ieee80211_ht_capabilities *ht_cap,
|
|
struct ieee80211_ht_capabilities *neg_ht_cap);
|
|
void hostapd_get_vht_capab(struct hostapd_data *hapd,
|
|
struct ieee80211_vht_capabilities *vht_cap,
|
|
struct ieee80211_vht_capabilities *neg_vht_cap);
|
|
u16 copy_sta_ht_capab(struct hostapd_data *hapd, struct sta_info *sta,
|
|
const u8 *ht_capab, size_t ht_capab_len);
|
|
void update_ht_state(struct hostapd_data *hapd, struct sta_info *sta);
|
|
u16 copy_sta_vht_capab(struct hostapd_data *hapd, struct sta_info *sta,
|
|
const u8 *vht_capab, size_t vht_capab_len);
|
|
void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
|
|
const u8 *buf, size_t len, int ack);
|
|
void hostapd_eapol_tx_status(struct hostapd_data *hapd, const u8 *dst,
|
|
const u8 *data, size_t len, int ack);
|
|
void ieee802_11_rx_from_unknown(struct hostapd_data *hapd, const u8 *src,
|
|
int wds);
|
|
u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
|
|
struct sta_info *sta, u8 *eid);
|
|
void ieee802_11_sa_query_action(struct hostapd_data *hapd,
|
|
const u8 *sa, const u8 action_type,
|
|
const u8 *trans_id);
|
|
u8 * hostapd_eid_interworking(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_adv_proto(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_roaming_consortium(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_time_adv(struct hostapd_data *hapd, u8 *eid);
|
|
u8 * hostapd_eid_time_zone(struct hostapd_data *hapd, u8 *eid);
|
|
int hostapd_update_time_adv(struct hostapd_data *hapd);
|
|
void hostapd_client_poll_ok(struct hostapd_data *hapd, const u8 *addr);
|
|
u8 * hostapd_eid_bss_max_idle_period(struct hostapd_data *hapd, u8 *eid);
|
|
|
|
#endif /* IEEE802_11_H */
|