From patchwork Thu Mar 6 00:19:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 327243 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6493D2C0302 for ; Thu, 6 Mar 2014 11:23:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 2B5C49C247; Wed, 5 Mar 2014 19:23:47 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1-L8kXhy9xP3; Wed, 5 Mar 2014 19:23:46 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 60B4A9D39D; Wed, 5 Mar 2014 19:23:22 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 1489C9D39B for ; Wed, 5 Mar 2014 19:23:21 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3U+ERtXzv7vz for ; Wed, 5 Mar 2014 19:23:15 -0500 (EST) Received: from ns3.lanforge.com (mail.candelatech.com [208.74.158.172]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 9ABDC9C247 for ; Wed, 5 Mar 2014 19:22:51 -0500 (EST) Received: from fs3.candelatech.com (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id s260Lh2c031348 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 5 Mar 2014 16:21:44 -0800 From: greearb@candelatech.com To: hostap@lists.shmoo.com Subject: [PATCH 06/15] supplicant/interworking: Convert wpa_printf to wpa_msg. Date: Wed, 5 Mar 2014 16:19:51 -0800 Message-Id: <1394065200-20377-6-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1394065200-20377-1-git-send-email-greearb@candelatech.com> References: <1394065200-20377-1-git-send-email-greearb@candelatech.com> Cc: Ben Greear X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Ben Greear Also adds a few messages that helped me track down why things were not working as expected. Signed-off-by: Ben Greear --- wpa_supplicant/interworking.c | 197 +++++++++++++++++++++-------------------- 1 files changed, 101 insertions(+), 96 deletions(-) diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c index e3ad931..def8f1a 100644 --- a/wpa_supplicant/interworking.c +++ b/wpa_supplicant/interworking.c @@ -244,8 +244,8 @@ static int interworking_anqp_send_req(struct wpa_supplicant *wpa_s, struct wpabuf *extra = NULL; int all = wpa_s->fetch_all_anqp; - wpa_printf(MSG_DEBUG, "Interworking: ANQP Query Request to " MACSTR, - MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: ANQP Query Request to " MACSTR, + MAC2STR(bss->bssid)); wpa_s->interworking_gas_bss = bss; info_ids[num_info_ids++] = ANQP_CAPABILITY_LIST; @@ -304,14 +304,14 @@ static int interworking_anqp_send_req(struct wpa_supplicant *wpa_s, res = gas_query_req(wpa_s->gas, bss->bssid, bss->freq, buf, interworking_anqp_resp_cb, wpa_s); if (res < 0) { - wpa_printf(MSG_DEBUG, "ANQP: Failed to send Query Request"); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Failed to send Query Request"); wpabuf_free(buf); ret = -1; eloop_register_timeout(0, 0, interworking_continue_anqp, wpa_s, NULL); } else - wpa_printf(MSG_DEBUG, "ANQP: Query started with dialog token " - "%u", res); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Query started with dialog token " + "%u", res); return ret; } @@ -898,8 +898,8 @@ static int interworking_connect_3gpp(struct wpa_supplicant *wpa_s, if (bss->anqp == NULL || bss->anqp->anqp_3gpp == NULL) return -1; - wpa_printf(MSG_DEBUG, "Interworking: Connect with " MACSTR " (3GPP)", - MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR " (3GPP)", + MAC2STR(bss->bssid)); if (already_connected(wpa_s, cred, bss)) { wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR, @@ -955,13 +955,13 @@ static int interworking_connect_3gpp(struct wpa_supplicant *wpa_s, break; } if (res < 0) { - wpa_printf(MSG_DEBUG, "Selected EAP method (%d) not supported", - eap_type); + wpa_msg(wpa_s, MSG_DEBUG, "Selected EAP method (%d) not supported", + eap_type); goto fail; } if (!cred->pcsc && set_root_nai(ssid, cred->imsi, prefix) < 0) { - wpa_printf(MSG_DEBUG, "Failed to set Root NAI"); + wpa_msg(wpa_s, MSG_DEBUG, "Failed to set Root NAI"); goto fail; } @@ -1434,8 +1434,8 @@ static int interworking_connect_roaming_consortium( { struct wpa_ssid *ssid; - wpa_printf(MSG_DEBUG, "Interworking: Connect with " MACSTR " based on " - "roaming consortium match", MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR " based on " + "roaming consortium match", MAC2STR(bss->bssid)); if (already_connected(wpa_s, cred, bss)) { wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR, @@ -1463,8 +1463,8 @@ static int interworking_connect_roaming_consortium( goto fail; if (cred->eap_method == NULL) { - wpa_printf(MSG_DEBUG, "Interworking: No EAP method set for " - "credential using roaming consortium"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: No EAP method set for " + "credential using roaming consortium"); goto fail; } @@ -1502,7 +1502,7 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, return -1; if (disallowed_bssid(wpa_s, bss->bssid) || disallowed_ssid(wpa_s, bss->ssid, bss->ssid_len)) { - wpa_printf(MSG_DEBUG, "Interworking: Reject connection to disallowed BSS " + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Reject connection to disallowed BSS " MACSTR, MAC2STR(bss->bssid)); return -1; } @@ -1516,27 +1516,27 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, * We currently support only HS 2.0 networks and those are * required to use WPA2-Enterprise. */ - wpa_printf(MSG_DEBUG, "Interworking: Network does not use " - "RSN"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Network does not use " + "RSN"); return -1; } cred_rc = interworking_credentials_available_roaming_consortium( wpa_s, bss, 0, excl); if (cred_rc) { - wpa_printf(MSG_DEBUG, "Interworking: Highest roaming " - "consortium matching credential priority %d " - "sp_priority %d", - cred_rc->priority, cred_rc->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest roaming " + "consortium matching credential priority %d " + "sp_priority %d", + cred_rc->priority, cred_rc->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } cred = interworking_credentials_available_realm(wpa_s, bss, 0, excl); if (cred) { - wpa_printf(MSG_DEBUG, "Interworking: Highest NAI Realm list " - "matching credential priority %d sp_priority %d", - cred->priority, cred->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest NAI Realm list " + "matching credential priority %d sp_priority %d", + cred->priority, cred->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } @@ -1544,22 +1544,23 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, cred_3gpp = interworking_credentials_available_3gpp(wpa_s, bss, 0, excl); if (cred_3gpp) { - wpa_printf(MSG_DEBUG, "Interworking: Highest 3GPP matching " - "credential priority %d sp_priority %d", - cred_3gpp->priority, cred_3gpp->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest 3GPP matching " + "credential priority %d sp_priority %d", + cred_3gpp->priority, cred_3gpp->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } if (!cred_rc && !cred && !cred_3gpp) { - wpa_printf(MSG_DEBUG, "Interworking: No full credential matches - consider options without BW(etc.) limits"); + wpa_msg(wpa_s, MSG_DEBUG, + "Interworking: No full credential matches - consider options without BW(etc.) limits"); cred_rc = interworking_credentials_available_roaming_consortium( wpa_s, bss, 1, excl); if (cred_rc) { - wpa_printf(MSG_DEBUG, "Interworking: Highest roaming " - "consortium matching credential priority %d " - "sp_priority %d (ignore BW)", - cred_rc->priority, cred_rc->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest roaming " + "consortium matching credential priority %d " + "sp_priority %d (ignore BW)", + cred_rc->priority, cred_rc->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } @@ -1567,10 +1568,10 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, cred = interworking_credentials_available_realm(wpa_s, bss, 1, excl); if (cred) { - wpa_printf(MSG_DEBUG, "Interworking: Highest NAI Realm " - "list matching credential priority %d " - "sp_priority %d (ignore BW)", - cred->priority, cred->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest NAI Realm " + "list matching credential priority %d " + "sp_priority %d (ignore BW)", + cred->priority, cred->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } @@ -1578,10 +1579,10 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, cred_3gpp = interworking_credentials_available_3gpp(wpa_s, bss, 1, excl); if (cred_3gpp) { - wpa_printf(MSG_DEBUG, "Interworking: Highest 3GPP " - "matching credential priority %d " - "sp_priority %d (ignore BW)", - cred_3gpp->priority, cred_3gpp->sp_priority); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Highest 3GPP " + "matching credential priority %d " + "sp_priority %d (ignore BW)", + cred_3gpp->priority, cred_3gpp->sp_priority); if (allow_excluded && excl && !(*excl)) excl = NULL; } @@ -1599,16 +1600,16 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, } if (cred == NULL) { - wpa_printf(MSG_DEBUG, "Interworking: No matching credentials " - "found for " MACSTR, MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: No matching credentials " + "found for " MACSTR, MAC2STR(bss->bssid)); return -1; } realm = nai_realm_parse(bss->anqp ? bss->anqp->nai_realm : NULL, &count); if (realm == NULL) { - wpa_printf(MSG_DEBUG, "Interworking: Could not parse NAI " - "Realm list from " MACSTR, MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Could not parse NAI " + "Realm list from " MACSTR, MAC2STR(bss->bssid)); return -1; } @@ -1621,15 +1622,15 @@ static int interworking_connect_helper(struct wpa_supplicant *wpa_s, } if (!eap) { - wpa_printf(MSG_DEBUG, "Interworking: No matching credentials " - "and EAP method found for " MACSTR, - MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: No matching credentials " + "and EAP method found for " MACSTR, + MAC2STR(bss->bssid)); nai_realm_free(realm, count); return -1; } - wpa_printf(MSG_DEBUG, "Interworking: Connect with " MACSTR, - MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Connect with " MACSTR, + MAC2STR(bss->bssid)); if (already_connected(wpa_s, cred, bss)) { wpa_msg(wpa_s, MSG_INFO, INTERWORKING_ALREADY_CONNECTED MACSTR, @@ -1823,10 +1824,10 @@ static struct wpa_cred * interworking_credentials_available_3gpp( #if defined(PCSC_FUNCS) || defined(CONFIG_EAP_PROXY) compare: #endif /* PCSC_FUNCS || CONFIG_EAP_PROXY */ - wpa_printf(MSG_DEBUG, "Interworking: Parsing 3GPP info from " - MACSTR, MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Parsing 3GPP info from " + MACSTR, MAC2STR(bss->bssid)); ret = plmn_id_match(bss->anqp->anqp_3gpp, imsi, mnc_len); - wpa_printf(MSG_DEBUG, "PLMN match %sfound", ret ? "" : "not "); + wpa_msg(wpa_s, MSG_DEBUG, "PLMN match %sfound", ret ? "" : "not "); if (ret) { if (cred_no_required_oi_match(cred, bss)) continue; @@ -1878,12 +1879,12 @@ static struct wpa_cred * interworking_credentials_available_realm( if (wpa_s->conf->cred == NULL) return NULL; - wpa_printf(MSG_DEBUG, "Interworking: Parsing NAI Realm list from " - MACSTR, MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Parsing NAI Realm list from " + MACSTR, MAC2STR(bss->bssid)); realm = nai_realm_parse(bss->anqp->nai_realm, &count); if (realm == NULL) { - wpa_printf(MSG_DEBUG, "Interworking: Could not parse NAI " - "Realm list from " MACSTR, MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Could not parse NAI " + "Realm list from " MACSTR, MAC2STR(bss->bssid)); return NULL; } @@ -1923,6 +1924,9 @@ static struct wpa_cred * interworking_credentials_available_realm( } break; } + else { + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: realm-find-eap returned false."); + } } } @@ -2061,8 +2065,8 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s, realm = os_strchr(nai, '@'); if (realm) realm++; - wpa_printf(MSG_DEBUG, "Interworking: Search for match " - "with SIM/USIM domain %s", realm); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Search for match " + "with SIM/USIM domain %s", realm); if (realm && domain_name_list_contains(domain_names, realm, 1)) return 1; @@ -2075,8 +2079,8 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s, return ret; for (i = 0; i < cred->num_domain; i++) { - wpa_printf(MSG_DEBUG, "Interworking: Search for match with " - "home SP FQDN %s", cred->domain[i]); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Search for match with " + "home SP FQDN %s", cred->domain[i]); if (domain_name_list_contains(domain_names, cred->domain[i], 1)) return 1; } @@ -2252,14 +2256,15 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s) &excluded); if (!cred) continue; + if (!wpa_bss_get_ie(bss, WLAN_EID_RSN)) { /* * We currently support only HS 2.0 networks and those * are required to use WPA2-Enterprise. */ - wpa_printf(MSG_DEBUG, "Interworking: Credential match " - "with " MACSTR " but network does not use " - "RSN", MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Credential match " + "with " MACSTR " but network does not use " + "RSN", MAC2STR(bss->bssid)); continue; } if (!excluded) @@ -2350,16 +2355,16 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s) * have matching APs. */ if (interworking_find_network_match(wpa_s)) { - wpa_printf(MSG_DEBUG, "Interworking: Possible BSS " - "match for enabled network configurations"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Possible BSS " + "match for enabled network configurations"); if (wpa_s->auto_select) interworking_reconnect(wpa_s); return; } if (wpa_s->auto_network_select) { - wpa_printf(MSG_DEBUG, "Interworking: Continue " - "scanning after ANQP fetch"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Continue " + "scanning after ANQP fetch"); wpa_supplicant_req_scan(wpa_s, wpa_s->scan_interval, 0); return; @@ -2410,9 +2415,9 @@ interworking_match_anqp_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss) os_memcmp(bss->ssid, other->ssid, bss->ssid_len) != 0) continue; - wpa_printf(MSG_DEBUG, "Interworking: Share ANQP data with " - "already fetched BSSID " MACSTR " and " MACSTR, - MAC2STR(other->bssid), MAC2STR(bss->bssid)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Share ANQP data with " + "already fetched BSSID " MACSTR " and " MACSTR, + MAC2STR(other->bssid), MAC2STR(bss->bssid)); other->anqp->users++; return other->anqp; } @@ -2548,8 +2553,8 @@ int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, if (freq <= 0) return -1; - wpa_printf(MSG_DEBUG, "ANQP: Query Request to " MACSTR " for %u id(s)", - MAC2STR(dst), (unsigned int) num_ids); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Query Request to " MACSTR " for %u id(s)", + MAC2STR(dst), (unsigned int) num_ids); buf = anqp_build_req(info_ids, num_ids, NULL); if (buf == NULL) @@ -2557,12 +2562,12 @@ int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, res = gas_query_req(wpa_s->gas, dst, freq, buf, anqp_resp_cb, wpa_s); if (res < 0) { - wpa_printf(MSG_DEBUG, "ANQP: Failed to send Query Request"); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Failed to send Query Request"); wpabuf_free(buf); ret = -1; } else - wpa_printf(MSG_DEBUG, "ANQP: Query started with dialog token " - "%u", res); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Query started with dialog token " + "%u", res); return ret; } @@ -2678,22 +2683,22 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s, slen); break; default: - wpa_printf(MSG_DEBUG, "HS20: Unsupported ANQP " - "vendor type %u", type); + wpa_msg(wpa_s, MSG_DEBUG, "HS20: Unsupported ANQP " + "vendor type %u", type); break; } break; #endif /* CONFIG_HS20 */ default: - wpa_printf(MSG_DEBUG, "Interworking: Unsupported " - "vendor-specific ANQP OUI %06x", - WPA_GET_BE24(pos)); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Unsupported " + "vendor-specific ANQP OUI %06x", + WPA_GET_BE24(pos)); return; } break; default: - wpa_printf(MSG_DEBUG, "Interworking: Unsupported ANQP Info ID " - "%u", info_id); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Unsupported ANQP Info ID " + "%u", info_id); break; } } @@ -2723,8 +2728,8 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token, pos = wpabuf_head(adv_proto); if (wpabuf_len(adv_proto) < 4 || pos[0] != WLAN_EID_ADV_PROTO || pos[1] < 2 || pos[3] != ACCESS_NETWORK_QUERY_PROTOCOL) { - wpa_printf(MSG_DEBUG, "ANQP: Unexpected Advertisement " - "Protocol in response"); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Unexpected Advertisement " + "Protocol in response"); if (wpa_s->fetch_osu_icon_in_progress) hs20_icon_fetch_failed(wpa_s); return; @@ -2750,7 +2755,7 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token, while (pos < end) { if (pos + 4 > end) { - wpa_printf(MSG_DEBUG, "ANQP: Invalid element"); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Invalid element"); break; } info_id = WPA_GET_LE16(pos); @@ -2758,8 +2763,8 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token, slen = WPA_GET_LE16(pos); pos += 2; if (pos + slen > end) { - wpa_printf(MSG_DEBUG, "ANQP: Invalid element length " - "for Info ID %u", info_id); + wpa_msg(wpa_s, MSG_DEBUG, "ANQP: Invalid element length " + "for Info ID %u", info_id); break; } interworking_parse_rx_anqp_resp(wpa_s, bss, dst, info_id, pos, @@ -2774,8 +2779,8 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token, static void interworking_scan_res_handler(struct wpa_supplicant *wpa_s, struct wpa_scan_results *scan_res) { - wpa_printf(MSG_DEBUG, "Interworking: Scan results available - start " - "ANQP fetch"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Scan results available - start " + "ANQP fetch"); interworking_start_fetch_anqp(wpa_s); } @@ -2789,8 +2794,8 @@ int interworking_select(struct wpa_supplicant *wpa_s, int auto_select, wpa_s->auto_select = !!auto_select; wpa_s->fetch_all_anqp = 0; wpa_s->fetch_osu_info = 0; - wpa_printf(MSG_DEBUG, "Interworking: Start scan for network " - "selection"); + wpa_msg(wpa_s, MSG_DEBUG, "Interworking: Start scan for network " + "selection"); wpa_s->scan_res_handler = interworking_scan_res_handler; wpa_s->normal_scans = 0; wpa_s->scan_req = MANUAL_SCAN_REQ; @@ -2851,8 +2856,8 @@ int gas_send_request(struct wpa_supplicant *wpa_s, const u8 *dst, if (freq <= 0) return -1; - wpa_printf(MSG_DEBUG, "GAS request to " MACSTR " (freq %d MHz)", - MAC2STR(dst), freq); + wpa_msg(wpa_s, MSG_DEBUG, "GAS request to " MACSTR " (freq %d MHz)", + MAC2STR(dst), freq); wpa_hexdump_buf(MSG_DEBUG, "Advertisement Protocol ID", adv_proto); wpa_hexdump_buf(MSG_DEBUG, "GAS Query", query); @@ -2879,12 +2884,12 @@ int gas_send_request(struct wpa_supplicant *wpa_s, const u8 *dst, res = gas_query_req(wpa_s->gas, dst, freq, buf, gas_resp_cb, wpa_s); if (res < 0) { - wpa_printf(MSG_DEBUG, "GAS: Failed to send Query Request"); + wpa_msg(wpa_s, MSG_DEBUG, "GAS: Failed to send Query Request"); wpabuf_free(buf); ret = -1; } else - wpa_printf(MSG_DEBUG, "GAS: Query started with dialog token " - "%u", res); + wpa_msg(wpa_s, MSG_DEBUG, "GAS: Query started with dialog token " + "%u", res); return ret; }