PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109 from DavidLin1577/patch-2

Browse Source 
Fixed the return errors of tencentCloud_SDK
This commit is contained in:
Arthur
2020-03-02 17:34:37 +08:00
committed by GitHub
parent 1c131b9f26 06b7aea567
commit 4dbfff0457
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/connectivity/TencentCloud_SDK/source/include/qcloud_err.h
View File

@@ -1,5 +1,5 @@
#ifndef _QCLOUD_ERR_H_ #ifndef _QCLOUD_ERR_H_
#define _QCLOUD_ERR_H_ #define _QCLOUD_ERR_H_
typedef enum qcloud_err_en { typedef enum qcloud_err_en {
QCLOUD_ERR_MQTT_ALREADY_CONNECTED = 4, // 表示与MQTT服务器已经建立连接 QCLOUD_ERR_MQTT_ALREADY_CONNECTED = 4, // 表示与MQTT服务器已经建立连接
@@ -98,13 +98,13 @@ typedef enum qcloud_err_en {
QCLOUD_ERR_SSL_READ = -708, // 表示SSL读错误 QCLOUD_ERR_SSL_READ = -708, // 表示SSL读错误
QCLOUD_ERR_SSL_NOTHING_TO_READ = -709, // 表示底层没有数据可以读取 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, // 表示无法通过主机名获取IP地址 QCLOUD_ERR_UDP_UNKNOWN_HOST = -602, // 表示无法通过主机名获取IP地址
QCLOUD_ERR_UDP_CONNECT = -603, // 表示建立TCP连接失败 QCLOUD_ERR_UDP_CONNECT = -603, // 表示建立UDP连接失败
QCLOUD_ERR_UDP_READ_TIMEOUT = -604, // 表示TCP读超时 QCLOUD_ERR_UDP_READ_TIMEOUT = -604, // 表示UDP读超时
QCLOUD_ERR_UDP_WRITE_TIMEOUT = -605, // 表示TCP写超时 QCLOUD_ERR_UDP_WRITE_TIMEOUT = -605, // 表示UDP写超时
QCLOUD_ERR_UDP_READ_FAIL = -606, // 表示TCP读错误 QCLOUD_ERR_UDP_READ_FAIL = -606, // 表示UDP读错误
QCLOUD_ERR_UDP_WRITE_FAIL = -607, // 表示TCP写错误 QCLOUD_ERR_UDP_WRITE_FAIL = -607, // 表示UDP写错误
QCLOUD_ERR_UDP_NOTHING_TO_READ = -609, // 表示底层没有数据可以读取 QCLOUD_ERR_UDP_NOTHING_TO_READ = -609, // 表示底层没有数据可以读取
} qcloud_err_t; } qcloud_err_t;

8
components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_module.c
View File

@@ -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); fd = tos_sal_module_connect("111.230.127.136", "5684", TOS_SAL_PROTO_UDP);
if (fd < 0) { if (fd < 0) {
QCLOUD_LOG_I("net connect fail\n\r"); QCLOUD_LOG_I("net connect fail\n\r");
if (QCLOUD_ERR_SUCCESS == tos_sal_module_init()) { /* <EFBFBD><EFBFBD><EFBFBD>³<EFBFBD>ʼ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD> */ if (QCLOUD_ERR_SUCCESS == tos_sal_module_init()) { /* ÖØгõʼ»¯Ä£×é */
QCLOUD_LOG_I("net reinit success\n\r"); QCLOUD_LOG_I("net reinit success\n\r");
fd = tos_sal_module_connect(host, port_str, TOS_SAL_PROTO_UDP); fd = tos_sal_module_connect(host, port_str, TOS_SAL_PROTO_UDP);
if (fd < 0) { 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); ret = tos_sal_module_sendto(sockfd, NULL, NULL, buf, len);
if (ret < 0) { if (ret < 0) {
return QCLOUD_ERR_TCP_WRITE_FAIL; return QCLOUD_ERR_UDP_WRITE_FAIL;
} }
(*(int *)write_len) = ret; (*(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); ret = tos_sal_module_recvfrom_timeout(sockfd, buf, len, timeout);
if (ret < 0) { if (ret < 0) {
return QCLOUD_ERR_TCP_READ_FAIL; return QCLOUD_ERR_UDP_READ_FAIL;
} }
if (ret == 0) { if (ret == 0) {
return QCLOUD_ERR_TCP_NOTHING_TO_READ; return QCLOUD_ERR_UDP_NOTHING_TO_READ;
} }
*(int *)read_len = ret; *(int *)read_len = ret;

4
components/connectivity/TencentCloud_SDK/source/src/port/TencentOS_tiny/osal_udp_socket.c
View File

@@ -40,7 +40,7 @@ __QCLOUD_OSAL__ int osal_udp_connect(const char *host, uint16_t port)
hints.ai_family = AF_INET; hints.ai_family = AF_INET;
hints.ai_protocol = IPPROTO_UDP; 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) { if (getaddrinfo(host, port_str, &hints, &addr_list) != 0) {
QCLOUD_LOG_E("getaddrinfo error,errno:%s", strerror(errno)); QCLOUD_LOG_E("getaddrinfo error,errno:%s", strerror(errno));
@@ -98,7 +98,7 @@ __QCLOUD_OSAL__ qcloud_err_t osal_udp_read(int sockfd, void *buf, size_t len, ui
fd_set read_fds; fd_set read_fds;
if (sockfd < 0) { if (sockfd < 0) {
return QCLOUD_ERR_TCP_READ_FAIL; return QCLOUD_ERR_UDP_READ_FAIL;
} }
FD_ZERO(&read_fds); FD_ZERO(&read_fds);