Removed hostapd_new_assoc_sta() from driver wrapper API

[libeap.git] / hostapd / ieee802_11_auth.c

diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c
index 0aa86b0..cd26c80 100644 (file)
--- a/hostapd/ieee802_11_auth.c
+++ b/hostapd/ieee802_11_auth.c
@@ -200,7 +200,6 @@ static int hostapd_radius_acl_query(struct hostapd_data *hapd, const u8 *addr,
 
  fail:
        radius_msg_free(msg);
-       os_free(msg);
        return -1;
 }
 #endif /* CONFIG_NO_RADIUS */
@@ -402,11 +401,12 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
        struct hostapd_data *hapd = data;
        struct hostapd_acl_query_data *query, *prev;
        struct hostapd_cached_radius_acl *cache;
+       struct radius_hdr *hdr = radius_msg_get_hdr(msg);
 
        query = hapd->acl_queries;
        prev = NULL;
        while (query) {
-               if (query->radius_id == msg->hdr->identifier)
+               if (query->radius_id == hdr->identifier)
                        break;
                prev = query;
                query = query->next;
@@ -423,10 +423,10 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
                return RADIUS_RX_INVALID_AUTHENTICATOR;
        }
 
-       if (msg->hdr->code != RADIUS_CODE_ACCESS_ACCEPT &&
-           msg->hdr->code != RADIUS_CODE_ACCESS_REJECT) {
+       if (hdr->code != RADIUS_CODE_ACCESS_ACCEPT &&
+           hdr->code != RADIUS_CODE_ACCESS_REJECT) {
                wpa_printf(MSG_DEBUG, "Unknown RADIUS message code %d to ACL "
-                          "query", msg->hdr->code);
+                          "query", hdr->code);
                return RADIUS_RX_UNKNOWN;
        }
 
@@ -438,7 +438,7 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
        }
        time(&cache->timestamp);
        os_memcpy(cache->addr, query->addr, sizeof(cache->addr));
-       if (msg->hdr->code == RADIUS_CODE_ACCESS_ACCEPT) {
+       if (hdr->code == RADIUS_CODE_ACCESS_ACCEPT) {
                if (radius_msg_get_attr_int32(msg, RADIUS_ATTR_SESSION_TIMEOUT,
                                              &cache->session_timeout) == 0)
                        cache->accepted = HOSTAPD_ACL_ACCEPT_TIMEOUT;
@@ -470,8 +470,7 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
        /* Re-send original authentication frame for 802.11 processing */
        wpa_printf(MSG_DEBUG, "Re-sending authentication frame after "
                   "successful RADIUS ACL query");
-       ieee802_11_mgmt(hapd, query->auth_msg, query->auth_msg_len,
-                       WLAN_FC_STYPE_AUTH, NULL);
+       ieee802_11_mgmt(hapd, query->auth_msg, query->auth_msg_len, NULL);
 #endif /* NEED_AP_MLME */
 #endif /* CONFIG_DRIVER_RADIUS_ACL */
 
@@ -529,15 +528,4 @@ void hostapd_acl_deinit(struct hostapd_data *hapd)
        }
 }
 
-
-int hostapd_acl_reconfig(struct hostapd_data *hapd,
-                        struct hostapd_config *oldconf)
-{
-       if (!hapd->radius_client_reconfigured)
-               return 0;
-
-       hostapd_acl_deinit(hapd);
-       return hostapd_acl_init(hapd);
-}
-
 #endif /* CONFIG_NATIVE_WINDOWS */