michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: wifi: shell: drop explicit length parameter

Browse source 
Calculate length based on provided SSID string, so user does not have to
provide length explicitly over shell.

This patch also removes requirement of minimum 3 characters SSID, as
the shortest SSID can be even 1 character.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
This commit is contained in:
Marcin Niestroj 2020-02-19 14:07:51 +01:00 • committed by Johan Hedberg
commit f5edc6db8f
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/net/l2/wifi/wifi_shell.c
View file

@ -150,20 +150,15 @@ static int __wifi_args_to_params(size_t argc, char *argv[],
struct wifi_connect_req_params *params) struct wifi_connect_req_params *params)
{ {
char *endptr; char *endptr;
int idx = 2; int idx = 1;
if (argc < 2) { if (argc < 1) {
return -EINVAL; return -EINVAL;
} }
/* SSID */ /* SSID */
params->ssid = argv[0]; params->ssid = argv[0];
params->ssid_length = strlen(params->ssid);
/* SSID length */
params->ssid_length = strtol(argv[1], &endptr, 10);
if (*endptr != '\0' || params->ssid_length <= 2U) {
return -EINVAL;
}
/* Channel (optional) */ /* Channel (optional) */
if ((idx < argc) && (strlen(argv[idx]) <= 2)) { if ((idx < argc) && (strlen(argv[idx]) <= 2)) {
@ -318,7 +313,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_cmd_ap,
SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands, SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
SHELL_CMD(connect, NULL, SHELL_CMD(connect, NULL,
"\"<SSID>\"\n<SSID length>\n<channel number (optional), " "\"<SSID>\"\n<channel number (optional), "
"0 means all>\n" "0 means all>\n"
"<PSK (optional: valid only for secured SSIDs)>", "<PSK (optional: valid only for secured SSIDs)>",
cmd_wifi_connect), cmd_wifi_connect),