net: wifi: shell: update SSID argument format

Instead of providing a comma seperated list of SSIDs, provide the SSIDs
individually. This substantially simplifies the implementation.

Signed-off-by: Jordan Yates <[email protected]>

Author: Jordan Yates

include/zephyr/net/wifi_utils.h

@@ -63,13 +63,15 @@ int wifi_utils_parse_scan_bands(char *scan_bands_str, uint8_t *band_map);
  * as a comma separated string and convert it to an array.
  *
  * @param scan_ssids_str List of SSIDs expressed as a comma separated list.
- * @param ssids Pointer to an array where the parsed SSIDs are to be stored.
+ * @param ssids Pointer to an array where the SSIDs pointers are to be stored.
+ * @param num_ssids Maximum number of SSIDs that can be stored.
  *
  * @retval 0 on success.
  * @retval -errno value in case of failure.
  */
 int wifi_utils_parse_scan_ssids(char *scan_ssids_str,
-				char ssids[][WIFI_SSID_MAX_LEN + 1]);
+				const char *ssids[],
+				uint8_t num_ssids);
 
 
 /**

subsys/net/l2/wifi/wifi_shell.c

@@ -480,7 +480,7 @@ static int wifi_scan_args_to_params(const struct shell *sh,
 					       {"bands", required_argument, 0, 'b'},
 					       {"dwell_time_active", required_argument, 0, 'a'},
 					       {"dwell_time_passive", required_argument, 0, 'p'},
-					       {"ssids", required_argument, 0, 's'},
+					       {"ssid", required_argument, 0, 's'},
 					       {"max_bss", required_argument, 0, 'm'},
 					       {"chans", required_argument, 0, 'c'},
 					       {"help", no_argument, 0, 'h'},
@@ -537,7 +537,9 @@ static int wifi_scan_args_to_params(const struct shell *sh,
 			opt_num++;
 			break;
 		case 's':
-			if (wifi_utils_parse_scan_ssids(optarg, params->ssids)) {
+			if (wifi_utils_parse_scan_ssids(optarg,
+							params->ssids,
+							ARRAY_SIZE(params->ssids))) {
 				shell_fprintf(sh, SHELL_ERROR, "Invalid SSID(s)\n");
 				return -ENOEXEC;
 			}
@@ -1653,7 +1655,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		    "[-b, --bands <Comma separated list of band values (2/5/6)>] : Bands to be scanned where 2: 2.4 GHz, 5: 5 GHz, 6: 6 GHz.\n"
 		    "[-a, --dwell_time_active <val_in_ms>] : Active scan dwell time (in ms) on a channel. Range 5 ms to 1000 ms.\n"
 		    "[-p, --dwell_time_passive <val_in_ms>] : Passive scan dwell time (in ms) on a channel. Range 10 ms to 1000 ms.\n"
-		    "[-s, --ssids <Comma separate list of SSIDs>] : SSID list to scan for.\n"
+		    "[-s, --ssid : SSID to scan for. Can be provided multiple times.\n"
 		    "[-m, --max_bss <val>] : Maximum BSSes to scan for. Range 1 - 65535.\n"
 		    "[-c, --chans <Comma separated list of channel ranges>] : Channels to be scanned. The channels must be specified in the form band1:chan1,chan2_band2:chan3,..etc. band1, band2 must be valid band values and chan1, chan2, chan3 must be specified as a list of comma separated values where each value is either a single channel or a channel range specified as chan_start-chan_end. Each band channel set has to be separated by a _. For example, a valid channel specification can be 2:1,6-11,14_5:36,149-165,44\n"
 		    "[-h, --help] : Print out the help for the scan command.",

subsys/net/l2/wifi/wifi_utils.c

@@ -263,54 +263,33 @@ int wifi_utils_parse_scan_bands(char *scan_bands_str, uint8_t *band_map)
 }
 
 int wifi_utils_parse_scan_ssids(char *scan_ssids_str,
-				char ssids[][WIFI_SSID_MAX_LEN + 1])
+				const char *ssids[],
+				uint8_t num_ssids)
 {
-	char parse_str[(WIFI_MGMT_SCAN_SSID_FILT_MAX * (WIFI_SSID_MAX_LEN + 1)) + 1];
-	char *ssid = NULL;
-	char *ctx = NULL;
-	uint8_t i = 0;
 	int len;
 
 	if (!scan_ssids_str) {
 		return -EINVAL;
 	}
 
 	len = strlen(scan_ssids_str);
-
-	if (len > (WIFI_MGMT_SCAN_SSID_FILT_MAX * (WIFI_SSID_MAX_LEN + 1))) {
+	if (len > WIFI_SSID_MAX_LEN) {
 		NET_ERR("SSID string (%s) size (%d) exceeds maximum allowed value (%d)",
 			scan_ssids_str,
 			len,
-			(WIFI_MGMT_SCAN_SSID_FILT_MAX * (WIFI_SSID_MAX_LEN + 1)));
+			WIFI_SSID_MAX_LEN);
 		return -EINVAL;
 	}
 
-	strncpy(parse_str, scan_ssids_str, len);
-	parse_str[len] = '\0';
-
-	ssid = strtok_r(parse_str, ",", &ctx);
-
-	while (ssid) {
-		if (strlen(ssid) > WIFI_SSID_MAX_LEN) {
-			NET_ERR("SSID length (%zu) exceeds maximum value (%d) for SSID %s",
-				strlen(ssid),
-				WIFI_SSID_MAX_LEN,
-				ssid);
-			return -EINVAL;
-		}
-
-		if (i >= WIFI_MGMT_SCAN_SSID_FILT_MAX) {
-			NET_WARN("Exceeded maximum allowed (%d) SSIDs. Ignoring SSIDs %s onwards",
-				 WIFI_MGMT_SCAN_SSID_FILT_MAX,
-				 ssid);
-			break;
+	for (int i = 0; i < num_ssids; i++) {
+		if (ssids[i] != NULL) {
+			continue;
 		}
-
-		strcpy(&ssids[i++][0], ssid);
-
-		ssid = strtok_r(NULL, ",", &ctx);
+		ssids[i] = scan_ssids_str;
+		return 0;
 	}
 
+	NET_WARN("Exceeded maximum allowed SSIDs (%d)", num_ssids);
 	return 0;
 }