From 60c44471bf25f9e84d8701afe1bbcbcc88e18c89 Mon Sep 17 00:00:00 2001 From: rpaulo Date: Sun, 13 Jun 2010 20:32:04 +0000 Subject: Import wpa_supplicant & hostapd 0.6.9. --- hostapd/hostapd_cli.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'hostapd/hostapd_cli.c') diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c index 2614113..c2ecd4e 100644 --- a/hostapd/hostapd_cli.c +++ b/hostapd/hostapd_cli.c @@ -87,7 +87,7 @@ static const char *commands_help = " sa_query send SA Query to a station\n" #endif /* CONFIG_IEEE80211W */ #ifdef CONFIG_WPS -" wps_pin add WPS Enrollee PIN (Device Password)\n" +" wps_pin [timeout] add WPS Enrollee PIN (Device Password)\n" " wps_pbc indicate button pushed to initiate PBC\n" #endif /* CONFIG_WPS */ " help show this usage help\n" @@ -260,12 +260,16 @@ static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc, char *argv[]) { char buf[64]; - if (argc != 2) { - printf("Invalid 'wps_pin' command - exactly two arguments, " + if (argc < 2) { + printf("Invalid 'wps_pin' command - at least two arguments, " "UUID and PIN, are required.\n"); return -1; } - snprintf(buf, sizeof(buf), "WPS_PIN %s %s", argv[0], argv[1]); + if (argc > 2) + snprintf(buf, sizeof(buf), "WPS_PIN %s %s %s", + argv[0], argv[1], argv[2]); + else + snprintf(buf, sizeof(buf), "WPS_PIN %s %s", argv[0], argv[1]); return wpa_ctrl_command(ctrl, buf); } -- cgit v1.1