[nrf fromtree] modules: hostap: Add interface arg to cli commands

Now that we support multiple VIFs, need to add argument for the
interface for any command.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit e53e5baa22d394efaed03ab76a4708cc36e8c986)

Author: krish2718

modules/hostap/src/hapd_api.c

@@ -376,7 +376,7 @@ bool hostapd_ap_reg_domain(const struct device *dev,
 		return false;
 	}
 
-	return hostapd_cli_cmd_v(iface->ctrl_conn, "set country_code %s", reg_domain->country_code);
+	return hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code);
 }
 
 static int hapd_config_chan_center_seg0(struct hostapd_iface *iface,

modules/hostap/src/wpa_cli.c

@@ -9,9 +9,11 @@
  */
 
 #include <stdlib.h>
+#include <sys/types.h>
 #include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/net/net_if.h>
+#include <zephyr/net/socket.h>
 #include <zephyr/init.h>
 
 
@@ -21,28 +23,64 @@
 #include "wpa_supplicant_i.h"
 #include "wpa_cli_zephyr.h"
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+#include "hostapd.h"
+#include "hapd_main.h"
 #include "hostapd_cli_zephyr.h"
 #endif
 
-static int cmd_wpa_cli(const struct shell *sh,
-			  size_t argc,
-			  const char *argv[])
+static int cmd_wpa_cli(const struct shell *sh, size_t argc, const char *argv[])
 {
-	struct net_if *iface = net_if_get_first_wifi();
+	struct net_if *iface = NULL;
 	char if_name[CONFIG_NET_INTERFACE_NAME_LEN + 1];
 	struct wpa_supplicant *wpa_s = NULL;
+	size_t arg_offset = 1;
+	int idx = -1;
+	bool iface_found = false;
+
+	if (argc > 2 &&
+	    ((strcmp(argv[1], "-i") == 0) ||
+	     (strncmp(argv[1], "-i", 2) == 0 && argv[1][2] != '\0'))) {
+		/* Handle both "-i 2" and "-i2" */
+		if (strcmp(argv[1], "-i") == 0) {
+			idx = strtol(argv[2], NULL, 10);
+			arg_offset = 3;
+		} else {
+			idx = strtol(&argv[1][2], NULL, 10);
+			arg_offset = 2;
+		}
+		iface = net_if_get_by_index(idx);
+		if (!iface) {
+			shell_error(sh, "Interface index %d not found", idx);
+			return -ENODEV;
+		}
+		net_if_get_name(iface, if_name, sizeof(if_name));
+		if_name[sizeof(if_name) - 1] = '\0';
+		iface_found = true;
+	} else {
+		/* Default to first Wi-Fi interface */
+		iface = net_if_get_first_wifi();
+		if (!iface) {
+			shell_error(sh, "No Wi-Fi interface found");
+			return -ENOENT;
+		}
+		net_if_get_name(iface, if_name, sizeof(if_name));
+		if_name[sizeof(if_name) - 1] = '\0';
+		arg_offset = 1;
+		iface_found = true;
+	}
 
-	ARG_UNUSED(sh);
-
-	if (iface == NULL) {
-		shell_error(sh, "No Wifi interface found");
-		return -ENOENT;
+	if (!iface_found) {
+		shell_error(sh, "No interface found");
+		return -ENODEV;
 	}
 
-	net_if_get_name(iface, if_name, sizeof(if_name));
 	wpa_s = zephyr_get_handle_by_ifname(if_name);
+	if (!wpa_s) {
+		shell_error(sh, "No wpa_supplicant context for interface '%s'", if_name);
+		return -ENODEV;
+	}
 
-	if (argc == 1) {
+	if (argc <= arg_offset) {
 		shell_error(sh, "Missing argument");
 		return -EINVAL;
 	}
@@ -51,15 +89,65 @@ static int cmd_wpa_cli(const struct shell *sh,
 	argc++;
 
 	/* Remove wpa_cli from the argument list */
-	return zephyr_wpa_ctrl_zephyr_cmd(wpa_s->ctrl_conn, argc - 1, &argv[1]);
+	return zephyr_wpa_ctrl_zephyr_cmd(wpa_s->ctrl_conn, argc - arg_offset, &argv[arg_offset]);
 }
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 static int cmd_hostapd_cli(const struct shell *sh, size_t argc, const char *argv[])
 {
-	ARG_UNUSED(sh);
+	struct net_if *iface = NULL;
+	size_t arg_offset = 1;
+	struct hostapd_iface *hapd_iface;
+	int idx = -1;
+	bool iface_found = false;
+	char if_name[CONFIG_NET_INTERFACE_NAME_LEN + 1];
+	int ret;
+
+	if (argc > 2 &&
+	    ((strcmp(argv[1], "-i") == 0) ||
+	     (strncmp(argv[1], "-i", 2) == 0 && argv[1][2] != '\0'))) {
+		/* Handle both "-i 2" and "-i2" */
+		if (strcmp(argv[1], "-i") == 0) {
+			idx = strtol(argv[2], NULL, 10);
+			arg_offset = 3;
+		} else {
+			idx = strtol(&argv[1][2], NULL, 10);
+			arg_offset = 2;
+		}
+		iface = net_if_get_by_index(idx);
+		if (!iface) {
+			shell_error(sh, "Interface index %d not found", idx);
+			return -ENODEV;
+		}
+		iface_found = true;
+	} else {
+		iface = net_if_get_first_wifi();
+		if (!iface) {
+			shell_error(sh, "No Wi-Fi interface found");
+			return -ENOENT;
+		}
+		arg_offset = 1;
+		iface_found = true;
+	}
+
+	if (!iface_found) {
+		shell_error(sh, "No interface found");
+		return -ENODEV;
+	}
+
+	ret = net_if_get_name(iface, if_name, sizeof(if_name));
+	if (!ret) {
+		shell_error(sh, "Cannot get interface name (%d)", ret);
+		return -ENODEV;
+	}
+
+	hapd_iface = zephyr_get_hapd_handle_by_ifname(if_name);
+	if (!hapd_iface) {
+		shell_error(sh, "No hostapd context for interface '%s'", if_name);
+		return -ENODEV;
+	}
 
-	if (argc == 1) {
+	if (argc <= arg_offset) {
 		shell_error(sh, "Missing argument");
 		return -EINVAL;
 	}
@@ -68,7 +156,8 @@ static int cmd_hostapd_cli(const struct shell *sh, size_t argc, const char *argv
 	argc++;
 
 	/* Remove hostapd_cli from the argument list */
-	return zephyr_hostapd_ctrl_zephyr_cmd(argc - 1, &argv[1]);
+	return zephyr_hostapd_ctrl_zephyr_cmd(hapd_iface->ctrl_conn, argc - arg_offset,
+					      &argv[arg_offset]);
 }
 #endif
 
@@ -77,9 +166,10 @@ static int cmd_hostapd_cli(const struct shell *sh, size_t argc, const char *argv
  */
 SHELL_CMD_REGISTER(wpa_cli,
 		   NULL,
-		   "wpa_cli commands (only for internal use)",
+		   "wpa_cli [-i idx] <command> (only for internal use)",
 		   cmd_wpa_cli);
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-SHELL_CMD_REGISTER(hostapd_cli, NULL, "hostapd_cli commands (only for internal use)",
+SHELL_CMD_REGISTER(hostapd_cli, NULL,
+		   "hostapd_cli [-i idx] <command> (only for internal use)",
 		   cmd_hostapd_cli);
 #endif