Added an option to add (or override) Credential attribute(s) in M8

[wpasupplicant] / hostapd / ieee802_1x.c

diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index d8ebb16..4256534 100644 (file)
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -185,6 +185,7 @@ static void ieee802_1x_tx_key_one(struct hostapd_data *hapd,
 }
 
 
+#ifndef CONFIG_NO_VLAN
 static struct hostapd_wep_keys *
 ieee802_1x_group_alloc(struct hostapd_data *hapd, const char *ifname)
 {
@@ -279,13 +280,16 @@ ieee802_1x_get_group(struct hostapd_data *hapd, struct hostapd_ssid *ssid,
 
        return ssid->dyn_vlan_keys[vlan_id];
 }
+#endif /* CONFIG_NO_VLAN */
 
 
 void ieee802_1x_tx_key(struct hostapd_data *hapd, struct sta_info *sta)
 {
-       struct hostapd_wep_keys *key = NULL;
        struct eapol_state_machine *sm = sta->eapol_sm;
+#ifndef CONFIG_NO_VLAN
+       struct hostapd_wep_keys *key = NULL;
        int vlan_id;
+#endif /* CONFIG_NO_VLAN */
 
        if (sm == NULL || !sm->eap_if->eapKeyData)
                return;
@@ -293,6 +297,7 @@ void ieee802_1x_tx_key(struct hostapd_data *hapd, struct sta_info *sta)
        wpa_printf(MSG_DEBUG, "IEEE 802.1X: Sending EAPOL-Key(s) to " MACSTR,
                   MAC2STR(sta->addr));
 
+#ifndef CONFIG_NO_VLAN
        vlan_id = sta->vlan_id;
        if (vlan_id < 0 || vlan_id > MAX_VLAN_ID)
                vlan_id = 0;
@@ -303,7 +308,9 @@ void ieee802_1x_tx_key(struct hostapd_data *hapd, struct sta_info *sta)
                        ieee802_1x_tx_key_one(hapd, sta, key->idx, 1,
                                              key->key[key->idx],
                                              key->len[key->idx]);
-       } else if (hapd->default_wep_key) {
+       } else
+#endif /* CONFIG_NO_VLAN */
+       if (hapd->default_wep_key) {
                ieee802_1x_tx_key_one(hapd, sta, hapd->default_wep_key_idx, 1,
                                      hapd->default_wep_key,
                                      hapd->conf->default_wep_key_len);
@@ -674,8 +681,9 @@ void ieee802_1x_receive(struct hostapd_data *hapd, const u8 *sa, const u8 *buf,
        wpa_printf(MSG_DEBUG, "IEEE 802.1X: %lu bytes from " MACSTR,
                   (unsigned long) len, MAC2STR(sa));
        sta = ap_get_sta(hapd, sa);
-       if (!sta) {
-               printf("   no station information available\n");
+       if (!sta || !(sta->flags & WLAN_STA_ASSOC)) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.1X data frame from not "
+                          "associated STA");
                return;
        }
 
@@ -900,47 +908,6 @@ void ieee802_1x_new_station(struct hostapd_data *hapd, struct sta_info *sta)
 }
 
 
-void ieee802_1x_free_radius_class(struct radius_class_data *class)
-{
-       size_t i;
-       if (class == NULL)
-               return;
-       for (i = 0; i < class->count; i++)
-               os_free(class->attr[i].data);
-       os_free(class->attr);
-       class->attr = NULL;
-       class->count = 0;
-}
-
-
-int ieee802_1x_copy_radius_class(struct radius_class_data *dst,
-                                const struct radius_class_data *src)
-{
-       size_t i;
-
-       if (src->attr == NULL)
-               return 0;
-
-       dst->attr = os_zalloc(src->count * sizeof(struct radius_attr_data));
-       if (dst->attr == NULL)
-               return -1;
-
-       dst->count = 0;
-
-       for (i = 0; i < src->count; i++) {
-               dst->attr[i].data = os_malloc(src->attr[i].len);
-               if (dst->attr[i].data == NULL)
-                       break;
-               dst->count++;
-               os_memcpy(dst->attr[i].data, src->attr[i].data,
-                         src->attr[i].len);
-               dst->attr[i].len = src->attr[i].len;
-       }
-
-       return 0;
-}
-
-
 void ieee802_1x_free_station(struct sta_info *sta)
 {
        struct eapol_state_machine *sm = sta->eapol_sm;
@@ -955,10 +922,10 @@ void ieee802_1x_free_station(struct sta_info *sta)
                radius_msg_free(sm->last_recv_radius);
                os_free(sm->last_recv_radius);
        }
+       radius_free_class(&sm->radius_class);
 #endif /* CONFIG_NO_RADIUS */
 
        os_free(sm->identity);
-       ieee802_1x_free_radius_class(&sm->radius_class);
        eapol_auth_free(sm);
 }
 
@@ -1100,7 +1067,7 @@ static void ieee802_1x_store_radius_class(struct hostapd_data *hapd,
            sm == NULL)
                return;
 
-       ieee802_1x_free_radius_class(&sm->radius_class);
+       radius_free_class(&sm->radius_class);
        count = radius_msg_count_attr(msg, RADIUS_ATTR_CLASS, 1);
        if (count <= 0)
                return;
@@ -1298,6 +1265,7 @@ ieee802_1x_receive_auth(struct radius_msg *msg, struct radius_msg *req,
        case RADIUS_CODE_ACCESS_ACCEPT:
                if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_DISABLED)
                        sta->vlan_id = 0;
+#ifndef CONFIG_NO_VLAN
                else {
                        old_vlanid = sta->vlan_id;
                        sta->vlan_id = radius_msg_get_vlanid(msg);
@@ -1318,6 +1286,7 @@ ieee802_1x_receive_auth(struct radius_msg *msg, struct radius_msg *req,
                                       "ID in Access-Accept");
                        break;
                }
+#endif /* CONFIG_NO_VLAN */
 
                ap_sta_bind_vlan(hapd, sta, old_vlanid);
 
@@ -1616,6 +1585,7 @@ static int ieee802_1x_sta_entry_alive(void *ctx, const u8 *addr)
 static void ieee802_1x_logger(void *ctx, const u8 *addr,
                              eapol_logger_level level, const char *txt)
 {
+#ifndef CONFIG_NO_HOSTAPD_LOGGER
        struct hostapd_data *hapd = ctx;
        int hlevel;
 
@@ -1634,6 +1604,7 @@ static void ieee802_1x_logger(void *ctx, const u8 *addr,
 
        hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE8021X, hlevel, "%s",
                       txt);
+#endif /* CONFIG_NO_HOSTAPD_LOGGER */
 }