Use exact interface as socket parameter for init

For p2p, there are virtual interfaces (like p2p-wlan0-X) created and
that results in binding to the common init socket right now.

Instead, have the init bind fail for p2p interfaces and create seperate
sockets specified by the ctrl_interface path in config file

Bug: 5002384
Change-Id: Ia155df079a0bcca1871b6bcab2ef7111f0cba6c1
diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index 306a222..9ad75d4 100644
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -281,7 +281,7 @@
 		goto fail;
 #ifdef ANDROID
 	os_snprintf(addr.sun_path, sizeof(addr.sun_path), "wpa_%s",
-		    wpa_s->conf->ctrl_interface);
+		    wpa_s->ifname);
 	priv->sock = android_get_control_socket(addr.sun_path);
 	if (priv->sock >= 0)
 		goto havesock;