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 <j@w1.fi>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index bf76014761cd4b39c78aedc7eb6020b22c378c6e..f1269ad7c90178663ef25b757f478a236c6523e2 100644 (file)
--- 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);
 }