mesh: Write close reason from Mesh Peering Close to debug log

[mech_eap.git] / wpa_supplicant / hs20_supplicant.c

diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index 72538fb..a62c1c3 100644 (file)
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -61,6 +61,46 @@ struct osu_provider {
 };
 
 
+void hs20_configure_frame_filters(struct wpa_supplicant *wpa_s)
+{
+       struct wpa_bss *bss = wpa_s->current_bss;
+       u8 *bssid = wpa_s->bssid;
+       const u8 *ie;
+       const u8 *ext_capa;
+       u32 filter = 0;
+
+       if (!bss || !is_hs20_network(wpa_s, wpa_s->current_ssid, bss)) {
+               wpa_printf(MSG_DEBUG,
+                          "Not configuring frame filtering - BSS " MACSTR
+                          " is not a Hotspot 2.0 network", MAC2STR(bssid));
+               return;
+       }
+
+       ie = wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE);
+
+       /* Check if DGAF disabled bit is zero (5th byte in the IE) */
+       if (!ie || ie[1] < 5)
+               wpa_printf(MSG_DEBUG,
+                          "Not configuring frame filtering - Can't extract DGAF bit");
+       else if (!(ie[6] & HS20_DGAF_DISABLED))
+               filter |= WPA_DATA_FRAME_FILTER_FLAG_GTK;
+
+       ext_capa = wpa_bss_get_ie(bss, WLAN_EID_EXT_CAPAB);
+       if (!ext_capa || ext_capa[1] < 2) {
+               wpa_printf(MSG_DEBUG,
+                          "Not configuring frame filtering - Can't extract Proxy ARP bit");
+               return;
+       }
+
+       /* Check if Proxy ARP is enabled (2nd byte in the IE) */
+       if (ext_capa[3] & BIT(4))
+               filter |= WPA_DATA_FRAME_FILTER_FLAG_ARP |
+                       WPA_DATA_FRAME_FILTER_FLAG_NA;
+
+       wpa_drv_configure_frame_filters(wpa_s, filter);
+}
+
+
 void wpas_hs20_add_indication(struct wpabuf *buf, int pps_mo_id)
 {
        u8 conf;
@@ -189,7 +229,6 @@ int hs20_anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, u32 stypes,
        struct wpa_bss *bss;
        int res;
        struct icon_entry *icon_entry;
-       struct icon_entry *picon_entry;
 
        bss = wpa_bss_get_bssid(wpa_s, dst);
        if (!bss) {
@@ -232,14 +271,7 @@ int hs20_anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, u32 stypes,
                icon_entry->file_name[payload_len] = '\0';
                icon_entry->dialog_token = res;
 
-               if (wpa_s->icon_head == NULL) {
-                       wpa_s->icon_head = icon_entry;
-               } else {
-                       picon_entry = wpa_s->icon_head;
-                       while (picon_entry->next)
-                               picon_entry = picon_entry->next;
-                       picon_entry->next = icon_entry;
-               }
+               dl_list_add(&wpa_s->icon_head, &icon_entry->list);
        }
 
        return ret;
@@ -252,7 +284,7 @@ static struct icon_entry * hs20_find_icon(struct wpa_supplicant *wpa_s,
 {
        struct icon_entry *icon;
 
-       for (icon = wpa_s->icon_head; icon; icon = icon->next) {
+       dl_list_for_each(icon, &wpa_s->icon_head, struct icon_entry, list) {
                if (os_memcmp(icon->bssid, bssid, ETH_ALEN) == 0 &&
                    os_strcmp(icon->file_name, file_name) == 0 && icon->image)
                        return icon;
@@ -276,9 +308,6 @@ int hs20_get_icon(struct wpa_supplicant *wpa_s, const u8 *bssid,
                   MAC2STR(bssid), file_name, (unsigned int) offset,
                   (unsigned int) size, (unsigned int) buf_len);
 
-       if (!wpa_s->icon_head)
-               return -1;
-
        icon = hs20_find_icon(wpa_s, bssid, file_name);
        if (!icon || !icon->image || offset >= icon->image_len)
                return -1;
@@ -318,8 +347,7 @@ static void hs20_free_icon_entry(struct icon_entry *icon)
 int hs20_del_icon(struct wpa_supplicant *wpa_s, const u8 *bssid,
                  const char *file_name)
 {
-       struct icon_entry **picon_entry;
-       struct icon_entry *icon_entry;
+       struct icon_entry *icon, *tmp;
        int count = 0;
 
        if (!bssid)
@@ -331,22 +359,15 @@ int hs20_del_icon(struct wpa_supplicant *wpa_s, const u8 *bssid,
                wpa_printf(MSG_DEBUG, "HS20: Delete stored icons for "
                           MACSTR " file name %s", MAC2STR(bssid), file_name);
 
-       picon_entry = &wpa_s->icon_head;
-       while (*picon_entry) {
-               if ((!bssid ||
-                    os_memcmp((*picon_entry)->bssid, bssid, ETH_ALEN) == 0) &&
+       dl_list_for_each_safe(icon, tmp, &wpa_s->icon_head, struct icon_entry,
+                             list) {
+               if ((!bssid || os_memcmp(icon->bssid, bssid, ETH_ALEN) == 0) &&
                    (!file_name ||
-                    os_strcmp((*picon_entry)->file_name, file_name) == 0)) {
-                       icon_entry = *picon_entry;
-                       *picon_entry = icon_entry->next;
-
-                       hs20_free_icon_entry(icon_entry);
+                    os_strcmp(icon->file_name, file_name) == 0)) {
+                       dl_list_del(&icon->list);
+                       hs20_free_icon_entry(icon);
                        count++;
-                       continue;
                }
-               if (*picon_entry == NULL)
-                       break;
-               picon_entry = &(*picon_entry)->next;
        }
        return count == 0 ? -1 : 0;
 }
@@ -376,6 +397,25 @@ static void hs20_set_osu_access_permission(const char *osu_dir,
        }
 }
 
+
+static void hs20_remove_duplicate_icons(struct wpa_supplicant *wpa_s,
+                                       struct icon_entry *new_icon)
+{
+       struct icon_entry *icon, *tmp;
+
+       dl_list_for_each_safe(icon, tmp, &wpa_s->icon_head, struct icon_entry,
+                             list) {
+               if (icon == new_icon)
+                       continue;
+               if (os_memcmp(icon->bssid, new_icon->bssid, ETH_ALEN) == 0 &&
+                   os_strcmp(icon->file_name, new_icon->file_name) == 0) {
+                       dl_list_del(&icon->list);
+                       hs20_free_icon_entry(icon);
+               }
+       }
+}
+
+
 static int hs20_process_icon_binary_file(struct wpa_supplicant *wpa_s,
                                         const u8 *sa, const u8 *pos,
                                         size_t slen, u8 dialog_token)
@@ -386,7 +426,7 @@ static int hs20_process_icon_binary_file(struct wpa_supplicant *wpa_s,
        u16 data_len;
        struct icon_entry *icon;
 
-       for (icon = wpa_s->icon_head; icon; icon = icon->next) {
+       dl_list_for_each(icon, &wpa_s->icon_head, struct icon_entry, list) {
                if (icon->dialog_token == dialog_token && !icon->image &&
                    os_memcmp(icon->bssid, sa, ETH_ALEN) == 0) {
                        icon->image = os_malloc(slen);
@@ -394,6 +434,7 @@ static int hs20_process_icon_binary_file(struct wpa_supplicant *wpa_s,
                                return -1;
                        os_memcpy(icon->image, pos, slen);
                        icon->image_len = slen;
+                       hs20_remove_duplicate_icons(wpa_s, icon);
                        wpa_msg(wpa_s, MSG_INFO,
                                "RX-HS20-ICON " MACSTR " %s %u",
                                MAC2STR(sa), icon->file_name,
@@ -663,6 +704,7 @@ static void hs20_osu_fetch_done(struct wpa_supplicant *wpa_s)
        f = fopen(fname, "w");
        if (f == NULL) {
                hs20_free_osu_prov(wpa_s);
+               wpa_s->fetch_anqp_in_progress = 0;
                return;
        }
 
@@ -1154,9 +1196,16 @@ void hs20_rx_deauth_imminent_notice(struct wpa_supplicant *wpa_s, u8 code,
 }
 
 
+void hs20_init(struct wpa_supplicant *wpa_s)
+{
+       dl_list_init(&wpa_s->icon_head);
+}
+
+
 void hs20_deinit(struct wpa_supplicant *wpa_s)
 {
        eloop_cancel_timeout(hs20_continue_icon_fetch, wpa_s, NULL);
        hs20_free_osu_prov(wpa_s);
-       hs20_del_icon(wpa_s, NULL, NULL);
+       if (wpa_s->icon_head.next)
+               hs20_del_icon(wpa_s, NULL, NULL);
 }