jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow ENABLE_NETWORK to avoid automatic connection

Browse source 
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 <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-02-16 16:27:41 +02:00 committed by Jouni Malinen
parent 8b9d0bfa00
commit 84c78f9570
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/ctrl_iface.c
View file

@ -1592,6 +1592,11 @@ static int wpa_supplicant_ctrl_iface_enable_network(
"ENABLE_NETWORK with persistent P2P group"); "ENABLE_NETWORK with persistent P2P group");
return -1; return -1;
} }
if (os_strstr(cmd, " no-connect")) {
ssid->disabled = 0;
return 0;
}
} }
wpa_supplicant_enable_network(wpa_s, ssid); wpa_supplicant_enable_network(wpa_s, ssid);

7
wpa_supplicant/wpa_cli.c
View file

@ -1464,7 +1464,12 @@ static int wpa_cli_cmd_enable_network(struct wpa_ctrl *ctrl, int argc,
return -1; 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)) if (res < 0 || (size_t) res >= sizeof(cmd))
return -1; return -1;
cmd[sizeof(cmd) - 1] = '\0'; cmd[sizeof(cmd) - 1] = '\0';