sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webclient: Add a way to specify timeout

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2021-06-15 10:06:17 +09:00 committed by Xiang Xiao
parent 6bc7a448de
commit ce2b9519a7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/netutils/webclient.h
View File

@ -195,6 +195,13 @@ struct webclient_context
* headers - An array of pointers to the extra headers. * headers - An array of pointers to the extra headers.
* nheaders - The number of elements in the "headers" array. * nheaders - The number of elements in the "headers" array.
* bodylen - The size of the request body. * bodylen - The size of the request body.
* timeout_sec - The timeout in second.
* This is not meant to cover the entire transaction.
* Instead, this is meant to be an inactive timer.
* That is, if no progress is made during the
* specified amount of time, the operation will fail.
* The default is CONFIG_WEBCLIENT_TIMEOUT, which is
* 10 seconds by default.
*/ */
FAR const char *method; FAR const char *method;
@ -205,6 +212,7 @@ struct webclient_context
FAR const char * FAR const *headers; FAR const char * FAR const *headers;
unsigned int nheaders; unsigned int nheaders;
size_t bodylen; size_t bodylen;
unsigned int timeout_sec;
/* other parameters /* other parameters
* *

5
netutils/webclient/webclient.c
View File

@ -815,7 +815,7 @@ int webclient_perform(FAR struct webclient_context *ctx)
snprintf(port_str, sizeof(port_str), "%u", ws->port); snprintf(port_str, sizeof(port_str), "%u", ws->port);
ret = tls_ops->connect(tls_ctx, ws->hostname, port_str, ret = tls_ops->connect(tls_ctx, ws->hostname, port_str,
CONFIG_WEBCLIENT_TIMEOUT, &conn.tls_conn); ctx->timeout_sec, &conn.tls_conn);
} }
else else
{ {
@ -879,7 +879,7 @@ int webclient_perform(FAR struct webclient_context *ctx)
/* Set send and receive timeout values */ /* Set send and receive timeout values */
tv.tv_sec = CONFIG_WEBCLIENT_TIMEOUT; tv.tv_sec = ctx->timeout_sec;
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt(conn.sockfd, SOL_SOCKET, SO_RCVTIMEO, setsockopt(conn.sockfd, SOL_SOCKET, SO_RCVTIMEO,
@ -1277,6 +1277,7 @@ void webclient_set_defaults(FAR struct webclient_context *ctx)
{ {
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
ctx->method = "GET"; ctx->method = "GET";
ctx->timeout_sec = CONFIG_WEBCLIENT_TIMEOUT;
} }
/**************************************************************************** /****************************************************************************