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

Avoid direct call to hostapd_new_assoc_sta from ieee802_11.c

Browse source
This commit is contained in:
Jouni Malinen 2009-12-24 23:42:13 +02:00
parent a2de634d1c
commit d24df7c33d
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hostapd/hostapd.c
View file

@ -1381,6 +1381,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
return NULL; return NULL;
hostapd_set_driver_ops(&hapd->drv); hostapd_set_driver_ops(&hapd->drv);
hapd->new_assoc_sta_cb = hostapd_new_assoc_sta;
hapd->iconf = conf; hapd->iconf = conf;
hapd->conf = bss; hapd->conf = bss;
hapd->iface = hapd_iface; hapd->iface = hapd_iface;

3
hostapd/hostapd.h
View file

@ -95,6 +95,9 @@ struct hostapd_data {
void *drv_priv; void *drv_priv;
struct hostapd_driver_ops drv; struct hostapd_driver_ops drv;
void (*new_assoc_sta_cb)(struct hostapd_data *hapd,
struct sta_info *sta, int reassoc);
void *msg_ctx; /* ctx for wpa_msg() calls */ void *msg_ctx; /* ctx for wpa_msg() calls */
struct radius_client_data *radius; struct radius_client_data *radius;

2
hostapd/ieee802_11.c
View file

@ -1578,7 +1578,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT); wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT);
else else
wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC); wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
hostapd_new_assoc_sta(hapd, sta, !new_assoc); hapd->new_assoc_sta_cb(hapd, sta, !new_assoc);
ieee802_1x_notify_port_enabled(sta->eapol_sm, 1); ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);