From a69742c2f8f7cf5ceceec4dc1dcf021e58515e16 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 9 Sep 2019 16:28:17 +0300 Subject: [PATCH] wpa_cli: Do not pick p2p-dev-* interfaces by default These are the driver-specific interface for the non-netdev P2P Device interface and not something that useful for most use cases. Skip them to allow the main netdev (e.g., wlan0 over p2p-dev-wlan0) to be selected. Signed-off-by: Jouni Malinen --- wpa_supplicant/wpa_cli.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index 004b84d83..fa24121ca 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -4606,8 +4606,11 @@ static char * wpa_cli_get_default_ifname(void) if (dent->d_type != DT_SOCK && dent->d_type != DT_UNKNOWN) continue; #endif /* _DIRENT_HAVE_D_TYPE */ + /* Skip current/previous directory and special P2P Device + * interfaces. */ if (os_strcmp(dent->d_name, ".") == 0 || - os_strcmp(dent->d_name, "..") == 0) + os_strcmp(dent->d_name, "..") == 0 || + os_strncmp(dent->d_name, "p2p-dev-", 8) == 0) continue; printf("Selected interface '%s'\n", dent->d_name); ifname = os_strdup(dent->d_name);