openharmony/third_party_wpa_supplicant
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_wpa_supplicant synced 2024-11-23 15:50:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!281 wpa hilog level adjustment for p2p

Browse Source 
Merge pull request !281 from Aurora/zcf_1117
This commit is contained in:
openharmony_ci 2023-11-17 09:51:46 +00:00 committed by Gitee
commit 75761b885f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wpa_supplicant-2.9_standard/src/ap/hostapd.c
View File

@ -2194,7 +2194,7 @@ dfs_offload:
}
#endif /* CONFIG_MESH */
wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
wpa_printf(MSG_INFO, "%s: Setup of interface done.",
iface->bss[0]->conf->iface);
if (iface->interfaces && iface->interfaces->terminate_on_error > 0)
iface->interfaces->terminate_on_error--;
@ -3247,7 +3247,7 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
if (hapd->iface->drv_flags & WPA_DRIVER_FLAGS_WIRED) {
if (eloop_cancel_timeout(ap_handle_timer, hapd, sta) > 0) {
wpa_printf(MSG_DEBUG,
wpa_printf(MSG_INFO,
"%s: %s: canceled wired ap_handle_timer timeout for "
MACSTR_SEC,
hapd->conf->iface, __func__,
@ -3255,7 +3255,7 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
}
} else if (!(hapd->iface->drv_flags &
WPA_DRIVER_FLAGS_INACTIVITY_TIMER)) {
wpa_printf(MSG_DEBUG,
wpa_printf(MSG_INFO,
"%s: %s: reschedule ap_handle_timer timeout for "
MACSTR_SEC " (%d seconds - ap_max_inactivity)",
hapd->conf->iface, __func__, MAC2STR_SEC(sta->addr),

2
wpa_supplicant-2.9_standard/src/ap/wpa_auth.c
View File

@ -1051,7 +1051,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
key_info = WPA_GET_BE16(key->key_info);
key_data = mic + mic_len + 2;
key_data_length = WPA_GET_BE16(mic + mic_len);
wpa_printf(MSG_DEBUG, "WPA: Received EAPOL-Key from " MACSTR_SEC
wpa_printf(MSG_INFO, "WPA: Received EAPOL-Key from " MACSTR_SEC
" key_info=0x%x type=%u mic_len=%zu key_data_length=%u",
MAC2STR_SEC(sm->addr), key_info, key->type,
mic_len, key_data_length);

24
wpa_supplicant-2.9_standard/src/p2p/p2p_build.c
View File

@ -91,7 +91,7 @@ void p2p_buf_add_listen_channel(struct wpabuf *buf, const char *country,
wpabuf_put_data(buf, country, 3);
wpabuf_put_u8(buf, reg_class); /* Regulatory Class */
wpabuf_put_u8(buf, channel); /* Channel Number */
wpa_printf(MSG_DEBUG, "P2P: * Listen Channel: Regulatory Class %u "
wpa_printf(MSG_INFO, "P2P: * Listen Channel: Regulatory Class %u "
"Channel %u", reg_class, channel);
}
@ -238,7 +238,7 @@ void p2p_buf_add_device_info(struct wpabuf *buf, struct p2p_data *p2p,
/* Update attribute length */
WPA_PUT_LE16(len, (u8 *) wpabuf_put(buf, 0) - len - 2);
wpa_printf(MSG_DEBUG, "P2P: * Device Info");
wpa_printf(MSG_INFO, "P2P: * Device Info");
}
@ -248,7 +248,7 @@ void p2p_buf_add_device_id(struct wpabuf *buf, const u8 *dev_addr)
wpabuf_put_u8(buf, P2P_ATTR_DEVICE_ID);
wpabuf_put_le16(buf, ETH_ALEN);
wpabuf_put_data(buf, dev_addr, ETH_ALEN);
wpa_printf(MSG_DEBUG, "P2P: * Device ID: " MACSTR_SEC, MAC2STR_SEC(dev_addr));
wpa_printf(MSG_INFO, "P2P: * Device ID: " MACSTR_SEC, MAC2STR_SEC(dev_addr));
}
@ -260,7 +260,7 @@ void p2p_buf_add_config_timeout(struct wpabuf *buf, u8 go_timeout,
wpabuf_put_le16(buf, 2);
wpabuf_put_u8(buf, go_timeout);
wpabuf_put_u8(buf, client_timeout);
wpa_printf(MSG_DEBUG, "P2P: * Configuration Timeout: GO %d (*10ms) "
wpa_printf(MSG_INFO, "P2P: * Configuration Timeout: GO %d (*10ms) "
"client %d (*10ms)", go_timeout, client_timeout);
}
@ -271,7 +271,7 @@ void p2p_buf_add_intended_addr(struct wpabuf *buf, const u8 *interface_addr)
wpabuf_put_u8(buf, P2P_ATTR_INTENDED_INTERFACE_ADDR);
wpabuf_put_le16(buf, ETH_ALEN);
wpabuf_put_data(buf, interface_addr, ETH_ALEN);
wpa_printf(MSG_DEBUG, "P2P: * Intended P2P Interface Address " MACSTR_SEC,
wpa_printf(MSG_INFO, "P2P: * Intended P2P Interface Address " MACSTR_SEC,
MAC2STR_SEC(interface_addr));
}
@ -282,7 +282,7 @@ void p2p_buf_add_group_bssid(struct wpabuf *buf, const u8 *bssid)
wpabuf_put_u8(buf, P2P_ATTR_GROUP_BSSID);
wpabuf_put_le16(buf, ETH_ALEN);
wpabuf_put_data(buf, bssid, ETH_ALEN);
wpa_printf(MSG_DEBUG, "P2P: * P2P Group BSSID " MACSTR_SEC,
wpa_printf(MSG_INFO, "P2P: * P2P Group BSSID " MACSTR_SEC,
MAC2STR_SEC(bssid));
}
@ -295,9 +295,9 @@ void p2p_buf_add_group_id(struct wpabuf *buf, const u8 *dev_addr,
wpabuf_put_le16(buf, ETH_ALEN + ssid_len);
wpabuf_put_data(buf, dev_addr, ETH_ALEN);
wpabuf_put_data(buf, ssid, ssid_len);
wpa_printf(MSG_DEBUG, "P2P: * P2P Group ID " MACSTR_SEC,
wpa_printf(MSG_INFO, "P2P: * P2P Group ID " MACSTR_SEC,
MAC2STR_SEC(dev_addr));
wpa_hexdump_ascii(MSG_DEBUG, "P2P: P2P Group ID SSID", ssid, ssid_len);
wpa_hexdump_ascii(MSG_INFO, "P2P: P2P Group ID SSID", ssid, ssid_len);
}
@ -307,7 +307,7 @@ void p2p_buf_add_invitation_flags(struct wpabuf *buf, u8 flags)
wpabuf_put_u8(buf, P2P_ATTR_INVITATION_FLAGS);
wpabuf_put_le16(buf, 1);
wpabuf_put_u8(buf, flags);
wpa_printf(MSG_DEBUG, "P2P: * Invitation Flags: bitmap 0x%x", flags);
wpa_printf(MSG_INFO, "P2P: * Invitation Flags: bitmap 0x%x", flags);
}
@ -333,7 +333,7 @@ void p2p_buf_add_noa(struct wpabuf *buf, u8 noa_index, u8 opp_ps, u8 ctwindow,
wpabuf_put_u8(buf, (opp_ps ? 0x80 : 0) | (ctwindow & 0x7f));
p2p_buf_add_noa_desc(buf, desc1);
p2p_buf_add_noa_desc(buf, desc2);
wpa_printf(MSG_DEBUG, "P2P: * Notice of Absence");
wpa_printf(MSG_INFO, "P2P: * Notice of Absence");
}
@ -345,7 +345,7 @@ void p2p_buf_add_ext_listen_timing(struct wpabuf *buf, u16 period,
wpabuf_put_le16(buf, 4);
wpabuf_put_le16(buf, period);
wpabuf_put_le16(buf, interval);
wpa_printf(MSG_DEBUG, "P2P: * Extended Listen Timing (period %u msec "
wpa_printf(MSG_INFO, "P2P: * Extended Listen Timing (period %u msec "
"interval %u msec)", period, interval);
}
@ -378,7 +378,7 @@ void p2p_buf_add_oob_go_neg_channel(struct wpabuf *buf, const char *country,
wpabuf_put_u8(buf, oper_class); /* Operating Class */
wpabuf_put_u8(buf, channel); /* Channel Number */
wpabuf_put_u8(buf, (u8) role); /* Role indication */
wpa_printf(MSG_DEBUG, "P2P: * OOB GO Negotiation Channel: Operating "
wpa_printf(MSG_INFO, "P2P: * OOB GO Negotiation Channel: Operating "
"Class %u Channel %u Role %d",
oper_class, channel, role);
}

44
wpa_supplicant-2.9_standard/src/p2p/p2p_parse.c
View File

@ -43,87 +43,87 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
switch (id) {
case P2P_ATTR_CAPABILITY:
if (len < 2) {
wpa_printf(MSG_DEBUG, "P2P: Too short Capability "
wpa_printf(MSG_INFO, "P2P: Too short Capability "
"attribute (length %d)", len);
return -1;
}
msg->capability = data;
wpa_printf(MSG_DEBUG, "P2P: * Device Capability %02x "
wpa_printf(MSG_INFO, "P2P: * Device Capability %02x "
"Group Capability %02x",
data[0], data[1]);
break;
case P2P_ATTR_DEVICE_ID:
if (len < ETH_ALEN) {
wpa_printf(MSG_DEBUG, "P2P: Too short Device ID "
wpa_printf(MSG_INFO, "P2P: Too short Device ID "
"attribute (length %d)", len);
return -1;
}
msg->device_id = data;
wpa_printf(MSG_DEBUG, "P2P: * Device ID " MACSTR_SEC,
wpa_printf(MSG_INFO, "P2P: * Device ID " MACSTR_SEC,
MAC2STR_SEC(msg->device_id));
break;
case P2P_ATTR_GROUP_OWNER_INTENT:
if (len < 1) {
wpa_printf(MSG_DEBUG, "P2P: Too short GO Intent "
wpa_printf(MSG_INFO, "P2P: Too short GO Intent "
"attribute (length %d)", len);
return -1;
}
msg->go_intent = data;
wpa_printf(MSG_DEBUG, "P2P: * GO Intent: Intent %u "
wpa_printf(MSG_INFO, "P2P: * GO Intent: Intent %u "
"Tie breaker %u", data[0] >> 1, data[0] & 0x01);
break;
case P2P_ATTR_STATUS:
if (len < 1) {
wpa_printf(MSG_DEBUG, "P2P: Too short Status "
wpa_printf(MSG_INFO, "P2P: Too short Status "
"attribute (length %d)", len);
return -1;
}
msg->status = data;
wpa_printf(MSG_DEBUG, "P2P: * Status: %d", data[0]);
wpa_printf(MSG_INFO, "P2P: * Status: %d", data[0]);
break;
case P2P_ATTR_LISTEN_CHANNEL:
if (len == 0) {
wpa_printf(MSG_DEBUG, "P2P: * Listen Channel: Ignore "
wpa_printf(MSG_INFO, "P2P: * Listen Channel: Ignore "
"null channel");
break;
}
if (len < 5) {
wpa_printf(MSG_DEBUG, "P2P: Too short Listen Channel "
wpa_printf(MSG_INFO, "P2P: Too short Listen Channel "
"attribute (length %d)", len);
return -1;
}
msg->listen_channel = data;
wpa_printf(MSG_DEBUG, "P2P: * Listen Channel: "
wpa_printf(MSG_INFO, "P2P: * Listen Channel: "
"Country %c%c(0x%02x) Regulatory "
"Class %d Channel Number %d", data[0], data[1],
data[2], data[3], data[4]);
break;
case P2P_ATTR_OPERATING_CHANNEL:
if (len == 0) {
wpa_printf(MSG_DEBUG, "P2P: * Operating Channel: "
wpa_printf(MSG_INFO, "P2P: * Operating Channel: "
"Ignore null channel");
break;
}
if (len < 5) {
wpa_printf(MSG_DEBUG, "P2P: Too short Operating "
wpa_printf(MSG_INFO, "P2P: Too short Operating "
"Channel attribute (length %d)", len);
return -1;
}
msg->operating_channel = data;
wpa_printf(MSG_DEBUG, "P2P: * Operating Channel: "
wpa_printf(MSG_INFO, "P2P: * Operating Channel: "
"Country %c%c(0x%02x) Regulatory "
"Class %d Channel Number %d", data[0], data[1],
data[2], data[3], data[4]);
break;
case P2P_ATTR_CHANNEL_LIST:
if (len < 3) {
wpa_printf(MSG_DEBUG, "P2P: Too short Channel List "
wpa_printf(MSG_INFO, "P2P: Too short Channel List "
"attribute (length %d)", len);
return -1;
}
msg->channel_list = data;
msg->channel_list_len = len;
wpa_printf(MSG_DEBUG, "P2P: * Channel List: Country String "
wpa_printf(MSG_INFO, "P2P: * Channel List: Country String "
"'%c%c(0x%02x)'", data[0], data[1], data[2]);
wpa_hexdump(MSG_MSGDUMP, "P2P: Channel List",
msg->channel_list, msg->channel_list_len);
@ -131,11 +131,11 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
case P2P_ATTR_GROUP_INFO:
msg->group_info = data;
msg->group_info_len = len;
wpa_printf(MSG_DEBUG, "P2P: * Group Info");
wpa_printf(MSG_INFO, "P2P: * Group Info");
break;
case P2P_ATTR_DEVICE_INFO:
if (len < ETH_ALEN + 2 + 8 + 1) {
wpa_printf(MSG_DEBUG, "P2P: Too short Device Info "
wpa_printf(MSG_INFO, "P2P: Too short Device Info "
"attribute (length %d)", len);
return -1;
}
@ -150,17 +150,17 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
pos += 8;
msg->num_sec_dev_types = *pos++;
if (msg->num_sec_dev_types * 8 > data + len - pos) {
wpa_printf(MSG_DEBUG, "P2P: Device Info underflow");
wpa_printf(MSG_INFO, "P2P: Device Info underflow");
return -1;
}
pos += msg->num_sec_dev_types * 8;
if (data + len - pos < 4) {
wpa_printf(MSG_DEBUG, "P2P: Invalid Device Name "
wpa_printf(MSG_INFO, "P2P: Invalid Device Name "
"length %d", (int) (data + len - pos));
return -1;
}
if (WPA_GET_BE16(pos) != ATTR_DEV_NAME) {
wpa_hexdump(MSG_DEBUG, "P2P: Unexpected Device Name "
wpa_hexdump(MSG_INFO, "P2P: Unexpected Device Name "
"header", pos, 4);
return -1;
}
@ -168,7 +168,7 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
nlen = WPA_GET_BE16(pos);
pos += 2;
if (nlen > data + len - pos || nlen > WPS_DEV_NAME_MAX_LEN) {
wpa_printf(MSG_DEBUG, "P2P: Invalid Device Name "
wpa_printf(MSG_INFO, "P2P: Invalid Device Name "
"length %u (buf len %d)", nlen,
(int) (data + len - pos));
return -1;

16
wpa_supplicant-2.9_standard/wpa_supplicant/events.c
View File

@ -1634,7 +1634,7 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s,
" freq=%d level=%d snr=%d est_throughput=%u",
i, MAC2STR(bss->bssid), bss->freq, bss->level,
bss->snr, bss->est_throughput);
wpa_printf(MSG_DEBUG, "%u: " MACSTR_SEC
wpa_printf(MSG_INFO, "%u: " MACSTR_SEC
" freq=%d level=%d snr=%d est_throughput=%u",
i, MAC2STR_SEC(bss->bssid), bss->freq, bss->level,
bss->snr, bss->est_throughput);
@ -1642,10 +1642,10 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s,
}
if (only_first_ssid)
wpa_dbg(wpa_s, MSG_DEBUG, "Try to find BSS matching pre-selected network id=%d",
wpa_dbg(wpa_s, MSG_INFO, "Try to find BSS matching pre-selected network id=%d",
group->id);
else
wpa_dbg(wpa_s, MSG_DEBUG, "Selecting BSS from priority group %d",
wpa_dbg(wpa_s, MSG_INFO, "Selecting BSS from priority group %d",
group->priority);
for (i = 0; i < wpa_s->last_scan_res_used; i++) {
@ -1662,7 +1662,7 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s,
bss == wpa_s->current_bss ? "current ": "",
MAC2STR(bss->bssid),
wpa_ssid_txt(bss->ssid, bss->ssid_len));
wpa_printf(MSG_DEBUG, " selected %sBSS " MACSTR_SEC
wpa_printf(MSG_INFO, " selected %sBSS " MACSTR_SEC
" ssid='%s'",
bss == wpa_s->current_bss ? "current ": "",
MAC2STR_SEC(bss->bssid),
@ -1825,11 +1825,11 @@ int wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
wpa_supplicant_req_new_scan(wpa_s, 10, 0);
return 0;
}
wpa_msg(wpa_s, MSG_DEBUG, "Request association with " MACSTR,
wpa_msg(wpa_s, MSG_INFO, "Request association with " MACSTR,
MAC2STR(selected->bssid));
wpa_supplicant_associate(wpa_s, selected, ssid);
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "Already associated or trying to "
wpa_dbg(wpa_s, MSG_INFO, "Already associated or trying to "
"connect with the selected AP");
}
@ -2373,10 +2373,10 @@ static int wpas_select_network_from_last_scan(struct wpa_supplicant *wpa_s,
return 1;
} else {
wpa_s->no_suitable_network++;
wpa_dbg(wpa_s, MSG_DEBUG, "No suitable network found");
wpa_dbg(wpa_s, MSG_INFO, "No suitable network found");
ssid = wpa_supplicant_pick_new_network(wpa_s);
if (ssid) {
wpa_dbg(wpa_s, MSG_DEBUG, "Setup a new network");
wpa_dbg(wpa_s, MSG_INFO, "Setup a new network");
wpa_supplicant_associate(wpa_s, NULL, ssid);
if (new_scan)
wpa_supplicant_rsn_preauth_scan_results(wpa_s);

30
wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c
View File

@ -1203,7 +1203,7 @@ static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
struct wpa_ssid *s;
int changed = 0;
wpa_printf(MSG_DEBUG, "P2P: Storing credentials for a persistent "
wpa_printf(MSG_INFO, "P2P: Storing credentials for a persistent "
"group (GO Dev Addr " MACSTR_SEC ")", MAC2STR_SEC(go_dev_addr));
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled == 2 &&
@ -1214,7 +1214,7 @@ static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
}
if (s) {
wpa_printf(MSG_DEBUG, "P2P: Update existing persistent group "
wpa_printf(MSG_INFO, "P2P: Update existing persistent group "
"entry");
if (ssid->passphrase && !s->passphrase)
changed = 1;
@ -1222,7 +1222,7 @@ static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
os_strcmp(ssid->passphrase, s->passphrase) != 0)
changed = 1;
} else {
wpa_printf(MSG_DEBUG, "P2P: Create a new persistent group "
wpa_printf(MSG_INFO, "P2P: Create a new persistent group "
"entry");
changed = 1;
s = wpa_config_add_network(wpa_s->conf);
@ -1909,7 +1909,7 @@ static void p2p_go_configured(void *ctx, void *data)
ssid = wpa_s->current_ssid;
if (ssid && ssid->mode == WPAS_MODE_P2P_GO) {
wpa_printf(MSG_DEBUG, "P2P: Group setup without provisioning");
wpa_printf(MSG_INFO, "P2P: Group setup without provisioning");
if (wpa_s->global->p2p_group_formation == wpa_s)
wpa_s->global->p2p_group_formation = NULL;
wpas_p2p_group_started(wpa_s, 1, ssid, ssid->frequency,
@ -2086,16 +2086,16 @@ static void wpas_start_wps_go(struct wpa_supplicant *wpa_s,
{
struct wpa_ssid *ssid;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Starting GO");
wpa_dbg(wpa_s, MSG_INFO, "P2P: Starting GO");
if (wpas_copy_go_neg_results(wpa_s, params) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not copy GO Negotiation "
wpa_dbg(wpa_s, MSG_INFO, "P2P: Could not copy GO Negotiation "
"results");
return;
}
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not add network for GO");
wpa_dbg(wpa_s, MSG_INFO, "P2P: Could not add network for GO");
return;
}
@ -2124,7 +2124,7 @@ static void wpas_start_wps_go(struct wpa_supplicant *wpa_s,
ssid->edmg_channel = op_channel;
ssid->enable_edmg = params->edmg;
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
wpa_dbg(wpa_s, MSG_INFO,
"P2P: Could not match EDMG channel, freq %d, for GO",
params->freq);
}
@ -2307,7 +2307,7 @@ static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
wpas_p2p_get_group_ifname(wpa_s, ifname, sizeof(ifname));
force_ifname[0] = '\0';
wpa_printf(MSG_DEBUG, "P2P: Create a new interface %s for the group",
wpa_printf(MSG_INFO, "P2P: Create a new interface %s for the group",
ifname);
wpa_s->p2p_group_idx++;
#ifdef CONFIG_OPEN_HARMONY_PATCH
@ -2324,7 +2324,7 @@ static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
if (wpa_s->conf->p2p_interface_random_mac_addr) {
random_mac_addr(wpa_s->pending_interface_addr);
wpa_printf(MSG_DEBUG, "P2P: Generate random MAC address " MACSTR_SEC
wpa_printf(MSG_INFO, "P2P: Generate random MAC address " MACSTR_SEC
" for the group",
MAC2STR_SEC(wpa_s->pending_interface_addr));
}
@ -2333,14 +2333,14 @@ static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
(void)WifiCmdGetOwnMac(ifname, (char *)wpa_s->pending_interface_addr, ETH_ALEN);
#endif // CONFIG_OHOS_P2P
if (force_ifname[0]) {
wpa_printf(MSG_DEBUG, "P2P: Driver forced interface name %s",
wpa_printf(MSG_INFO, "P2P: Driver forced interface name %s",
force_ifname);
os_strlcpy(wpa_s->pending_interface_name, force_ifname,
sizeof(wpa_s->pending_interface_name));
} else
os_strlcpy(wpa_s->pending_interface_name, ifname,
sizeof(wpa_s->pending_interface_name));
wpa_printf(MSG_DEBUG, "P2P: Created pending virtual interface %s addr "
wpa_printf(MSG_INFO, "P2P: Created pending virtual interface %s addr "
MACSTR_SEC, wpa_s->pending_interface_name,
MAC2STR_SEC(wpa_s->pending_interface_addr));
@ -2355,7 +2355,7 @@ static void wpas_p2p_remove_pending_group_interface(
is_zero_ether_addr(wpa_s->pending_interface_addr))
return; /* No pending virtual interface */
wpa_printf(MSG_DEBUG, "P2P: Removing pending group interface %s",
wpa_printf(MSG_INFO, "P2P: Removing pending group interface %s",
wpa_s->pending_interface_name);
wpa_drv_if_remove(wpa_s, wpa_s->pending_interface_type,
wpa_s->pending_interface_name);
@ -7118,7 +7118,7 @@ wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
wpa_s->p2p_go_allow_dfs = 0;
}
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use separate group interface %s",
wpa_dbg(wpa_s, MSG_INFO, "P2P: Use separate group interface %s",
group_wpa_s->ifname);
group_wpa_s->p2p_first_connection_timeout = 0;
return group_wpa_s;
@ -8933,7 +8933,7 @@ void wpas_p2p_notify_ap_sta_authorized(struct wpa_supplicant *wpa_s,
}
}
if (!wpa_s->p2p_go_group_formation_completed) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Marking group formation completed on GO on first data connection");
wpa_dbg(wpa_s, MSG_INFO, "P2P: Marking group formation completed on GO on first data connection");
wpa_s->p2p_go_group_formation_completed = 1;
wpa_s->global->p2p_group_formation = NULL;
wpa_s->p2p_in_provisioning = 0;

4
wpa_supplicant-2.9_standard/wpa_supplicant/sme.c
View File

@ -383,11 +383,11 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
}
}
#endif /* IEEE8021X_EAPOL */
wpa_dbg(wpa_s, MSG_DEBUG, "Automatic auth_alg selection: 0x%x",
wpa_dbg(wpa_s, MSG_INFO, "Automatic auth_alg selection: 0x%x",
params.auth_alg);
if (ssid->auth_alg) {
params.auth_alg = ssid->auth_alg;
wpa_dbg(wpa_s, MSG_DEBUG, "Overriding auth_alg selection: "
wpa_dbg(wpa_s, MSG_INFO, "Overriding auth_alg selection: "
"0x%x", params.auth_alg);
}
#ifdef CONFIG_SAE

2
wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
View File

@ -7281,7 +7281,7 @@ struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
wpa_vendor_ext_modify_global_ifaces(global);
#endif
wpa_dbg(wpa_s, MSG_DEBUG, "Added interface %s", wpa_s->ifname);
wpa_dbg(wpa_s, MSG_INFO, "Added interface %s", wpa_s->ifname);
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
#ifdef CONFIG_P2P