From 84c78f9570a619885b04896acb3b094a70cb6e2d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 16 Feb 2012 16:27:41 +0200 Subject: [PATCH] Allow ENABLE_NETWORK to avoid automatic connection Extra parameter "no-connect" can now be added to the ENABLE_NETWORK ctrl_iface command to avoid automatic connection to the enabled network. Signed-hostap: Jouni Malinen --- wpa_supplicant/ctrl_iface.c | 5 +++++ wpa_supplicant/wpa_cli.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 3602556b0..fda6eeb83 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1592,6 +1592,11 @@ static int wpa_supplicant_ctrl_iface_enable_network( "ENABLE_NETWORK with persistent P2P group"); return -1; } + + if (os_strstr(cmd, " no-connect")) { + ssid->disabled = 0; + return 0; + } } wpa_supplicant_enable_network(wpa_s, ssid); diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index af2e99118..ed269b289 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -1464,7 +1464,12 @@ static int wpa_cli_cmd_enable_network(struct wpa_ctrl *ctrl, int argc, return -1; } - res = os_snprintf(cmd, sizeof(cmd), "ENABLE_NETWORK %s", argv[0]); + if (argc > 1) + res = os_snprintf(cmd, sizeof(cmd), "ENABLE_NETWORK %s %s", + argv[0], argv[1]); + else + res = os_snprintf(cmd, sizeof(cmd), "ENABLE_NETWORK %s", + argv[0]); if (res < 0 || (size_t) res >= sizeof(cmd)) return -1; cmd[sizeof(cmd) - 1] = '\0';