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 3eeb5a2..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;
@@ -357,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)
@@ -375,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,
@@ -644,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;
        }