From ca9968a0129927c916081817a2e4c187e79a47fc Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 19 Dec 2015 18:49:32 +0200 Subject: [PATCH] HS 2.0: Convert icon storage to use dl_list This simplifies the list operations quite a bit. Signed-off-by: Jouni Malinen --- wpa_supplicant/hs20_supplicant.c | 48 ++++++++++++------------------- wpa_supplicant/hs20_supplicant.h | 1 + wpa_supplicant/wpa_supplicant.c | 4 +++ wpa_supplicant/wpa_supplicant_i.h | 4 +-- 4 files changed, 25 insertions(+), 32 deletions(-) diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c index 72538fb4c..3eeb5a26a 100644 --- a/wpa_supplicant/hs20_supplicant.c +++ b/wpa_supplicant/hs20_supplicant.c @@ -189,7 +189,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 +231,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 +244,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 +268,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 +307,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 +319,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; } @@ -386,7 +367,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); @@ -1154,9 +1135,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); } diff --git a/wpa_supplicant/hs20_supplicant.h b/wpa_supplicant/hs20_supplicant.h index 3576ac330..9fc654c9a 100644 --- a/wpa_supplicant/hs20_supplicant.h +++ b/wpa_supplicant/hs20_supplicant.h @@ -36,6 +36,7 @@ int hs20_fetch_osu(struct wpa_supplicant *wpa_s); void hs20_cancel_fetch_osu(struct wpa_supplicant *wpa_s); void hs20_icon_fetch_failed(struct wpa_supplicant *wpa_s); void hs20_start_osu_scan(struct wpa_supplicant *wpa_s); +void hs20_init(struct wpa_supplicant *wpa_s); void hs20_deinit(struct wpa_supplicant *wpa_s); int hs20_get_icon(struct wpa_supplicant *wpa_s, const u8 *bssid, const char *file_name, size_t offset, size_t size, diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 6e2d18073..bdb180875 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -4750,6 +4750,10 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, wpas_sched_scan_plans_set(wpa_s, wpa_s->conf->sched_scan_plans); +#ifdef CONFIG_HS20 + hs20_init(wpa_s); +#endif /* CONFIG_HS20 */ + return 0; } diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 7e52020cc..7b74f383c 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -426,7 +426,7 @@ enum wpa_supplicant_test_failure { }; struct icon_entry { - struct icon_entry *next; + struct dl_list list; u8 bssid[ETH_ALEN]; u8 dialog_token; char *file_name; @@ -914,7 +914,7 @@ struct wpa_supplicant { unsigned int fetch_osu_icon_in_progress:1; struct wpa_bss *interworking_gas_bss; unsigned int osu_icon_id; - struct icon_entry *icon_head; + struct dl_list icon_head; /* struct icon_entry */ struct osu_provider *osu_prov; size_t osu_prov_count; struct os_reltime osu_icon_fetch_start; -- 2.39.2