From 52f4abfd06e7ab2703ee9eed2277582811cc3ff5 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 26 Jul 2014 13:11:34 +0300 Subject: [PATCH] P2P: Remove PSK/passphrase from P2P-GROUP-STARTED debug log entry The PSK/passphrase are needed for the control interface events since the upper layer UI component is required by the specification to be able to make this available for manual configuration. However, this is not needed in the INFO verbosity level debug entry, so split the event generation into two parts. Signed-off-by: Jouni Malinen --- wpa_supplicant/p2p_supplicant.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index bf7601476..f1269ad7c 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -825,17 +825,26 @@ static void wpas_p2p_group_started(struct wpa_supplicant *wpa_s, if (passphrase && passphrase[0] == '\0') passphrase = NULL; - wpa_msg_global(wpa_s->parent, MSG_INFO, - P2P_EVENT_GROUP_STARTED - "%s %s ssid=\"%s\" freq=%d%s%s%s%s%s go_dev_addr=" - MACSTR "%s%s", - wpa_s->ifname, go ? "GO" : "client", ssid_txt, freq, - psk ? " psk=" : "", psk_txt, - passphrase ? " passphrase=\"" : "", - passphrase ? passphrase : "", - passphrase ? "\"" : "", - MAC2STR(go_dev_addr), - persistent ? " [PERSISTENT]" : "", extra); + /* + * Include PSK/passphrase only in the control interface message and + * leave it out from the debug log entry. + */ + wpa_msg_global_ctrl(wpa_s->parent, MSG_INFO, + P2P_EVENT_GROUP_STARTED + "%s %s ssid=\"%s\" freq=%d%s%s%s%s%s go_dev_addr=" + MACSTR "%s%s", + wpa_s->ifname, go ? "GO" : "client", ssid_txt, freq, + psk ? " psk=" : "", psk_txt, + passphrase ? " passphrase=\"" : "", + passphrase ? passphrase : "", + passphrase ? "\"" : "", + MAC2STR(go_dev_addr), + persistent ? " [PERSISTENT]" : "", extra); + wpa_printf(MSG_INFO, P2P_EVENT_GROUP_STARTED + "%s %s ssid=\"%s\" freq=%d go_dev_addr=" MACSTR "%s%s", + wpa_s->ifname, go ? "GO" : "client", ssid_txt, freq, + MAC2STR(go_dev_addr), persistent ? " [PERSISTENT]" : "", + extra); }