Interworking: Print HESSID in debug messages

This makes it easier to understand ANQP queries needed during
Interworking network selection.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c
index 9b19f37affa0ff6aae464e5cba5f13a0eb7a387a..441529cb0fd536fdf7cce20731d3bb8cdae2f6fd 100644 (file)
--- a/wpa_supplicant/bss.c
+++ b/wpa_supplicant/bss.c
@@ -431,6 +431,7 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s,
                                    struct os_reltime *fetch_time)
 {
        struct wpa_bss *bss;
+       char extra[50];
 
        bss = os_zalloc(sizeof(*bss) + res->ie_len + res->beacon_ie_len);
        if (bss == NULL)
@@ -456,10 +457,15 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s,
        dl_list_add_tail(&wpa_s->bss, &bss->list);
        dl_list_add_tail(&wpa_s->bss_id, &bss->list_id);
        wpa_s->num_bss++;
+       if (!is_zero_ether_addr(bss->hessid))
+               os_snprintf(extra, sizeof(extra), " HESSID " MACSTR,
+                           MAC2STR(bss->hessid));
+       else
+               extra[0] = '\0';
        wpa_dbg(wpa_s, MSG_DEBUG, "BSS: Add new id %u BSSID " MACSTR
-               " SSID '%s' freq %d",
+               " SSID '%s' freq %d%s",
                bss->id, MAC2STR(bss->bssid), wpa_ssid_txt(ssid, ssid_len),
-               bss->freq);
+               bss->freq, extra);
        wpas_notify_bss_added(wpa_s, bss->bssid, bss->id);
        return bss;
 }

diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index f94cd1614c60ea7214bc0fba527974cbbbf8d570..dfab9f569c1238a7db5ea6a08b79545aa3d66399 100644 (file)
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -2669,7 +2669,8 @@ static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s)
                        found++;
                        bss->flags |= WPA_BSS_ANQP_FETCH_TRIED;
                        wpa_msg(wpa_s, MSG_INFO, "Starting ANQP fetch for "
-                               MACSTR, MAC2STR(bss->bssid));
+                               MACSTR " (HESSID " MACSTR ")",
+                               MAC2STR(bss->bssid), MAC2STR(bss->hessid));
                        interworking_anqp_send_req(wpa_s, bss);
                        break;
                }