1. fix bugs of OTA reload and HTTP download

2. add one way to check MQTT construct error
3. remove some useless code

Author: spikelin

include/exports/qcloud_iot_export_mqtt.h

@@ -175,6 +175,8 @@ typedef struct {
     uint8_t          auto_connect_enable;     // flag of auto reconnection, 1 is enable and recommended
     MQTTEventHandler event_handle;            // event callback
 
+    int              err_code;
+
 } MQTTInitParams;
 
 /**
@@ -183,12 +185,12 @@ typedef struct {
 #ifdef AUTH_MODE_CERT
 #define DEFAULT_MQTTINIT_PARAMS                             \
     {                                                       \
-        NULL, NULL, {0}, {0}, 5000, 240 * 1000, 1, 1, { 0 } \
+        NULL, NULL, {0}, {0}, 5000, 240 * 1000, 1, 1, { 0 }, 0 \
     }
 #else
 #define DEFAULT_MQTTINIT_PARAMS                         \
     {                                                   \
-        NULL, NULL, NULL, 5000, 240 * 1000, 1, 1, { 0 } \
+        NULL, NULL, NULL, 5000, 240 * 1000, 1, 1, { 0 }, 0 \
     }
 #endif
 
@@ -311,6 +313,7 @@ void IOT_MQTT_StopLoop(void *pClient);
  */
 bool IOT_MQTT_GetLoopStatus(void *pClient, int *exit_code);
 
+void IOT_MQTT_SetLoopStatus(void *pClient, bool loop_status);
 #endif
 
 #ifdef __cplusplus

include/lite-utils.h

@@ -56,7 +56,6 @@ char *LITE_format_string(const char *fmt, ...);
 char *LITE_format_nstring(const int len, const char *fmt, ...);
 void  LITE_hexbuf_convert(unsigned char *digest, char *out, int buflen, int uppercase);
 void  LITE_hexstr_convert(char *hexstr, uint8_t *out_buf, int len);
-void  LITE_replace_substr(char orig[], char key[], char swap[]);
 
 char *       LITE_json_value_of(char *key, char *src);
 list_head_t *LITE_json_keys_of(char *src, char *prefix);

samples/multi_client/multi_client_mqtt_sample.c

@@ -290,7 +290,7 @@ static void _mqtt_client_thread_runner(void *ptr)
     if (client != NULL) {
         Log_i("Cloud Device Construct Success");
     } else {
-        Log_e("MQTT Construct failed!");
+        Log_e("MQTT Construct failed: %d", init_params.err_code);
         goto thread_exit;
     }
 

sdk_src/network/tls/network_tls.c

@@ -32,7 +32,7 @@ int network_tls_connect(Network *pNetwork)
 {
     POINTER_SANITY_CHECK(pNetwork, QCLOUD_ERR_INVAL);
 
-    int ret = QCLOUD_ERR_FAILURE;
+    int ret = QCLOUD_ERR_SSL_CONNECT;
 
     pNetwork->handle = (uintptr_t)HAL_TLS_Connect(&(pNetwork->ssl_connect_params), pNetwork->host, pNetwork->port);
     if (pNetwork->handle != 0) {

sdk_src/protocol/http/utils_httpc.c

@@ -33,7 +33,7 @@ extern "C" {
 
 #define HTTP_CLIENT_AUTHB_SIZE 128
 
-#define HTTP_CLIENT_CHUNK_SIZE    1024
+#define HTTP_CLIENT_CHUNK_SIZE    1025
 #define HTTP_CLIENT_SEND_BUF_SIZE 1024
 
 #define HTTP_CLIENT_MAX_HOST_LEN 64
@@ -351,8 +351,7 @@ static int _http_client_recv(HTTPClient *client, char *buf, int min_len, int max
         IOT_FUNC_EXIT_RC(rc);
     }
 
-    // IOT_FUNC_EXIT_RC(rc);
-    IOT_FUNC_EXIT_RC(QCLOUD_RET_SUCCESS);
+    IOT_FUNC_EXIT_RC(rc);
 }
 
 static int _http_client_retrieve_content(HTTPClient *client, char *data, int len, uint32_t timeout_ms,
@@ -392,7 +391,7 @@ static int _http_client_retrieve_content(HTTPClient *client, char *data, int len
             if (rc != QCLOUD_RET_SUCCESS) {
                 IOT_FUNC_EXIT_RC(rc);
             }
-            if (0 == left_ms(&timer)) {
+            if (0 >= left_ms(&timer)) {
                 Log_e("HTTP read timeout!");
                 IOT_FUNC_EXIT_RC(QCLOUD_ERR_HTTP_TIMEOUT);
             }
@@ -431,7 +430,8 @@ static int _http_client_retrieve_content(HTTPClient *client, char *data, int len
                         rc = _http_client_recv(client, data + len, 0, HTTP_CLIENT_CHUNK_SIZE - len - 1, &new_trf_len,
                                                left_ms(&timer), client_data);
                         len += new_trf_len;
-                        if (rc != QCLOUD_RET_SUCCESS) {
+                        if ((rc != QCLOUD_RET_SUCCESS) || (0 >= left_ms(&timer))) {
+                            Log_w("_http_client_recv ret: %d, left_time: %d", rc, left_ms(&timer));
                             IOT_FUNC_EXIT_RC(rc);
                         } else {
                             continue;
@@ -495,9 +495,10 @@ static int _http_client_retrieve_content(HTTPClient *client, char *data, int len
                 max_len     = HTTP_CLIENT_MIN(max_len, readLen);
                 rc          = _http_client_recv(client, data, 1, max_len, &len, left_ms(&timer), client_data);
                 if (rc != QCLOUD_RET_SUCCESS) {
+                    Log_w("_http_client_recv ret: %d, left_time: %d", rc, left_ms(&timer));
                     IOT_FUNC_EXIT_RC(rc);
                 }
-                if (left_ms(&timer) == 0) {
+                if (left_ms(&timer) <= 0) {
                     Log_e("HTTP read timeout!");
                     IOT_FUNC_EXIT_RC(QCLOUD_ERR_HTTP_TIMEOUT);
                 }
@@ -510,7 +511,8 @@ static int _http_client_retrieve_content(HTTPClient *client, char *data, int len
                 /* Read missing chars to find end of chunk */
                 rc = _http_client_recv(client, data + len, 2 - len, HTTP_CLIENT_CHUNK_SIZE - len - 1, &new_trf_len,
                                        left_ms(&timer), client_data);
-                if ((rc != QCLOUD_RET_SUCCESS) || (0 == left_ms(&timer))) {
+                if ((rc != QCLOUD_RET_SUCCESS) || (0 >= left_ms(&timer))) {
+                    Log_w("_http_client_recv ret: %d, left_time: %d", rc, left_ms(&timer));
                     IOT_FUNC_EXIT_RC(rc);
                 }
                 len += new_trf_len;

sdk_src/protocol/mqtt/mqtt_client.c

@@ -65,13 +65,15 @@ void *IOT_MQTT_Construct(MQTTInitParams *pParams)
     // create and init MQTTClient
     if ((mqtt_client = (Qcloud_IoT_Client *)HAL_Malloc(sizeof(Qcloud_IoT_Client))) == NULL) {
         Log_e("malloc MQTTClient failed");
+        pParams->err_code = QCLOUD_ERR_MALLOC;
         return NULL;
     }
 
     int rc = qcloud_iot_mqtt_init(mqtt_client, pParams);
     if (rc != QCLOUD_RET_SUCCESS) {
         Log_e("mqtt init failed: %d", rc);
         HAL_Free(mqtt_client);
+        pParams->err_code = rc;
         return NULL;
     }
 
@@ -86,6 +88,7 @@ void *IOT_MQTT_Construct(MQTTInitParams *pParams)
         Log_e("Device secret is null!");
         qcloud_iot_mqtt_fini(mqtt_client);
         HAL_Free(mqtt_client);
+		pParams->err_code = QCLOUD_ERR_INVAL;
         return NULL;
     }
     size_t src_len = strlen(pParams->device_secret);
@@ -99,6 +102,7 @@ void *IOT_MQTT_Construct(MQTTInitParams *pParams)
         Log_e("Device secret decode err, secret:%s", pParams->device_secret);
         qcloud_iot_mqtt_fini(mqtt_client);
         HAL_Free(mqtt_client);
+		pParams->err_code = QCLOUD_ERR_INVAL;
         return NULL;
     }
 #endif
@@ -108,6 +112,7 @@ void *IOT_MQTT_Construct(MQTTInitParams *pParams)
         Log_e("mqtt connect with id: %s failed: %d", mqtt_client->options.conn_id, rc);
         qcloud_iot_mqtt_fini(mqtt_client);
         HAL_Free(mqtt_client);
+		pParams->err_code = rc;
         return NULL;
     } else {
         Log_i("mqtt connect with id: %s success", mqtt_client->options.conn_id);
@@ -326,6 +331,13 @@ bool IOT_MQTT_GetLoopStatus(void *pClient, int *exit_code)
     return mqtt_client->thread_running;
 }
 
+void IOT_MQTT_SetLoopStatus(void *pClient, bool loop_status)
+{
+    POINTER_SANITY_CHECK_RTN(pClient);
+    Qcloud_IoT_Client *mqtt_client = (Qcloud_IoT_Client *)pClient;
+    mqtt_client->thread_running    = loop_status;
+}
+
 #endif
 
 #if 0

sdk_src/services/ota/ota_client.c

@@ -128,7 +128,17 @@ static void _ota_callback(void *pcontext, const char *msg, uint32_t msg_len)
 static void IOT_OTA_ResetStatus(void *handle)
 {
     OTA_Struct_t *h_ota = (OTA_Struct_t *)handle;
+    Log_i("reset OTA state!");
     h_ota->state        = IOT_OTAS_INITED;
+    h_ota->err   = 0;
+
+    if (NULL != h_ota->purl) {
+        HAL_Free(h_ota->purl);
+    }
+
+    if (NULL != h_ota->version) {
+        HAL_Free(h_ota->version);
+    }
 }
 
 static int IOT_OTA_ReportProgress(void *handle, IOT_OTA_Progress_Code progress, IOT_OTAReportType reportType)
@@ -204,6 +214,9 @@ static int IOT_OTA_ReportUpgradeResult(void *handle, const char *version, IOT_OT
         return QCLOUD_ERR_FAILURE;
     }
 
+    if (version == NULL)
+        version = h_ota->version;
+
     len = strlen(version);
     if ((len < OTA_VERSION_STR_LEN_MIN) || (len > OTA_VERSION_STR_LEN_MAX)) {
         Log_e("version string is invalid: must be [1, 32] chars");
@@ -233,7 +246,10 @@ static int IOT_OTA_ReportUpgradeResult(void *handle, const char *version, IOT_OT
         goto do_exit;
     }
 
+    if ((IOT_OTAR_UPGRADE_FAIL == reportType) || (IOT_OTAR_UPGRADE_SUCCESS == reportType) ||
+        (IOT_OTAR_MD5_NOT_MATCH == reportType)) {
     IOT_OTA_ResetStatus(h_ota);
+    }
 
 do_exit:
     if (NULL != msg_upgrade) {
@@ -341,6 +357,18 @@ int IOT_OTA_StartDownload(void *handle, uint32_t offset, uint32_t size)
 
     Log_d("to download FW from offset: %u, size: %u", offset, size);
     h_ota->size_fetched = offset;
+
+    // reset md5 for new download
+    if (offset == 0) {
+        Ret = IOT_OTA_ResetClientMD5(h_ota);
+        if (Ret) {
+            Log_e("initialize md5 failed");
+            return QCLOUD_ERR_FAILURE;
+        }
+    }
+
+    // reinit ofc
+    qcloud_ofc_deinit(h_ota->ch_fetch);
     h_ota->ch_fetch     = ofc_Init(h_ota->purl, offset, size);
     if (NULL == h_ota->ch_fetch) {
         Log_e("Initialize fetch module failed");
@@ -507,7 +535,7 @@ int IOT_OTA_IsFetchFinish(void *handle)
     return (IOT_OTAS_FETCHED == h_ota->state);
 }
 
-int IOT_OTA_FetchYield(void *handle, char *buf, uint32_t buf_len, uint32_t timeout_ms)
+int IOT_OTA_FetchYield(void *handle, char *buf, uint32_t buf_len, uint32_t timeout_s)
 {
     int           ret;
     OTA_Struct_t *h_ota = (OTA_Struct_t *)handle;
@@ -521,7 +549,7 @@ int IOT_OTA_FetchYield(void *handle, char *buf, uint32_t buf_len, uint32_t timeo
         return IOT_OTA_ERR_INVALID_STATE;
     }
 
-    ret = qcloud_ofc_fetch(h_ota->ch_fetch, buf, buf_len, timeout_ms);
+    ret = qcloud_ofc_fetch(h_ota->ch_fetch, buf, buf_len, timeout_s);
     if (ret < 0) {
         h_ota->state = IOT_OTAS_FETCHED;
         h_ota->err   = IOT_OTA_ERR_FETCH_FAILED;

sdk_src/services/ota/ota_fetch.c

@@ -135,11 +135,14 @@ int32_t qcloud_ofc_fetch(void *handle, char *buf, uint32_t bufLen, uint32_t time
 
 int qcloud_ofc_deinit(void *handle)
 {
-    IOT_FUNC_ENTRY;
-    if (NULL != handle) {
-        HAL_Free(handle);
-    }
+    OTAHTTPStruct *h_odc = (OTAHTTPStruct *)handle;
+    if (NULL == handle)
+        IOT_FUNC_EXIT_RC(QCLOUD_RET_SUCCESS);
+
+    if (h_odc->http.network_stack.is_connected(&h_odc->http.network_stack))
+        h_odc->http.network_stack.disconnect(&h_odc->http.network_stack);
 
+    HAL_Free(handle);
     IOT_FUNC_EXIT_RC(QCLOUD_RET_SUCCESS);
 }
 

sdk_src/utils/string_utils.c

@@ -135,31 +135,3 @@ void LITE_hexstr_convert(char *hexstr, uint8_t *out_buf, int in_len)
     }
 }
 
-void LITE_replace_substr(char originalString[], char key[], char swap[])
-{
-    int  lengthOfOriginalString, lengthOfKey, lengthOfSwap, i, j, flag;
-    char tmp[512];
-
-    lengthOfOriginalString = strlen(originalString);
-    lengthOfKey            = strlen(key);
-    lengthOfSwap           = strlen(swap);
-
-    for (i = 0; i <= lengthOfOriginalString - lengthOfKey; i++) {
-        flag = 1;
-        for (j = 0; j < lengthOfKey; j++) {
-            if (originalString[i + j] != key[j]) {
-                flag = 0;
-                break;
-            }
-        }
-
-        if (flag) {
-            strcpy(tmp, originalString);
-            strcpy(&tmp[i], swap);
-            strcpy(&tmp[i + lengthOfSwap], &originalString[i + lengthOfKey]);
-            strcpy(originalString, tmp);
-            i += lengthOfSwap - 1;
-            lengthOfOriginalString = strlen(originalString);
-        }
-    }
-}