From 050845ff669f68e8e9da089a12642b2fcafbcac1 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Thu, 16 Nov 2023 17:04:03 +0800 Subject: [PATCH] wpa log level adjustment for sta Signed-off-by: liuxiyao223 Change-Id: I0df09b599b4321094756355456a00881bc8ab3dd --- .../src/drivers/driver_nl80211.c | 2 +- .../src/drivers/driver_nl80211_capa.c | 6 ++--- .../wpa_supplicant/bssid_ignore.c | 6 ++--- .../wpa_supplicant/config.c | 2 +- .../wpa_supplicant/config_file.c | 2 +- .../wpa_supplicant/ctrl_iface.c | 7 +++--- .../wpa_supplicant/events.c | 16 ++++++------- .../wpa_supplicant/notify.c | 1 + .../wpa_supplicant/sme.c | 4 ++-- .../wpa_supplicant/wpa_supplicant.c | 24 +++++++++---------- .../wpa_supplicant/wpas_glue.c | 2 +- 11 files changed, 37 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211.c b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211.c index 169101f..6cde33e 100644 --- a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211.c +++ b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211.c @@ -5412,7 +5412,7 @@ void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv, int ifidx) struct nl_msg *msg; struct wpa_driver_nl80211_data *drv2; - wpa_printf(MSG_DEBUG, "nl80211: Remove interface ifindex=%d", ifidx); + wpa_printf(MSG_INFO, "nl80211: Remove interface ifindex=%d", ifidx); /* stop listening for EAPOL on this interface */ dl_list_for_each(drv2, &drv->global->interfaces, diff --git a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_capa.c b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_capa.c index e2afc75..e42fb28 100644 --- a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_capa.c +++ b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_capa.c @@ -2324,11 +2324,11 @@ static int nl80211_get_reg(struct nl_msg *msg, void *arg) enum nl80211_dfs_regions dfs_domain; dfs_domain = nla_get_u8(tb_msg[NL80211_ATTR_DFS_REGION]); nl80211_set_dfs_domain(dfs_domain, &results->dfs_domain); - wpa_printf(MSG_DEBUG, "nl80211: Regulatory information - country=%s (%s)", + wpa_printf(MSG_INFO, "nl80211: Regulatory information - country=%s (%s)", (char *) nla_data(tb_msg[NL80211_ATTR_REG_ALPHA2]), dfs_domain_name(dfs_domain)); } else { - wpa_printf(MSG_DEBUG, "nl80211: Regulatory information - country=%s", + wpa_printf(MSG_INFO, "nl80211: Regulatory information - country=%s", (char *) nla_data(tb_msg[NL80211_ATTR_REG_ALPHA2])); } @@ -2349,7 +2349,7 @@ static int nl80211_get_reg(struct nl_msg *msg, void *arg) if (tb_rule[NL80211_ATTR_REG_RULE_FLAGS]) flags = nla_get_u32(tb_rule[NL80211_ATTR_REG_RULE_FLAGS]); - wpa_printf(MSG_DEBUG, "nl80211: %u-%u @ %u MHz %u mBm%s%s%s%s%s%s%s%s", + wpa_printf(MSG_INFO, "nl80211: %u-%u @ %u MHz %u mBm%s%s%s%s%s%s%s%s", start, end, max_bw, max_eirp, flags & NL80211_RRF_NO_OFDM ? " (no OFDM)" : "", flags & NL80211_RRF_NO_CCK ? " (no CCK)" : "", diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/bssid_ignore.c b/wpa_supplicant-2.9_standard/wpa_supplicant/bssid_ignore.c index 18f2805..3d64940 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/bssid_ignore.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/bssid_ignore.c @@ -100,7 +100,7 @@ int wpa_bssid_ignore_add(struct wpa_supplicant *wpa_s, const u8 *bssid) e->start = now; e->next = wpa_s->bssid_ignore; wpa_s->bssid_ignore = e; - wpa_printf(MSG_DEBUG, "Added BSSID " MACSTR_SEC + wpa_printf(MSG_INFO, "Added BSSID " MACSTR_SEC " into ignore list, ignoring for %d seconds", MAC2STR_SEC(bssid), e->timeout_secs); @@ -129,7 +129,7 @@ int wpa_bssid_ignore_del(struct wpa_supplicant *wpa_s, const u8 *bssid) } else { prev->next = e->next; } - wpa_printf(MSG_DEBUG, "Removed BSSID " MACSTR_SEC + wpa_printf(MSG_INFO, "Removed BSSID " MACSTR_SEC " from ignore list", MAC2STR_SEC(bssid)); os_free(e); return 0; @@ -175,7 +175,7 @@ void wpa_bssid_ignore_clear(struct wpa_supplicant *wpa_s) while (e) { prev = e; e = e->next; - wpa_printf(MSG_DEBUG, "Removed BSSID " MACSTR_SEC + wpa_printf(MSG_INFO, "Removed BSSID " MACSTR_SEC " from ignore list (clear)", MAC2STR_SEC(prev->bssid)); os_free(prev); } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c index 22736e3..4344945 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/config.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/config.c @@ -4729,7 +4729,7 @@ static int wpa_config_process_country(const struct global_parse_data *data, return 1; config->country[0] = pos[0]; config->country[1] = pos[1]; - wpa_printf(MSG_DEBUG, "country='%c%c'", + wpa_printf(MSG_INFO, "country='%c%c'", config->country[0], config->country[1]); return 0; } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/config_file.c b/wpa_supplicant-2.9_standard/wpa_supplicant/config_file.c index 6db5010..5866d7b 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/config_file.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/config_file.c @@ -318,7 +318,7 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) while (cred_tail && cred_tail->next) cred_tail = cred_tail->next; - wpa_printf(MSG_DEBUG, "Reading configuration file '%s'", name); + wpa_printf(MSG_INFO, "Reading configuration file '%s'", name); f = fopen(name, "r"); if (f == NULL) { wpa_printf(MSG_ERROR, "Failed to open config file '%s', " diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c index 49b461f..71e8f21 100755 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c @@ -8928,6 +8928,7 @@ static int scan_id_list_parse(struct wpa_supplicant *wpa_s, const char *value, static void wpas_ctrl_scan(struct wpa_supplicant *wpa_s, char *params, char *reply, int reply_size, int *reply_len) { + wpa_printf(MSG_INFO, "Ready to start scan"); char *pos; unsigned int manual_scan_passive = 0; unsigned int manual_scan_use_id = 0; @@ -12550,7 +12551,7 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global, * TABTABTABTAB * TAB[TAB[TAB]] */ - wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_ADD '%s'", cmd); + wpa_printf(MSG_INFO, "CTRL_IFACE GLOBAL INTERFACE_ADD '%s'", cmd); os_memset(&iface, 0, sizeof(iface)); @@ -12679,7 +12680,7 @@ static int wpa_supplicant_global_iface_remove(struct wpa_global *global, int ret; unsigned int delete_iface; - wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_REMOVE '%s'", cmd); + wpa_printf(MSG_INFO, "CTRL_IFACE GLOBAL INTERFACE_REMOVE '%s'", cmd); wpa_s = wpa_supplicant_get_iface(global, cmd); if (wpa_s == NULL) @@ -12687,7 +12688,7 @@ static int wpa_supplicant_global_iface_remove(struct wpa_global *global, delete_iface = wpa_s->added_vif; ret = wpa_supplicant_remove_iface(global, wpa_s, 0); if (!ret && delete_iface) { - wpa_printf(MSG_DEBUG, "CTRL_IFACE deleting the interface '%s'", + wpa_printf(MSG_INFO, "CTRL_IFACE deleting the interface '%s'", cmd); ret = wpa_drv_if_remove(global->ifaces, WPA_IF_STATION, cmd); } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c index c80b86d..ecce19e 100755 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/events.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/events.c @@ -4264,7 +4264,7 @@ static void wpas_event_disassoc(struct wpa_supplicant *wpa_s, const u8 *ie = NULL; size_t ie_len = 0; - wpa_dbg(wpa_s, MSG_DEBUG, "Disassociation notification"); + wpa_dbg(wpa_s, MSG_INFO, "Disassociation notification"); if (info) { addr = info->addr; @@ -4272,13 +4272,13 @@ static void wpas_event_disassoc(struct wpa_supplicant *wpa_s, ie_len = info->ie_len; reason_code = info->reason_code; locally_generated = info->locally_generated; - wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u (%s)%s", reason_code, + wpa_dbg(wpa_s, MSG_INFO, " * reason %u (%s)%s", reason_code, reason2str(reason_code), locally_generated ? " locally_generated=1" : ""); if (addr) - wpa_dbg(wpa_s, MSG_DEBUG, " * address " MACSTR, + wpa_dbg(wpa_s, MSG_INFO, " * address " MACSTR, MAC2STR(addr)); - wpa_hexdump(MSG_DEBUG, "Disassociation frame IE(s)", + wpa_hexdump(MSG_INFO, "Disassociation frame IE(s)", ie, ie_len); } @@ -4319,7 +4319,7 @@ static void wpas_event_deauth(struct wpa_supplicant *wpa_s, const u8 *ie = NULL; size_t ie_len = 0; - wpa_dbg(wpa_s, MSG_DEBUG, "Deauthentication notification"); + wpa_dbg(wpa_s, MSG_INFO, "Deauthentication notification"); if (info) { addr = info->addr; @@ -4327,14 +4327,14 @@ static void wpas_event_deauth(struct wpa_supplicant *wpa_s, ie_len = info->ie_len; reason_code = info->reason_code; locally_generated = info->locally_generated; - wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u (%s)%s", + wpa_dbg(wpa_s, MSG_INFO, " * reason %u (%s)%s", reason_code, reason2str(reason_code), locally_generated ? " locally_generated=1" : ""); if (addr) { - wpa_dbg(wpa_s, MSG_DEBUG, " * address " MACSTR, + wpa_dbg(wpa_s, MSG_INFO, " * address " MACSTR, MAC2STR(addr)); } - wpa_hexdump(MSG_DEBUG, "Deauthentication frame IE(s)", + wpa_hexdump(MSG_INFO, "Deauthentication frame IE(s)", ie, ie_len); } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/notify.c b/wpa_supplicant-2.9_standard/wpa_supplicant/notify.c index f0f69f3..266b07c 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/notify.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/notify.c @@ -595,6 +595,7 @@ void wpas_notify_bss_added(struct wpa_supplicant *wpa_s, wpas_dbus_register_bss(wpa_s, bssid, id); wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_BSS_ADDED "%u " MACSTR, id, MAC2STR(bssid)); + wpa_printf(MSG_INFO, WPA_EVENT_BSS_ADDED "%u " MACSTR_SEC, id, MAC2STR_SEC(bssid)); } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/sme.c b/wpa_supplicant-2.9_standard/wpa_supplicant/sme.c index 3035e3d..c45bad7 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/sme.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/sme.c @@ -2205,7 +2205,7 @@ void sme_event_assoc_reject(struct wpa_supplicant *wpa_s, wpa_msg_only_for_cb(wpa_s, MSG_DEBUG, "SME: Association with " MACSTR " failed: " "status code %d", MAC2STR(wpa_s->pending_bssid), data->assoc_reject.status_code); - wpa_printf(MSG_DEBUG, "SME: Association with " MACSTR_SEC " failed: " + wpa_printf(MSG_INFO, "SME: Association with " MACSTR_SEC " failed: " "status code %d", MAC2STR_SEC(wpa_s->pending_bssid), data->assoc_reject.status_code); @@ -2214,7 +2214,7 @@ void sme_event_assoc_reject(struct wpa_supplicant *wpa_s, #ifdef CONFIG_SAE if (wpa_s->sme.sae_pmksa_caching && wpa_s->current_ssid && wpa_key_mgmt_sae(wpa_s->current_ssid->key_mgmt)) { - wpa_dbg(wpa_s, MSG_DEBUG, + wpa_dbg(wpa_s, MSG_INFO, "PMKSA caching attempt rejected - drop PMKSA cache entry and fall back to SAE authentication"); wpa_sm_aborted_cached(wpa_s->wpa); wpa_sm_pmksa_cache_flush(wpa_s->wpa, wpa_s->current_ssid); diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c index e5c0353..20fa58b 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c @@ -4187,7 +4187,7 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s, MAC2STR(wpa_s->bssid), MAC2STR(wpa_s->pending_bssid), reason_code, reason2str(reason_code), wpa_supplicant_state_txt(wpa_s->wpa_state)); - wpa_printf(MSG_DEBUG, "Request to deauthenticate - bssid=" MACSTR_SEC + wpa_printf(MSG_INFO, "Request to deauthenticate - bssid=" MACSTR_SEC " pending_bssid=" MACSTR_SEC " reason=%d (%s) state=%s", MAC2STR_SEC(wpa_s->bssid), MAC2STR_SEC(wpa_s->pending_bssid), reason_code, reason2str(reason_code), @@ -6407,7 +6407,7 @@ static void radio_remove_interface(struct wpa_supplicant *wpa_s) if (!radio) return; - wpa_printf(MSG_DEBUG, "Remove interface %s from radio %s", + wpa_printf(MSG_INFO, "Remove interface %s from radio %s", wpa_s->ifname, radio->name); dl_list_del(&wpa_s->radio_list); radio_remove_works(wpa_s, NULL, 0); @@ -6419,7 +6419,7 @@ static void radio_remove_interface(struct wpa_supplicant *wpa_s) if (!dl_list_empty(&radio->ifaces)) return; /* Interfaces remain for this radio */ - wpa_printf(MSG_DEBUG, "Remove radio %s", radio->name); + wpa_printf(MSG_INFO, "Remove radio %s", radio->name); eloop_cancel_timeout(radio_start_next_work, radio, NULL); os_free(radio); } @@ -6432,7 +6432,7 @@ void radio_work_check_next(struct wpa_supplicant *wpa_s) if (dl_list_empty(&radio->work)) return; if (wpa_s->ext_work_in_progress) { - wpa_printf(MSG_DEBUG, + wpa_printf(MSG_INFO, "External radio work in progress - delay start of pending item"); return; } @@ -6660,7 +6660,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, int capa_res; u8 dfs_domain; - wpa_printf(MSG_DEBUG, "Initializing interface '%s' conf '%s' driver " + wpa_printf(MSG_INFO, "Initializing interface '%s' conf '%s' driver " "'%s' ctrl_interface '%s' bridge '%s'", iface->ifname, iface->confname ? iface->confname : "N/A", iface->driver ? iface->driver : "default", @@ -6676,7 +6676,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, iface->confname); return -1; } - wpa_printf(MSG_DEBUG, "Configuration file '%s' -> '%s'", + wpa_printf(MSG_INFO, "Configuration file '%s' -> '%s'", iface->confname, wpa_s->confname); #else /* CONFIG_BACKEND_FILE */ wpa_s->confname = os_strdup(iface->confname); @@ -7341,7 +7341,7 @@ int wpa_supplicant_remove_iface(struct wpa_global *global, prev->next = wpa_s->next; } - wpa_dbg(wpa_s, MSG_DEBUG, "Removing interface %s", wpa_s->ifname); + wpa_dbg(wpa_s, MSG_INFO, "Removing interface %s", wpa_s->ifname); #ifdef CONFIG_MESH if (mesh_if_created) { @@ -7845,12 +7845,12 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid) */ if (wpa_s->own_disconnect_req || wpa_s->own_reconnect_req) { wpa_s->own_disconnect_req = 0; - wpa_dbg(wpa_s, MSG_DEBUG, + wpa_dbg(wpa_s, MSG_INFO, "Ignore connection failure due to local request to disconnect"); return; } if (wpa_s->disconnected) { - wpa_dbg(wpa_s, MSG_DEBUG, "Ignore connection failure " + wpa_dbg(wpa_s, MSG_INFO, "Ignore connection failure " "indication since interface has been put into " "disconnected state"); return; @@ -7870,7 +7870,7 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid) */ freqs = get_bss_freqs_in_ess(wpa_s); if (freqs) { - wpa_dbg(wpa_s, MSG_DEBUG, "Another BSS in this ESS " + wpa_dbg(wpa_s, MSG_INFO, "Another BSS in this ESS " "has been seen; try it next"); wpa_bssid_ignore_add(wpa_s, bssid); /* @@ -7886,7 +7886,7 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid) wpa_s->consecutive_conn_failures++; if (wpa_s->consecutive_conn_failures > 3 && wpa_s->current_ssid) { - wpa_printf(MSG_DEBUG, "Continuous association failures - " + wpa_printf(MSG_INFO, "Continuous association failures - " "consider temporary network disabling"); wpas_auth_failed(wpa_s, "CONN_FAILED"); } @@ -7913,7 +7913,7 @@ void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid) break; } - wpa_dbg(wpa_s, MSG_DEBUG, + wpa_dbg(wpa_s, MSG_INFO, "Consecutive connection failures: %d --> request scan in %d ms", wpa_s->consecutive_conn_failures, timeout); diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wpas_glue.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wpas_glue.c index 2cce21d..ea35836 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/wpas_glue.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wpas_glue.c @@ -372,7 +372,7 @@ static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol, static void wpa_supplicant_notify_eapol_done(void *ctx) { struct wpa_supplicant *wpa_s = ctx; - wpa_msg(wpa_s, MSG_DEBUG, "WPA: EAPOL processing complete"); + wpa_msg(wpa_s, MSG_INFO, "WPA: EAPOL processing complete"); if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { wpa_supplicant_set_state(wpa_s, WPA_4WAY_HANDSHAKE); } else {