add tuya_lan_disable

Author: flyingcys

src/tuya_cloud_service/ble/ble_mgr.h

@@ -61,6 +61,15 @@ typedef void (*ble_session_fn_t)(ble_packet_t *packet, void *priv_data);
  */
 int tuya_ble_init(tuya_ble_cfg_t *cfg);
 
+/**
+ * @brief Deinitializes the Tuya BLE module.
+ *
+ * This function deinitializes the Tuya BLE module and releases resources.
+ *
+ * @return 0 if successful, otherwise an error code.
+ */
+int tuya_ble_deinit(void);
+
 /**
  * @brief Checks if the device is connected to the Tuya BLE service.
  *

src/tuya_cloud_service/cloud/tuya_iot.c

@@ -29,8 +29,15 @@
 #include "tuya_iot_dp.h"
 #include "tuya_register_center.h"
 #include "tuya_tls.h"
+#include "tuya_lan.h"
+#if defined(ENABLE_WIFI) && (ENABLE_WIFI == 1)
+#include "netcfg.h"
+#endif
 #include "netmgr.h"
 #include "tuya_health.h"
+#if defined(ENABLE_BLUETOOTH) && (ENABLE_BLUETOOTH == 1)
+#include "ble_mgr.h"
+#endif
 typedef enum {
     STATE_IDLE,
     STATE_START,
@@ -57,6 +64,8 @@ static tuya_iot_client_t *s_iot_client_solo;
 /* -------------------------------------------------------------------------- */
 /*                          Internal utils functions                          */
 /* -------------------------------------------------------------------------- */
+static int tuya_iot_token_activate_evt(void *data);
+static OPERATE_RET __tuya_iot_link_type_change_cb(void *data);
 
 static int iot_dispatch_event(tuya_iot_client_t *client)
 {
@@ -722,6 +731,60 @@ int tuya_iot_reset(tuya_iot_client_t *client)
  */
 int tuya_iot_destroy(tuya_iot_client_t *client)
 {
+    if (client == NULL) {
+        return OPRT_INVALID_PARM;
+    }
+
+    tuya_lan_disable();
+#if defined(ENABLE_WIFI) && (ENABLE_WIFI == 1)
+    netcfg_stop(NETCFG_TUYA_WIFI_AP);
+#endif
+#if defined(ENABLE_BLUETOOTH) && (ENABLE_BLUETOOTH == 1)
+    netcfg_stop(NETCFG_TUYA_BLE);
+    tuya_ble_deinit();
+#endif
+
+    if (tuya_mqtt_connected(&client->mqctx)) {
+        tuya_mqtt_stop(&client->mqctx);
+    }
+    tuya_mqtt_destory(&client->mqctx);
+
+    if (client->matop.config.mqctx && client->matop.config.devid) {
+        matop_serice_destory(&client->matop);
+        memset(&client->matop, 0, sizeof(client->matop));
+    }
+
+    netmgr_conn_set(NETCONN_WIFI, NETCONN_CMD_CLOSE, NULL);
+    netmgr_conn_set(NETCONN_WIRED, NETCONN_CMD_CLOSE, NULL);
+    netmgr_conn_set(NETCONN_CELLULAR, NETCONN_CMD_CLOSE, NULL);
+
+    if (client->check_upgrade_timer) {
+        tal_sw_timer_delete(client->check_upgrade_timer);
+        client->check_upgrade_timer = NULL;
+    }
+
+    if (client->token_get.sem) {
+        tal_semaphore_release(client->token_get.sem);
+        client->token_get.sem = NULL;
+    }
+
+    if (client->binding) {
+        tal_free(client->binding);
+        client->binding = NULL;
+    }
+
+    if (client->schema) {
+        dp_schema_delete(client->activate.devid);
+        client->schema = NULL;
+    }
+
+    tal_event_unsubscribe(EVENT_LINK_TYPE_CHG, "iot", __tuya_iot_link_type_change_cb);
+    tal_event_unsubscribe(EVENT_LINK_ACTIVATE, "iot", tuya_iot_token_activate_evt);
+
+    client->state = STATE_IDLE;
+    client->nextstate = STATE_IDLE;
+    client->is_activated = false;
+
     return OPRT_OK;
 }
 
@@ -1042,12 +1105,19 @@ int tuya_iot_activated_data_remove(tuya_iot_client_t *client)
         return OPRT_COM_ERROR;
     }
 
+    client->is_activated = false;
+    tuya_lan_disable();
+#if defined(ENABLE_WIFI) && (ENABLE_WIFI == 1)
+    netcfg_stop(NETCFG_TUYA_WIFI_AP);
+#endif
+#if defined(ENABLE_BLUETOOTH) && (ENABLE_BLUETOOTH == 1)
+    netcfg_stop(NETCFG_TUYA_BLE);
+#endif
     /* Clean client local data */
     dp_schema_delete(client->activate.devid);
     tal_kv_del((const char *)(client->activate.schemaId));
     tal_kv_del((const char *)(client->config.storage_namespace));
     tuya_endpoint_remove();
-    client->is_activated = false;
     PR_INFO("Activated data remove successed");
 
     client->event.id = TUYA_EVENT_RESET_COMPLETE;

src/tuya_cloud_service/lan/lan_sock.c

@@ -422,6 +422,11 @@ BOOL_T tuya_get_sock_loop_terminate(void)
     return g_sloop->terminate;
 }
 
+BOOL_T tuya_sock_loop_is_inited(void)
+{
+    return (g_sloop != NULL);
+}
+
 /**
  * @brief Function to dump the LAN socket reader.
  *

src/tuya_cloud_service/lan/lan_sock.h

@@ -111,6 +111,13 @@ int tuya_get_sock_loop_terminate();
  */
 void tuya_dump_lan_sock_reader();
 
+/**
+ * @brief check sock loop init
+ *
+ * @return TRUE if sock loop inited, otherwise FALSE
+ */
+BOOL_T tuya_sock_loop_is_inited(void);
+
 /**
  * @brief sock loop init
  *

src/tuya_cloud_service/lan/tuya_lan.c

@@ -1391,6 +1391,65 @@ int tuya_lan_exit(void)
     return OPRT_OK;
 }
 
+/**
+ * @brief Disable LAN service and release sockets
+ *
+ * @return OPRT_OK on success. Others on error, please refer to
+ * tuya_error_code.h
+ */
+int tuya_lan_disable(void)
+{
+    if (s_lan_mgr == NULL) {
+        return OPRT_OK;
+    }
+
+    lan_session_close_all();
+
+    if (s_lan_mgr->tcp_serv_fd >= 0) {
+        tuya_unreg_lan_sock(s_lan_mgr->tcp_serv_fd);
+        s_lan_mgr->tcp_serv_fd = -1;
+    }
+
+    if (s_lan_mgr->udp_serv_fd >= 0) {
+        tuya_unreg_lan_sock(s_lan_mgr->udp_serv_fd);
+        s_lan_mgr->udp_serv_fd = -1;
+    }
+
+    if (s_lan_mgr->udp_client_fd >= 0) {
+        tal_net_close(s_lan_mgr->udp_client_fd);
+        s_lan_mgr->udp_client_fd = -1;
+    }
+
+    tuya_sock_loop_disable();
+    uint32_t wait_ms = 0;
+    while (tuya_sock_loop_is_inited() && wait_ms < 3000) {
+        tal_system_sleep(50);
+        wait_ms += 50;
+    }
+
+    return OPRT_OK;
+}
+
+/**
+ * @brief Enable LAN service
+ *
+ * @return OPRT_OK on success. Others on error, please refer to
+ * tuya_error_code.h
+ */
+int tuya_lan_enable(void)
+{
+    if (s_lan_mgr != NULL) {
+        return OPRT_OK;
+    }
+
+    tuya_iot_client_t *client = tuya_iot_client_get();
+    if (client == NULL || client->is_activated == false) {
+        return OPRT_COM_ERROR;
+    }
+
+    return tuya_lan_init(client);
+}
+
 /**
  * @brief distribute data to all connections
  *

src/tuya_cloud_service/netcfg/ap_netcfg.c

@@ -24,6 +24,7 @@
 #include "tal_wifi.h"
 #include "tal_network.h"
 #include "tuya_iot.h"
+#include "tuya_lan.h"
 #include "tuya_register_center.h"
 
 #define AP_BROADCAST_PORT       6667
@@ -861,6 +862,8 @@ static int ap_netcfg_start(int type, netcfg_finish_cb_t cb, void *args)
         return OPRT_MALLOC_FAILED;
     }
 
+    tuya_lan_disable();
+
     op_ret = ap_mode_start(ap);
     if (OPRT_OK != op_ret) {
         PR_ERR("ap mode start fail:%d", op_ret);