net: shell: Check connection & capabilities in any TWT operation

Connection status & AP capabilities checked before any TWT operation
is initiated.

Signed-off-by: Ajay Parida <[email protected]>

Author: ajayparida

include/zephyr/net/wifi.h

@@ -336,4 +336,41 @@ enum wifi_twt_setup_resp_status {
 	WIFI_TWT_RESP_NOT_RECEIVED,
 };
 
+enum wifi_twt_fail_reason {
+	WIFI_TWT_FAIL_UNSPECIFIED,
+	WIFI_TWT_FAIL_CMD_EXEC_FAIL,
+	WIFI_TWT_FAIL_OPERATION_NOT_SUPPORTED,
+	WIFI_TWT_FAIL_UNABLE_TO_GET_IFACE_STATUS,
+	WIFI_TWT_FAIL_DEVICE_NOT_CONNECTED,
+	WIFI_TWT_FAIL_PEER_NOT_HE_CAPAB,
+	WIFI_TWT_FAIL_PEER_NOT_TWT_CAPAB,
+	WIFI_TWT_FAIL_OPERATION_IN_PROGRESS,
+	WIFI_TWT_FAIL_INVALID_FLOW_ID,
+};
+
+static const char * const twt_err_code_tbl[] = {
+	[WIFI_TWT_FAIL_UNSPECIFIED] = "Unspecfied",
+	[WIFI_TWT_FAIL_CMD_EXEC_FAIL] = "Command Execution failed",
+	[WIFI_TWT_FAIL_OPERATION_NOT_SUPPORTED] =
+		"Operation not supported",
+	[WIFI_TWT_FAIL_UNABLE_TO_GET_IFACE_STATUS] =
+		"Unable to get iface status",
+	[WIFI_TWT_FAIL_DEVICE_NOT_CONNECTED] =
+		"Device not connected",
+	[WIFI_TWT_FAIL_PEER_NOT_HE_CAPAB] = "Peer not HE capable",
+	[WIFI_TWT_FAIL_PEER_NOT_TWT_CAPAB] = "Peer not TWT capable",
+	[WIFI_TWT_FAIL_OPERATION_IN_PROGRESS] =
+		"Operation already in progress",
+	[WIFI_TWT_FAIL_INVALID_FLOW_ID] =
+		"Invalid negotiated flow id",
+};
+
+static inline const char *get_twt_err_code_str(int16_t err_no)
+{
+	if ((err_no) < ARRAY_SIZE(twt_err_code_tbl)) {
+		return twt_err_code_tbl[err_no];
+	}
+
+	return "<unknown>";
+}
 #endif /* ZEPHYR_INCLUDE_NET_WIFI_H_ */

include/zephyr/net/wifi_mgmt.h

@@ -187,6 +187,7 @@ struct wifi_iface_status {
 	int rssi;
 	unsigned char dtim_period;
 	unsigned short beacon_interval;
+	bool twt_capable;
 };
 
 struct wifi_ps_params {
@@ -226,6 +227,7 @@ struct wifi_twt_params {
 			bool teardown_all;
 		} teardown;
 	};
+	enum wifi_twt_fail_reason fail_reason;
 };
 
 /* Flow ID is only 3 bits */

subsys/net/l2/wifi/wifi_mgmt.c

@@ -277,12 +277,43 @@ static int wifi_set_twt(uint32_t mgmt_request, struct net_if *iface,
 	struct net_wifi_mgmt_offload *off_api =
 		(struct net_wifi_mgmt_offload *) dev->api;
 	struct wifi_twt_params *twt_params = data;
+	struct wifi_iface_status info = { 0 };
 
 	if (off_api == NULL || off_api->set_twt == NULL) {
+		twt_params->fail_reason =
+			WIFI_TWT_FAIL_OPERATION_NOT_SUPPORTED;
 		return -ENOTSUP;
 	}
 
+	if (net_mgmt(NET_REQUEST_WIFI_IFACE_STATUS, iface, &info,
+			sizeof(struct wifi_iface_status))) {
+		twt_params->fail_reason =
+			WIFI_TWT_FAIL_UNABLE_TO_GET_IFACE_STATUS;
+		goto fail;
+	}
+
+	if (info.state != WIFI_STATE_COMPLETED) {
+		twt_params->fail_reason =
+			WIFI_TWT_FAIL_DEVICE_NOT_CONNECTED;
+		goto fail;
+	}
+
+	if (info.link_mode < WIFI_6) {
+		twt_params->fail_reason =
+			WIFI_TWT_FAIL_PEER_NOT_HE_CAPAB;
+		goto fail;
+	}
+
+	if (!info.twt_capable) {
+		twt_params->fail_reason =
+			WIFI_TWT_FAIL_PEER_NOT_TWT_CAPAB;
+		goto fail;
+	}
+
 	return off_api->set_twt(dev, twt_params);
+fail:
+	return -ENOEXEC;
+
 }
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_TWT, wifi_set_twt);

subsys/net/l2/wifi/wifi_shell.c

@@ -376,6 +376,8 @@ static int cmd_wifi_status(const struct shell *sh, size_t argc, char *argv[])
 		shell_fprintf(sh, SHELL_NORMAL, "RSSI: %d\n", status.rssi);
 		shell_fprintf(sh, SHELL_NORMAL, "Beacon Interval: %d\n", status.beacon_interval);
 		shell_fprintf(sh, SHELL_NORMAL, "DTIM: %d\n", status.dtim_period);
+		shell_fprintf(sh, SHELL_NORMAL, "TWT: %s\n",
+				status.twt_capable ? "Supported" : "Not supported");
 	}
 
 	return 0;
@@ -606,9 +608,11 @@ static int cmd_wifi_twt_setup_quick(const struct shell *sh, size_t argc,
 		return -EINVAL;
 
 	if (net_mgmt(NET_REQUEST_WIFI_TWT, iface, &params, sizeof(params))) {
-		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed\n",
+		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed, reason : %s\n",
 			wifi_twt_operation2str[params.operation],
-			wifi_twt_negotiation_type2str[params.negotiation_type]);
+			wifi_twt_negotiation_type2str[params.negotiation_type],
+			get_twt_err_code_str(params.fail_reason));
+
 		return -ENOEXEC;
 	}
 
@@ -660,9 +664,11 @@ static int cmd_wifi_twt_setup(const struct shell *sh, size_t argc,
 	params.setup_cmd = setup_cmd;
 
 	if (net_mgmt(NET_REQUEST_WIFI_TWT, iface, &params, sizeof(params))) {
-		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed\n",
+		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed. reason : %s\n",
 			wifi_twt_operation2str[params.operation],
-			wifi_twt_negotiation_type2str[params.negotiation_type]);
+			wifi_twt_negotiation_type2str[params.negotiation_type],
+			get_twt_err_code_str(params.fail_reason));
+
 		return -ENOEXEC;
 	}
 
@@ -704,9 +710,11 @@ static int cmd_wifi_twt_teardown(const struct shell *sh, size_t argc,
 		return -EINVAL;
 
 	if (net_mgmt(NET_REQUEST_WIFI_TWT, iface, &params, sizeof(params))) {
-		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed\n",
+		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed, reason : %s\n",
 			wifi_twt_operation2str[params.operation],
-			wifi_twt_negotiation_type2str[params.negotiation_type]);
+			wifi_twt_negotiation_type2str[params.negotiation_type],
+			get_twt_err_code_str(params.fail_reason));
+
 		return -ENOEXEC;
 	}
 
@@ -729,9 +737,11 @@ static int cmd_wifi_twt_teardown_all(const struct shell *sh, size_t argc,
 	params.teardown.teardown_all = 1;
 
 	if (net_mgmt(NET_REQUEST_WIFI_TWT, iface, &params, sizeof(params))) {
-		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed\n",
+		shell_fprintf(sh, SHELL_WARNING, "%s with %s failed, reason : %s\n",
 			wifi_twt_operation2str[params.operation],
-			wifi_twt_negotiation_type2str[params.negotiation_type]);
+			wifi_twt_negotiation_type2str[params.negotiation_type],
+			get_twt_err_code_str(params.fail_reason));
+
 		return -ENOEXEC;
 	}