Parcourir la source

Avoid direct call to hostapd_new_assoc_sta from ieee802_11.c

Jouni Malinen il y a 15 ans
Parent
commit
d24df7c33d
3 fichiers modifiés avec 5 ajouts et 1 suppressions
  1. 1 0
      hostapd/hostapd.c
  2. 3 0
      hostapd/hostapd.h
  3. 1 1
      hostapd/ieee802_11.c

+ 1 - 0
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;

+ 3 - 0
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;

+ 1 - 1
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);