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

Merge pull request #83 from DavidLin1577/patch-2

Browse Source 
Update qcloud_network.c
This commit is contained in:
Arthur
2020-01-20 13:58:36 +08:00
committed by GitHub
parent abe0230572 7e92ae86de
commit 0eb8c18660
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
components/connectivity/TencentCloud_SDK/source/src/qcloud_network.c
View File

@@ -31,7 +31,7 @@ __QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_read(qcloud_network_t *network
__QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_write(qcloud_network_t *network, const void *buf, size_t len, uint32_t timeout, size_t *write_len) __QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_write(qcloud_network_t *network, const void *buf, size_t len, uint32_t timeout, size_t *write_len)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(write_len, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(write_len, QCLOUD_ERR_INVAL);
@@ -40,28 +40,28 @@ __QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_write(qcloud_network_t *networ
__QCLOUD_STATIC__ void qcloud_network_tcp_disconnect(qcloud_network_t *network) __QCLOUD_STATIC__ void qcloud_network_tcp_disconnect(qcloud_network_t *network)
{ {
if (!network || network->fd < 0) { if (!network || network->fd < 0) {
return; return;
} }
osal_tcp_disconnect(network->fd); osal_tcp_disconnect(network->fd);
network->fd = -1; network->fd = -1;
} }
__QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_connect(qcloud_network_t *network) __QCLOUD_STATIC__ qcloud_err_t qcloud_network_tcp_connect(qcloud_network_t *network)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
network->fd = osal_tcp_connect(network->host, network->port); network->fd = osal_tcp_connect(network->host, network->port);
if (network->fd >= 0) { if (network->fd >= 0) {
return QCLOUD_ERR_SUCCESS; return QCLOUD_ERR_SUCCESS;
} }
return QCLOUD_ERR_FAILURE; return QCLOUD_ERR_FAILURE;
} }
__QCLOUD_API__ qcloud_err_t qcloud_network_tcp_init(qcloud_network_t *network) __QCLOUD_API__ qcloud_err_t qcloud_network_tcp_init(qcloud_network_t *network)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
network->connect = qcloud_network_tcp_connect; network->connect = qcloud_network_tcp_connect;
network->read = qcloud_network_tcp_read; network->read = qcloud_network_tcp_read;
@@ -81,7 +81,7 @@ __QCLOUD_STATIC__ int qcloud_network_udp_is_connected(qcloud_network_t *network)
__QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_read(qcloud_network_t *network, void *buf, size_t len, uint32_t timeout, size_t *read_len) __QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_read(qcloud_network_t *network, void *buf, size_t len, uint32_t timeout, size_t *read_len)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(read_len, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(read_len, QCLOUD_ERR_INVAL);
@@ -90,7 +90,7 @@ __QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_read(qcloud_network_t *network
__QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_write(qcloud_network_t *network, const void *buf, size_t len, uint32_t timeout, size_t *write_len) __QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_write(qcloud_network_t *network, const void *buf, size_t len, uint32_t timeout, size_t *write_len)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(buf, QCLOUD_ERR_INVAL);
QCLOUD_POINTER_SANITY_CHECK(write_len, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(write_len, QCLOUD_ERR_INVAL);
@@ -99,29 +99,28 @@ __QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_write(qcloud_network_t *networ
__QCLOUD_STATIC__ void qcloud_network_udp_disconnect(qcloud_network_t *network) __QCLOUD_STATIC__ void qcloud_network_udp_disconnect(qcloud_network_t *network)
{ {
if (!network || network->fd < 0) { if (!network || network->fd < 0) {
return; return;
} }
osal_udp_disconnect(network->fd); osal_udp_disconnect(network->fd);
network->fd = -1; network->fd = -1;
} }
__QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_connect(qcloud_network_t *network) __QCLOUD_STATIC__ qcloud_err_t qcloud_network_udp_connect(qcloud_network_t *network)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
network->fd = osal_udp_connect(network->host, network->port); network->fd = osal_udp_connect(network->host, network->port);
if (network->fd >= 0) { if (network->fd >= 0) {
return QCLOUD_ERR_SUCCESS; return QCLOUD_ERR_SUCCESS;
} }
return QCLOUD_ERR_FAILURE; return QCLOUD_ERR_FAILURE;
} }
__QCLOUD_API__ qcloud_err_t qcloud_network_udp_init(qcloud_network_t *network) __QCLOUD_API__ qcloud_err_t qcloud_network_udp_init(qcloud_network_t *network)
{ {
QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL); QCLOUD_POINTER_SANITY_CHECK(network, QCLOUD_ERR_INVAL);
network->connect = qcloud_network_udp_connect; network->connect = qcloud_network_udp_connect;
network->read = qcloud_network_udp_read; network->read = qcloud_network_udp_read;