Merge branch 'nw_split_linux_wip7' into 'master'

Small Bugfixes and enhancements

See merge request app-frameworks/esp_hosted!579

Author: mantriyogesh

esp_hosted_fg/host/control_lib/src/ctrl_core.c

@@ -1766,6 +1766,10 @@ int deinit_hosted_control_lib_internal(void)
 {
 	int ret = SUCCESS;
 
+	if (is_ctrl_lib_state(CTRL_LIB_STATE_INACTIVE)) {
+		return SUCCESS;
+	}
+
 	set_ctrl_lib_state(CTRL_LIB_STATE_INACTIVE);
 
 	if (ctrl_msg_Q) {

esp_hosted_fg/host/linux/host_control/c_support/Makefile

@@ -11,8 +11,8 @@ CROSS_COMPILE :=
 CFLAGS = -Wall -g
 LINKER = -lpthread -lrt
 
-# If your Linux is very constraint environment, comment below line.
-CFLAGS_SANITIZE = -fsanitize=undefined -fsanitize-address-use-after-scope -fsanitize-undefined-trap-on-error -fstack-protector-all -fstack-check -fsanitize=address -fsanitize=pointer-compare -fno-omit-frame-pointer -static-libasan
+# Enable only when memory check (like valgrind) need to perform. This slows down the application and cleanup
+#CFLAGS_SANITIZE = -fsanitize=undefined -fsanitize-address-use-after-scope -fsanitize-undefined-trap-on-error -fstack-protector-all -fstack-check -fsanitize=address -fsanitize=pointer-compare -fno-omit-frame-pointer -static-libasan
 
 # Root directory
 DIR_ROOT = $(CURDIR)/../../../../
@@ -96,3 +96,4 @@ hosted_shell.out: hosted_shell.o $(COMMON_OBJS)
 
 clean:
 	rm -f *.out *.o
+	$(MAKE) -C $(DIR_CTRL_LIB) clean

esp_hosted_fg/host/linux/host_control/c_support/hosted_shell.c

@@ -22,10 +22,11 @@
 #include "nw_helper_func.h"
 #include "esp_hosted_custom_rpc.h"
 #include "app_custom_rpc.h"
+#include <stdint.h>
 
 
 #define MAC_ADDR_LENGTH 18
-#define NETWORK_CHECK_INTERVAL_MS 1000
+#define NETWORK_CHECK_INTERVAL_MS 100
 #define RPC_RETRY_INTERVAL_MS     1000
 
 #define POLL_FOR_IP_RESTORE  (0)
@@ -334,6 +335,10 @@ static const cmd_arg_t custom_rpc_request_args[] = {
 	{"--demo", "Demo number (1, 2, or 3)", ARG_TYPE_INT, true, NULL}
 };
 
+static const cmd_arg_t set_country_code_args[] = {
+	{"--code", "Country code (e.g. US, IN, CN)", ARG_TYPE_STRING, true, NULL}
+};
+
 /* Forward declarations for command handlers */
 static int handle_exit(int argc, char **argv);
 static int handle_help(int argc, char **argv);
@@ -365,6 +370,10 @@ static int handle_subscribe_event(int argc, char **argv);
 static int handle_unsubscribe_event(int argc, char **argv);
 static int handle_set_host_port_range(int argc, char **argv);
 static int handle_custom_demo_rpc_request(int argc, char **argv);
+static int handle_set_country_code(int argc, char **argv);
+static int handle_set_country_code_with_ieee80211d_on(int argc, char **argv);
+static int handle_get_country_code(int argc, char **argv);
+
 
 
 /* Command table */
@@ -401,6 +410,9 @@ static const shell_command_t commands[] = {
 	{"exit", "Exit the shell", handle_exit, NULL, 0},
 	{"quit", "Exit the shell", handle_exit, NULL, 0},
 	{"q", "Exit the shell", handle_exit, NULL, 0},
+	{"set_country_code", "Set Wi-Fi country code", handle_set_country_code, set_country_code_args, sizeof(set_country_code_args)/sizeof(cmd_arg_t)},
+	{"set_country_code_with_ieee80211d_on", "Set Wi-Fi country code with ieee80211d enabled", handle_set_country_code_with_ieee80211d_on, NULL, 0},
+	{"get_country_code", "Get Wi-Fi country code", handle_get_country_code, NULL, 0},
 	{NULL, NULL, NULL, NULL, 0}
 };
 
@@ -1203,11 +1215,10 @@ static void stop_rpc_auto_ip_restore(void) {
 	exit_thread_auto_ip_restore = 1;
 	rpc_state = RPC_STATE_INACTIVE;
 
-	printf("Cleaning up RPC resources...\n");
+	//printf("Cleaning up RPC resources...\n");
 
 	// Give app thread a chance to notice exit flag
-	printf("Waiting for background threads to terminate...\n");
-	sleep(1);  // Brief pause
+	//sleep(1);  // Brief pause (removed for faster exit)
 
 	// Join the app thread if it exists
 	if (auto_ip_restore_thread) {
@@ -1228,7 +1239,7 @@ static void stop_rpc_auto_ip_restore(void) {
 	}
 
 	cleanup_in_progress = 0;
-	printf("RPC cleanup complete\n");
+	//printf("Cleanup complete\n");
 }
 
 /* Shell main loop */
@@ -1380,7 +1391,7 @@ int main(int argc, char *argv[]) {
 	ret = shell_run(&ctx);
 
 	/* The shell has exited - initiate cleanup */
-	printf("Shell exited, initiating cleanup\n");
+	//printf("Shell exited, initiating cleanup\n");
 	exit_thread_auto_ip_restore = 1;
 
 	/* Clean up resources */
@@ -1690,3 +1701,28 @@ static int handle_custom_demo_rpc_request(int argc, char **argv) {
 			return FAILURE;
 	}
 }
+
+static int handle_set_country_code(int argc, char **argv) {
+	CHECK_RPC_ACTIVE();
+	if (!parse_arguments(argc, argv, set_country_code_args, sizeof(set_country_code_args)/sizeof(cmd_arg_t))) {
+		return FAILURE;
+	}
+	const char *code = get_arg_value(argc, argv, set_country_code_args,
+		sizeof(set_country_code_args)/sizeof(cmd_arg_t),
+		"--code");
+	if (!code || strlen(code) < 2) {
+		printf("Invalid or missing country code\n");
+		return FAILURE;
+	}
+	return test_set_country_code_with_params(code);
+}
+
+static int handle_set_country_code_with_ieee80211d_on(int argc, char **argv) {
+	CHECK_RPC_ACTIVE();
+	return test_set_country_code_with_ieee80211d_on();
+}
+
+static int handle_get_country_code(int argc, char **argv) {
+	CHECK_RPC_ACTIVE();
+	return test_get_country_code();
+}

esp_hosted_fg/host/linux/host_control/c_support/stress.c

@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 				test_set_country_code();
 			} else if (0 == strncasecmp(SET_COUNTRY_CODE_ENABLED, argv[i],
 						sizeof(SET_COUNTRY_CODE_ENABLED))) {
-				test_set_country_code_enabled();
+				test_set_country_code_with_ieee80211d_on();
 			} else if (0 == strncasecmp(GET_COUNTRY_CODE, argv[i],
 						sizeof(GET_COUNTRY_CODE))) {
 				test_get_country_code();

esp_hosted_fg/host/linux/host_control/c_support/test.c

@@ -28,6 +28,13 @@
 #include "app_custom_rpc.h"
 
 #define DEMO_SLEEP_DURATION_SEC 50
+
+ /* Heartbeat demo needs to wait for events
+  * For simplicity, we disable heartbeat demo
+  * Anyway fullfledged cli demo is already available in hosted_shell.c
+  */
+#define ENABLE_HEARTBEAT 0
+
 #define EXEC_IF_CMD_EQUALS(cmd,func) \
 	if (0 == strncasecmp(cmd, in_cmd, sizeof(cmd))) { \
 		func; \
@@ -88,7 +95,7 @@ static int parse_cli_cmd(char *in_cmd, char *args[])
 	EXEC_IF_CMD_EQUALS(GET_FW_VERSION, test_print_fw_version());
 	EXEC_IF_CMD_EQUALS(OTA, test_ota(args[0]));
 	EXEC_IF_CMD_EQUALS(SET_COUNTRY_CODE, test_set_country_code());
-	EXEC_IF_CMD_EQUALS(SET_COUNTRY_CODE_ENABLED, test_set_country_code_enabled());
+	EXEC_IF_CMD_EQUALS(SET_COUNTRY_CODE_ENABLED, test_set_country_code_with_ieee80211d_on());
 	EXEC_IF_CMD_EQUALS(GET_COUNTRY_CODE, test_get_country_code());
 	EXEC_IF_CMD_EQUALS(CUSTOM_RPC_DEMO1, demo1_custom_rpc_unserialised_request_only_ack());
 	EXEC_IF_CMD_EQUALS(CUSTOM_RPC_DEMO2, demo2_custom_rpc_unserialised_request_and_slave_echo_back_as_response());
@@ -113,17 +120,20 @@ static int init_app(void)
 
 	register_event_callbacks();
 
+	#if ENABLE_HEARTBEAT
 	test_config_heartbeat();
+	#endif
 
 	return 0;
 }
 
 static void cleanup_app(void)
 {
-	// TODO properly disable heartbeat
+	#if ENABLE_HEARTBEAT
 	test_disable_heartbeat_async();
-	// wait for async to complete
+	/* wait for async to complete */
 	sleep(1);
+	#endif
 	unregister_event_callbacks();
 
 	control_path_platform_deinit();
@@ -175,10 +185,13 @@ int main(int argc, char *argv[])
 
 	cli_cmd = argv[1];
 	if (SUCCESS == parse_cli_cmd(cli_cmd, &argv[2])) {
+
+#if ENABLE_HEARTBEAT
 		sleep(2);
 		printf("\n\n\nRequested operation complete\n");
 		printf("Sleeping for some time just to showcase heartbeat\n");
 		sleep(DEMO_SLEEP_DURATION_SEC);
+#endif
 	}
 
 	cleanup_app();

esp_hosted_fg/host/linux/host_control/c_support/test.h

@@ -35,6 +35,7 @@
 
 
 int test_get_wifi_mode(void);
+int test_async_get_wifi_mode(void);
 int test_set_wifi_mode(int mode);
 int test_set_wifi_mode_station(void);
 int test_set_wifi_mode_softap(void);
@@ -47,6 +48,7 @@ int test_station_mode_set_mac_addr_of_esp(char *mac_str);
 int test_softap_mode_set_mac_addr_of_esp(char *mac_str);
 int test_softap_mode_get_mac_addr(char *mac_str);
 int test_station_mode_connect(void);
+int test_async_station_mode_connect(void);
 int test_station_mode_get_info(void);
 int test_get_available_wifi(void);
 int test_station_mode_disconnect(void);
@@ -78,8 +80,9 @@ int test_enable_wifi(void);
 int test_is_network_split_on(void);
 char * test_get_fw_version(char *, uint16_t);
 int test_print_fw_version(void);
-int test_set_country_code_enabled();
+int test_set_country_code_with_ieee80211d_on();
 int test_set_country_code();
+int test_set_country_code_with_params(const char *code);
 int test_get_country_code();
 int test_fetch_ip_addr_from_slave(void);
 int test_set_dhcp_dns_status(char *sta_ip, char *sta_nm, char *sta_gw, char *sta_dns);