May 15, 2019 · May 15, 2019 · May 16, 2019 · May 16, 2019 · May 17, 2019 · May 30, 2019
diff --git a/include/exports/qcloud_iot_export_coap.h b/include/exports/qcloud_iot_export_coap.h
diff --git a/include/exports/qcloud_iot_export_dynreg.h b/include/exports/qcloud_iot_export_dynreg.h
diff --git a/include/exports/qcloud_iot_export_error.h b/include/exports/qcloud_iot_export_error.h
diff --git a/include/exports/qcloud_iot_export_gateway.h b/include/exports/qcloud_iot_export_gateway.h
diff --git a/include/exports/qcloud_iot_export_log.h b/include/exports/qcloud_iot_export_log.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,19 +36,19 @@ typedef void (OnRespCallback)(void message, void *userContext);
		* CoAP EVENT TYPE
		*/
		typedef enum {
	COAP_EVENT_RECEIVE_ACK = 0,// MSG ACK received
	COAP_EVENT_RECEIVE_ACK = 0,// MSG ACK received

	COAP_EVENT_RECEIVE_RESPCONTENT = 1,// MSG response received
	COAP_EVENT_RECEIVE_RESPCONTENT = 1,// MSG response received

	COAP_EVENT_UNAUTHORIZED = -1,// Device auth failed or token expired
	COAP_EVENT_UNAUTHORIZED = -1,// Device auth failed or token expired

	COAP_EVENT_FORBIDDEN = -2,// CoAP URI invalid or without permission
	COAP_EVENT_FORBIDDEN = -2,// CoAP URI invalid or without permission

	COAP_EVENT_INTERNAL_SERVER_ERROR = -3,// CoAP server error
	COAP_EVENT_INTERNAL_SERVER_ERROR = -3,// CoAP server error

	COAP_EVENT_ACK_TIMEOUT = -4,// MSG ACK timeout
	COAP_EVENT_ACK_TIMEOUT = -4,// MSG ACK timeout

	COAP_EVENT_SEPRESP_TIMEOUT = -5,// MSG response timeout
	COAP_EVENT_SEPRESP_TIMEOUT = -5,// MSG response timeout
		} CoAPEventType;

		typedef struct {
Expand All		@@ -71,11 +71,11 @@ typedef struct {
		* @brief CoAP data structure when sending msg
		*/
		typedef struct {
	bool need_resp;// Need response from peer (true), or not (false). Currently only false is supported
	char *pay_load; // COAP msg payload
	size_t pay_load_len; // COAP msg payload length
	void*user_context;// user context for callback
	OnRespCallback resp_callback;// function callback when recv msg response, valid only when need_resp is true
	bool need_resp;// Need response from peer (true), or not (false). Currently only false is supported
	char *pay_load; // COAP msg payload
	size_t pay_load_len; // COAP msg payload length
	void*user_context;// user context for callback
	OnRespCallback resp_callback;// function callback when recv msg response, valid only when need_resp is true
		} SendMsgParams;

		#define DEFAULT_SENDMSG_PARAMS {false, NULL, 0, NULL, NULL}
Expand All		@@ -95,7 +95,7 @@ typedef struct {
		char *device_secret; // device secret
		#endif

	uint32_tcommand_timeout; // coap timeout value when waiting for ACK/response
	uint32_tcommand_timeout; // coap timeout value when waiting for ACK/response

		unsigned char max_retry_count; // CoAP max sending retry count

Expand All		@@ -104,9 +104,9 @@ typedef struct {
		} CoAPInitParams;

		#ifdef AUTH_MODE_CERT
	#define DEFAULT_COAPINIT_PARAMS { NULL, NULL, NULL, NULL, 2000, 5, {0}}
	#define DEFAULT_COAPINIT_PARAMS { NULL, NULL, NULL, NULL, 2000, 5, {0}}
		#else
	#define DEFAULT_COAPINIT_PARAMS { NULL, NULL, NULL, 2000, 5, {0}}
	#define DEFAULT_COAPINIT_PARAMS { NULL, NULL, NULL, 2000, 5, {0}}
		#endif

		/**
Expand Down Expand Up		@@ -138,9 +138,9 @@ int IOT_COAP_Yield(void *pClient, uint32_t timeout_ms);
		/**
		* @brief Send/publish CoAP msg
		*
	* @param pClient COAPClient pointer
	* @param topicName CoAP URI (msg topic)
	* @param sendParams Tx msg parameters
	* @param pClient COAPClient pointer
	* @param topicName CoAP URI (msg topic)
	* @param sendParams Tx msg parameters
		* @return value > 0 for msg Id; value < 0 for failure
		*/
		int IOT_COAP_SendMessage(void pClient, char topicName, SendMsgParams *sendParams);
Expand All		@@ -156,9 +156,9 @@ int IOT_COAP_GetMessageId(void *pMessage);
		/**
		* @brief Get COAP Response payload
		*
	* @param pMessage COAP Response msg
	* @param payload msg payload
	* @param payloadLen msg payload length
	* @param pMessage COAP Response msg
	* @param payload msg payload
	* @param payloadLen msg payload length
		* @return QCLOUD_RET_SUCCESS when success, otherwise fail
		*/
		int IOT_COAP_GetMessagePayload(void pMessage, char payload, int payloadLen);
Expand All		@@ -167,7 +167,7 @@ int IOT_COAP_GetMessagePayload(void pMessage, char payload, int payloadLen
		* @brief Get COAP Response msg error code
		*
		* @param pMessage COAP Response msg
	* @return COAPEventType converted from msg error code
	* @return COAPEventType converted from msg error code
		*/
		int IOT_COAP_GetMessageCode(void *pMessage);

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,7 @@
		*
		*/

	#ifndef QLCOUD_IOT_EXPORT_DYNREG_H_
	#ifndef QLCOUD_IOT_EXPORT_DYNREG_H_
		#define QLCOUD_IOT_EXPORT_DYNREG_H_

		#ifdef __cplusplus
Expand All		@@ -23,7 +23,7 @@ extern "C" {
		#include "qcloud_iot_export.h"

		/**
	* @brief Do dynamic register/create device
	* @brief Do dynamic register/create device
		*
		* @param pDevInfo In: device info with [ProductId, ProductKey, DeviceName]
		* Out: device info with [ProductId, DeviceName, DeviceSecret or Device cert/key file]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,7 +34,7 @@ typedef enum {
		QCLOUD_RET_MQTT_RECONNECTED = 1, // Reconnected with MQTT server successfully

		QCLOUD_RET_SUCCESS = 0, // Successful return


		QCLOUD_ERR_FAILURE = -1001, // Generic failure return
		QCLOUD_ERR_INVAL = -1002, // Invalid parameter
		QCLOUD_ERR_DEV_INFO = -1003, // Fail to get device info
Expand Down Expand Up		@@ -76,7 +76,7 @@ typedef enum {
		QCLOUD_ERR_JSON_BUFFER_TOO_SMALL = -134, // JSON parsing buffer not enough
		QCLOUD_ERR_JSON = -135, // JSON generation error
		QCLOUD_ERR_MAX_JSON_TOKEN = -136, // JSON token out of range


		QCLOUD_ERR_MAX_APPENDING_REQUEST = -137, // appending request out of range
		QCLOUD_ERR_MAX_TOPIC_LENGTH = -138, // Topic length oversize

Expand All		@@ -85,7 +85,7 @@ typedef enum {
		QCLOUD_ERR_COAP_INTERNAL = -152, // COAP interval error
		QCLOUD_ERR_COAP_BADMSG = -153, // COAP bad msg
		QCLOUD_ERR_DTLS_PEER_CLOSE_NOTIFY = -160, // DTLS connection is closed


		QCLOUD_ERR_SHADOW_PROPERTY_EXIST = -201, // Shadow property already exist
		QCLOUD_ERR_SHADOW_NOT_PROPERTY_EXIST = -202, // Shadow property not exist
		QCLOUD_ERR_SHADOW_UPDATE_TIMEOUT = -203, // Shadow update timeout
Expand All		@@ -101,7 +101,7 @@ typedef enum {

		QCLOUD_ERR_TCP_SOCKET_FAILED = -601, // TLS TCP socket connect fail
		QCLOUD_ERR_TCP_UNKNOWN_HOST = -602, // TCP unknown host (DNS fail)
	QCLOUD_ERR_TCP_CONNECT = -603, // TCP/UDP socket connect fail
	QCLOUD_ERR_TCP_CONNECT = -603, // TCP/UDP socket connect fail
		QCLOUD_ERR_TCP_READ_TIMEOUT = -604, // TCP read timeout
		QCLOUD_ERR_TCP_WRITE_TIMEOUT = -605, // TCP write timeout
		QCLOUD_ERR_TCP_READ_FAIL = -606, // TCP read error
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,11 +26,11 @@ extern "C" {
		/* Gateway and sub-device parameter */
		typedef struct {
		/gateway device info /
	char *product_id;
	char *device_name;
	/sub-device device info /
	char *subdev_product_id;
	char *subdev_device_name;
	char *product_id;
	char *device_name;
	/sub-device device info /
	char *subdev_product_id;
	char *subdev_device_name;

		} GatewayParam;

Expand All		@@ -50,9 +50,9 @@ typedef void (GatewayEventHandleFun)(void client, void context, void msg);

		/* The structure of gateway init param */
		typedef struct {
	MQTTInitParams init_param; /* MQTT params */
	void event_context; / the user context */
	GatewayEventHandleFun event_handler; /* event handler for gateway user*/
	MQTTInitParams init_param; /* MQTT params */
	void event_context; / the user context */
	GatewayEventHandleFun event_handler; /* event handler for gateway user*/
		} GatewayInitParam;

		#define DEFAULT_GATEWAY_INIT_PARAMS { DEFAULT_MQTTINIT_PARAMS, NULL, NULL}
Expand Down Expand Up		@@ -87,7 +87,7 @@ int IOT_Gateway_Destroy(void *client);
		int IOT_Gateway_Subdev_Online(void client, GatewayParam param);

		/**
	* @brief Make sub-device offline
	* @brief Make sub-device offline
		*
		* @param client handle to gateway client
		* @param param sub-device parameters
Expand All		@@ -100,7 +100,7 @@ int IOT_Gateway_Subdev_Offline(void client, GatewayParam param);
		/**
		* @brief Publish gateway MQTT message
		*
	* @param client handle to gateway client
	* @param client handle to gateway client
		* @param topic_name MQTT topic name
		* @param params publish parameters
		*
Expand All		@@ -112,7 +112,7 @@ int IOT_Gateway_Publish(void client, char topic_name, PublishParams *params);
		/**
		* @brief Subscribe gateway MQTT topic
		*
	* @param client handle to gateway client
	* @param client handle to gateway client
		* @param topic_filter MQTT topic filter
		* @param params subscribe parameters
		*
Expand All		@@ -124,8 +124,8 @@ int IOT_Gateway_Subscribe(void client, char topic_filter, SubscribeParams *par
		/**
		* @brief unsubscribe gateway MQTT topic
		*
	* @param client handle to gateway client
	* @param topic_filter MQTT topic filter
	* @param client handle to gateway client
	* @param topic_filter MQTT topic filter
		*
		* @return packet id (>=0) when success, or err code (<0) for failure
		*/
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,7 +53,7 @@ typedef bool (LogMessageHandler)(const char message);
		/**
		* @brief user callback for saving/reading logs into/from NVS(files/FLASH) after upload fail/recover
		*/
	// callback for saving logs into NVS(files/FLASH) after upload fail
	// callback for saving logs into NVS(files/FLASH) after upload fail
		typedef size_t (LogSaveFunc)(const char msg, size_t wLen);
		// callback for reading logs from NVS(files/FLASH) when upload ready
		typedef size_t (LogReadFunc)(char buff, size_t rLen);
Expand All		@@ -72,8 +72,8 @@ typedef struct {
		/* auth key, use device secret for PSK device and cert file path for cert device */
		const char *sign_key;
		/* user callback saving/reading logs into/from NVS(files/FLASH) */
	LogSaveFunc save_func;
	LogReadFunc read_func;
	LogSaveFunc save_func;
	LogReadFunc read_func;
		LogDelFunc del_func;
		LogGetSizeFunc get_size_func;
		} LogUploadInitParams;
Expand All		@@ -82,7 +82,7 @@ typedef struct {
		/**
		* @brief Set the global log level of print
		*
	* @param level
	* @param level
		*/
		void IOT_Log_Set_Level(LOG_LEVEL level);

Expand Down Expand Up		@@ -129,14 +129,14 @@ int IOT_Log_Init_Uploader(LogUploadInitParams *init_params);
		/**
		* @brief Stop log upload and release the resource
		*
	* @return
	* @return
		*/
		void IOT_Log_Fini_Uploader(void);

		/**
		* @brief Do one log upload
		*
	* @param force_upload true = upload log at once, false = upload in defined time interval
	* @param force_upload true = upload log at once, false = upload in defined time interval
		* @return QCLOUD_RET_SUCCESS when success, or error code when fail
		*/
		int IOT_Log_Upload(bool force_upload);
Expand All		@@ -162,34 +162,34 @@ void IOT_Log_Gen(const char file, const char func, const int line, const int l

		/* Macro for debug mode */
		#ifdef IOT_DEBUG
	#define IOT_FUNC_ENTRY \
	{\
	printf("FUNC_ENTRY: %s L#%d \n", __FUNCTION__, __LINE__); \
	}
	#define IOT_FUNC_EXIT \
	{\
	printf("FUNC_EXIT: %s L#%d \n", __FUNCTION__, __LINE__); \
	return;\
	}
	#define IOT_FUNC_EXIT_RC(x) \
	{\
	printf("FUNC_EXIT: %s L#%d Return Code : %ld \n", __FUNCTION__, __LINE__, (long)(x)); \
	return x; \
	}
	#define IOT_FUNC_ENTRY \
	{\
	printf("FUNC_ENTRY: %s L#%d \n", __FUNCTION__, __LINE__); \
	}
	#define IOT_FUNC_EXIT \
	{\
	printf("FUNC_EXIT: %s L#%d \n", __FUNCTION__, __LINE__); \
	return;\
	}
	#define IOT_FUNC_EXIT_RC(x) \
	{\
	printf("FUNC_EXIT: %s L#%d Return Code : %ld \n", __FUNCTION__, __LINE__, (long)(x)); \
	return x; \
	}
		#else
	#define IOT_FUNC_ENTRY
	#define IOT_FUNC_EXIT \
	{\
	return;\
	}
	#define IOT_FUNC_EXIT_RC(x) \
	{\
	return x; \
	}
	#define IOT_FUNC_ENTRY
	#define IOT_FUNC_EXIT \
	{\
	return;\
	}
	#define IOT_FUNC_EXIT_RC(x) \
	{\
	return x; \
	}
		#endif

		/* Macro for interval debug */
	//#define LOG_UPLOAD_DEBUG
	//#define LOG_UPLOAD_DEBUG
		#ifdef LOG_UPLOAD_DEBUG
		#define UPLOAD_DBG(fmt, ...) HAL_Printf(">>LOG-DBG>>%s(%d): " fmt "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
		#else
Expand Down