sta_disconnect: DisconnectInterface

Support the DisconnectInterface argument for P2P.

Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>

p2p.c

@@ -483,6 +483,33 @@ static struct wfa_cs_p2p_group * p2p_group_get(struct sigma_dut *dut,
 }
 
 
+const char * get_p2p_group_ifname(struct sigma_dut *dut, const char *ifname)
+{
+	char *iface, *pos;
+	static char buf[1000];
+
+	/* Try to find a suitable group interface */
+	if (wpa_command_resp(get_main_ifname(dut), "INTERFACES",
+			     buf, sizeof(buf)) < 0)
+		return ifname;
+
+	iface = buf;
+	while (iface && *iface) {
+		pos = strchr(iface, '\n');
+		if (pos)
+			*pos++ = '\0';
+		if (memcmp(iface, "p2p-", 4) == 0) {
+			sigma_dut_print(dut, DUT_MSG_DEBUG,
+					"Considering interface '%s' for IP address",
+					iface);
+			return iface;
+		}
+		iface = pos;
+	}
+	return ifname;
+}
+
+
 static const char * get_group_ifname(struct sigma_dut *dut, const char *ifname)
 {
 	static char buf[1000];

sigma_dut.h

@@ -1428,6 +1428,7 @@ void start_dhcp(struct sigma_dut *dut, const char *group_ifname, int go);
 void stop_dhcp(struct sigma_dut *dut, const char *group_ifname, int go);
 int p2p_discover_peer(struct sigma_dut *dut, const char *ifname,
 		      const char *peer, int full);
+const char * get_p2p_group_ifname(struct sigma_dut *dut, const char *ifname);
 enum sigma_cmd_result cmd_sta_p2p_reset(struct sigma_dut *dut,
 					struct sigma_conn *conn,
 					struct sigma_cmd *cmd);

sta.c

@@ -9005,6 +9005,10 @@ static enum sigma_cmd_result cmd_sta_disconnect(struct sigma_dut *dut,
 {
 	const char *intf = get_param(cmd, "Interface");
 	const char *val = get_param(cmd, "maintain_profile");
+	const char *disconnect_iface = get_param(cmd, "DisconnectInterface");
+
+	if (disconnect_iface && strcmp(disconnect_iface, "P2P") == 0)
+		intf = get_p2p_group_ifname(dut, intf);
 
 	if (dut->program == PROGRAM_OCE ||
 	    dut->program == PROGRAM_HE ||