From 97d271f62a104819a38f016f295b5a1e68a0aac9 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 29 Feb 2020 21:37:07 +0800 Subject: [PATCH 1/4] Fixed the wrong return value in osal_udp_socket.c QCLOUD_ERR_TCP_READ_FAIL -> QCLOUD_ERR_UDP_READ_FAIL --- .../source/src/port/TencentOS_tiny/osal_udp_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c index c44ce1c6..4bfdbdef 100644 --- a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c +++ b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c @@ -98,7 +98,7 @@ __QCLOUD_OSAL__ qcloud_err_t osal_udp_read(int sockfd, void *buf, size_t len, ui fd_set read_fds; if (sockfd < 0) { - return QCLOUD_ERR_TCP_READ_FAIL; + return QCLOUD_ERR_UDP_READ_FAIL; } FD_ZERO(&read_fds); From 6d626a7adcc322610fffa0b7abbbbb26eba92606 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 29 Feb 2020 21:48:26 +0800 Subject: [PATCH 2/4] Fixed the wrong return value in osal_udp_module.c QCLOUD_ERR_TCP_WRITE_FAIL -> QCLOUD_ERR_UDP_WRITE_FAIL QCLOUD_ERR_TCP_READ_FAIL -> QCLOUD_ERR_UDP_READ_FAIL QCLOUD_ERR_TCP_NOTHING_TO_READ -> QCLOUD_ERR_UDP_NOTHING_TO_READ --- .../source/src/port/TencentOS_tiny/osal_udp_module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_module.c b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_module.c index 9e6ab56d..a72d8ba4 100644 --- a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_module.c +++ b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_module.c @@ -33,7 +33,7 @@ __QCLOUD_OSAL__ int osal_udp_connect(const char *host, uint16_t port) fd = tos_sal_module_connect("111.230.127.136", "5684", TOS_SAL_PROTO_UDP); if (fd < 0) { QCLOUD_LOG_I("net connect fail\n\r"); - if (QCLOUD_ERR_SUCCESS == tos_sal_module_init()) { /* 重新初始化模组 */ + if (QCLOUD_ERR_SUCCESS == tos_sal_module_init()) { /* 脰脴脨脗鲁玫脢录禄炉脛拢脳茅 */ QCLOUD_LOG_I("net reinit success\n\r"); fd = tos_sal_module_connect(host, port_str, TOS_SAL_PROTO_UDP); if (fd < 0) { @@ -63,7 +63,7 @@ __QCLOUD_OSAL__ qcloud_err_t osal_udp_write(int sockfd, const void *buf, size_t ret = tos_sal_module_sendto(sockfd, NULL, NULL, buf, len); if (ret < 0) { - return QCLOUD_ERR_TCP_WRITE_FAIL; + return QCLOUD_ERR_UDP_WRITE_FAIL; } (*(int *)write_len) = ret; @@ -79,11 +79,11 @@ __QCLOUD_OSAL__ qcloud_err_t osal_udp_read(int sockfd, void *buf, size_t len, ui ret = tos_sal_module_recvfrom_timeout(sockfd, buf, len, timeout); if (ret < 0) { - return QCLOUD_ERR_TCP_READ_FAIL; + return QCLOUD_ERR_UDP_READ_FAIL; } if (ret == 0) { - return QCLOUD_ERR_TCP_NOTHING_TO_READ; + return QCLOUD_ERR_UDP_NOTHING_TO_READ; } *(int *)read_len = ret; From f75137933836180a1807df34c458662e8d9ebe56 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 29 Feb 2020 22:24:17 +0800 Subject: [PATCH 3/4] Fixed notes errors --- .../TencentCloud_SDK/source/include/qcloud_err.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/connectivity/TencentCloud_SDK/source/include/qcloud_err.h b/components/connectivity/TencentCloud_SDK/source/include/qcloud_err.h index b64a8473..97fa5fb2 100644 --- a/components/connectivity/TencentCloud_SDK/source/include/qcloud_err.h +++ b/components/connectivity/TencentCloud_SDK/source/include/qcloud_err.h @@ -1,5 +1,5 @@ #ifndef _QCLOUD_ERR_H_ -#define _QCLOUD_ERR_H_ +#define _QCLOUD_ERR_H_ typedef enum qcloud_err_en { QCLOUD_ERR_MQTT_ALREADY_CONNECTED = 4, // 琛ㄧず涓嶮QTT鏈嶅姟鍣ㄥ凡缁忓缓绔嬭繛鎺 @@ -98,13 +98,13 @@ typedef enum qcloud_err_en { QCLOUD_ERR_SSL_READ = -708, // 琛ㄧずSSL璇婚敊璇 QCLOUD_ERR_SSL_NOTHING_TO_READ = -709, // 琛ㄧず搴曞眰娌℃湁鏁版嵁鍙互璇诲彇 - QCLOUD_ERR_UDP_SOCKET_FAILED = -601, // 琛ㄧずTCP杩炴帴寤虹珛濂楁帴瀛楀け璐 + QCLOUD_ERR_UDP_SOCKET_FAILED = -601, // 琛ㄧずUDP杩炴帴寤虹珛濂楁帴瀛楀け璐 QCLOUD_ERR_UDP_UNKNOWN_HOST = -602, // 琛ㄧず鏃犳硶閫氳繃涓绘満鍚嶈幏鍙朓P鍦板潃 - QCLOUD_ERR_UDP_CONNECT = -603, // 琛ㄧず寤虹珛TCP杩炴帴澶辫触 - QCLOUD_ERR_UDP_READ_TIMEOUT = -604, // 琛ㄧずTCP璇昏秴鏃 - QCLOUD_ERR_UDP_WRITE_TIMEOUT = -605, // 琛ㄧずTCP鍐欒秴鏃 - QCLOUD_ERR_UDP_READ_FAIL = -606, // 琛ㄧずTCP璇婚敊璇 - QCLOUD_ERR_UDP_WRITE_FAIL = -607, // 琛ㄧずTCP鍐欓敊璇 + QCLOUD_ERR_UDP_CONNECT = -603, // 琛ㄧず寤虹珛UDP杩炴帴澶辫触 + QCLOUD_ERR_UDP_READ_TIMEOUT = -604, // 琛ㄧずUDP璇昏秴鏃 + QCLOUD_ERR_UDP_WRITE_TIMEOUT = -605, // 琛ㄧずUDP鍐欒秴鏃 + QCLOUD_ERR_UDP_READ_FAIL = -606, // 琛ㄧずUDP璇婚敊璇 + QCLOUD_ERR_UDP_WRITE_FAIL = -607, // 琛ㄧずUDP鍐欓敊璇 QCLOUD_ERR_UDP_NOTHING_TO_READ = -609, // 琛ㄧず搴曞眰娌℃湁鏁版嵁鍙互璇诲彇 } qcloud_err_t; From 06b7aea5671581d45f38c66d5fef8127db404468 Mon Sep 17 00:00:00 2001 From: David Lin Date: Mon, 2 Mar 2020 08:44:29 +0800 Subject: [PATCH 4/4] Fixed wrong output information --- .../source/src/port/TencentOS_tiny/osal_udp_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c index 4bfdbdef..e1bfef8e 100644 --- a/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c +++ b/components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c @@ -40,7 +40,7 @@ __QCLOUD_OSAL__ int osal_udp_connect(const char *host, uint16_t port) hints.ai_family = AF_INET; hints.ai_protocol = IPPROTO_UDP; - QCLOUD_LOG_D("establish tcp connection with server(host=%s port=%s)", host, port_str); + QCLOUD_LOG_D("establish udp connection with server(host=%s port=%s)", host, port_str); if (getaddrinfo(host, port_str, &hints, &addr_list) != 0) { QCLOUD_LOG_E("getaddrinfo error,errno:%s", strerror(errno));