DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make channel_info available to authenticator

Browse source 
This adds the necessary functions and callbacks to make the channel_info
driver API available to the authenticator state machine that implements
the 4-way and group key handshake. This is needed for OCV.

Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
This commit is contained in:
Mathy Vanhoef 2018-08-06 15:46:21 -04:00 committed by Jouni Malinen
parent 4b62b52e5e
commit bef4d07a28
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ap/wpa_auth.h
View file

@ -145,6 +145,7 @@ struct wpa_state_machine;
struct rsn_pmksa_cache_entry; struct rsn_pmksa_cache_entry;
struct eapol_state_machine; struct eapol_state_machine;
struct ft_remote_seq; struct ft_remote_seq;
struct wpa_channel_info;
struct ft_remote_r0kh { struct ft_remote_r0kh {
@ -265,6 +266,7 @@ struct wpa_auth_callbacks {
size_t data_len); size_t data_len);
int (*send_oui)(void *ctx, const u8 *dst, u8 oui_suffix, const u8 *data, int (*send_oui)(void *ctx, const u8 *dst, u8 oui_suffix, const u8 *data,
size_t data_len); size_t data_len);
int (*channel_info)(void *ctx, struct wpa_channel_info *ci);
#ifdef CONFIG_IEEE80211R_AP #ifdef CONFIG_IEEE80211R_AP
struct wpa_state_machine * (*add_sta)(void *ctx, const u8 *sta_addr); struct wpa_state_machine * (*add_sta)(void *ctx, const u8 *sta_addr);
int (*set_vlan)(void *ctx, const u8 *sta_addr, int (*set_vlan)(void *ctx, const u8 *sta_addr,

8
src/ap/wpa_auth_glue.c
View file

@ -776,6 +776,13 @@ static int hostapd_wpa_auth_send_oui(void *ctx, const u8 *dst, u8 oui_suffix,
} }
static int hostapd_channel_info(void *ctx, struct wpa_channel_info *ci)
{
struct hostapd_data *hapd = ctx;
return hostapd_drv_channel_info(hapd, ci);
}
#ifdef CONFIG_IEEE80211R_AP #ifdef CONFIG_IEEE80211R_AP
static int hostapd_wpa_auth_send_ft_action(void *ctx, const u8 *dst, static int hostapd_wpa_auth_send_ft_action(void *ctx, const u8 *dst,
@ -1189,6 +1196,7 @@ int hostapd_setup_wpa(struct hostapd_data *hapd)
.for_each_auth = hostapd_wpa_auth_for_each_auth, .for_each_auth = hostapd_wpa_auth_for_each_auth,
.send_ether = hostapd_wpa_auth_send_ether, .send_ether = hostapd_wpa_auth_send_ether,
.send_oui = hostapd_wpa_auth_send_oui, .send_oui = hostapd_wpa_auth_send_oui,
.channel_info = hostapd_channel_info,
#ifdef CONFIG_IEEE80211R_AP #ifdef CONFIG_IEEE80211R_AP
.send_ft_action = hostapd_wpa_auth_send_ft_action, .send_ft_action = hostapd_wpa_auth_send_ft_action,
.add_sta = hostapd_wpa_auth_add_sta, .add_sta = hostapd_wpa_auth_add_sta,