From: Jouni Malinen <j@w1.fi>
Date: Thu, 24 Dec 2009 21:42:13 +0000 (+0200)
Subject: Avoid direct call to hostapd_new_assoc_sta from ieee802_11.c
X-Git-Tag: hostap_0_7_1~222
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=commitdiff_plain;h=d24df7c33d29baaa3e3e48cd8b22f7a66767bcd0

Avoid direct call to hostapd_new_assoc_sta from ieee802_11.c
---

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 0027850..8af1c04 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -1381,6 +1381,7 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
 		return NULL;
 
 	hostapd_set_driver_ops(&hapd->drv);
+	hapd->new_assoc_sta_cb = hostapd_new_assoc_sta;
 	hapd->iconf = conf;
 	hapd->conf = bss;
 	hapd->iface = hapd_iface;
diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 005d7de..3937fbf 100644
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -95,6 +95,9 @@ struct hostapd_data {
 	void *drv_priv;
 	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 */
 
 	struct radius_client_data *radius;
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index d74bb0b..a198003 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -1578,7 +1578,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
 		wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC_FT);
 	else
 		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);