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

Merge pull request #110 from DavidLin1577/patch-3

Browse Source 
Fixed the wrong return value in HAL_UDP_module.c
This commit is contained in:
Arthur
2020-03-02 17:34:03 +08:00
committed by GitHub
parent fe2ff19c07 d0d01f5ba2
commit 1c131b9f26
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_UDP_module.c
View File

@@ -41,7 +41,7 @@ uintptr_t HAL_UDP_Connect(const char *host, unsigned short 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) {
Log_i("net connect fail\n\r"); Log_i("net connect fail\n\r");
if (QCLOUD_RET_SUCCESS == tos_sal_module_init()) { /* <EFBFBD><EFBFBD><EFBFBD>³<EFBFBD>ʼ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD> */ if (QCLOUD_RET_SUCCESS == tos_sal_module_init()) { /* ÖØгõʼ»¯Ä£×é */
Log_i("net reinit success\n\r"); 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) {
@@ -71,7 +71,7 @@ int HAL_UDP_Write(uintptr_t fd, const unsigned char *p_data, unsigned int datale
ret = tos_sal_module_sendto(fd, NULL, NULL, p_data, datalen); ret = tos_sal_module_sendto(fd, NULL, NULL, p_data, datalen);
if (ret < 0) { if (ret < 0) {
return QCLOUD_ERR_TCP_WRITE_FAIL; return QCLOUD_ERR_UDP_WRITE_FAIL;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
@@ -86,11 +86,11 @@ int HAL_UDP_Read(uintptr_t fd, unsigned char *p_data, unsigned int datalen)
ret = tos_sal_module_recvfrom(fd, p_data, datalen); ret = tos_sal_module_recvfrom(fd, p_data, datalen);
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;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
@@ -105,11 +105,11 @@ int HAL_UDP_ReadTimeout(uintptr_t fd, unsigned char *p_data, unsigned int datale
ret = tos_sal_module_recvfrom_timeout(fd, p_data, datalen, timeout_ms); ret = tos_sal_module_recvfrom_timeout(fd, p_data, datalen, timeout_ms);
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;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;

10
components/connectivity/qcloud-iot-hub-sdk-3.1.2/port/TencentOS_tiny/HAL_UDP_module.c
View File

@@ -70,7 +70,7 @@ int HAL_UDP_Write(uintptr_t fd, const unsigned char *p_data, unsigned int datale
ret = tos_sal_module_sendto(fd, NULL, NULL, p_data, datalen); ret = tos_sal_module_sendto(fd, NULL, NULL, p_data, datalen);
if (ret < 0) { if (ret < 0) {
return QCLOUD_ERR_TCP_WRITE_FAIL; return QCLOUD_ERR_UDP_WRITE_FAIL;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
@@ -85,11 +85,11 @@ int HAL_UDP_Read(uintptr_t fd, unsigned char *p_data, unsigned int datalen)
ret = tos_sal_module_recvfrom(fd, p_data, datalen); ret = tos_sal_module_recvfrom(fd, p_data, datalen);
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;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
@@ -104,11 +104,11 @@ int HAL_UDP_ReadTimeout(uintptr_t fd, unsigned char *p_data, unsigned int datale
ret = tos_sal_module_recvfrom_timeout(fd, p_data, datalen, timeout_ms); ret = tos_sal_module_recvfrom_timeout(fd, p_data, datalen, timeout_ms);
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;
} }
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;