From aace13624b87c703ea1beeb592d53ee1f615ceef Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 11 Oct 2016 23:23:20 +0200 Subject: [PATCH] sock: change "no timeout" value from 0 to UINT32_MAX --- sys/include/net/sock.h | 5 +++++ sys/include/net/sock/ip.h | 19 +++++++++++-------- sys/include/net/sock/tcp.h | 9 +++++---- sys/include/net/sock/udp.h | 24 +++++++++++++----------- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/sys/include/net/sock.h b/sys/include/net/sock.h index e2d48c14a17d..d51f9ab2ca37 100644 --- a/sys/include/net/sock.h +++ b/sys/include/net/sock.h @@ -147,6 +147,11 @@ extern "C" { .netif = SOCK_ADDR_ANY_NETIF } #endif +/** + * @brief Special value meaning "wait forever" (don't timeout) + */ +#define SOCK_NO_TIMEOUT (UINT32_MAX) + /** * @brief Abstract IP end point and end point for a raw IP sock object */ diff --git a/sys/include/net/sock/ip.h b/sys/include/net/sock/ip.h index c1eccda946ed..26f17e59f83b 100644 --- a/sys/include/net/sock/ip.h +++ b/sys/include/net/sock/ip.h @@ -45,7 +45,8 @@ * sock_ip_ep_t remote; * ssize_t res; * - * if ((res = sock_ip_recv(&sock, buf, sizeof(buf), 0, &remote)) >= 0) { + * if ((res = sock_ip_recv(&sock, buf, sizeof(buf), SOCK_NO_TIMEOUT, + * &remote)) >= 0) { * puts("Received a message"); * if (sock_ip_send(&sock, buf, res, 0, &remote) < 0) { * puts("Error sending reply"); @@ -97,8 +98,8 @@ * The application then waits indefinitely for an incoming message in * `buf` from `remote`. If we want to timeout this wait period we could * alternatively set the `timeout` parameter of @ref sock_ip_recv() to a - * value `> 0`. If an error occurs on receive we just ignore it and continue - * looping. + * value `!= SOCK_NO_TIMEOUT`. If an error occurs on receive we just ignore it + * and continue looping. * * If we receive a message we use its `remote` to reply. Note since the `proto` * was already set during @ref sock_ip_create() we can just leave `proto` for @@ -110,7 +111,8 @@ * sock_ip_ep_t remote; * ssize_t res; * - * if ((res = sock_ip_recv(&sock, buf, sizeof(buf), 0, &remote)) >= 0) { + * if ((res = sock_ip_recv(&sock, buf, sizeof(buf), SOCK_NO_TIMEOUT, + * &remote)) >= 0) { * puts("Received a message"); * if (sock_ip_send(&sock, buf, res, 0, &remote) < 0) { * puts("Error sending reply"); @@ -389,10 +391,10 @@ int sock_ip_get_remote(sock_ip_t *sock, sock_ip_ep_t *ep); * @param[out] data Pointer where the received data should be stored. * @param[in] max_len Maximum space available at @p data. * @param[in] timeout Timeout for receive in microseconds. - * This value can be ignored (no timeout) if the - * @ref sys_xtimer module is not present or the - * implementation does not support timeouts on its own. - * May be 0 for no timeout. + * If 0 and no data is available, the function returns + * immediately. + * May be SOCK_NO_TIMEOUT for no timeout (wait until data + * is available). * @param[out] remote Remote end point of the received data. * May be NULL, if it is not required by the application. * @@ -401,6 +403,7 @@ int sock_ip_get_remote(sock_ip_t *sock, sock_ip_ep_t *ep); * @return The number of bytes received on success. * @return 0, if no received data is available, but everything is in order. * @return -EADDRNOTAVAIL, if local of @p sock is not given. + * @return -EAGAIN, if @p timeout is `0` and no data is available. * @return -ENOBUFS, if buffer space is not large enough to store received * data. * @return -ENOMEM, if no memory was available to receive @p data. diff --git a/sys/include/net/sock/tcp.h b/sys/include/net/sock/tcp.h index 6bda4db5c75a..370d3c8f07a1 100644 --- a/sys/include/net/sock/tcp.h +++ b/sys/include/net/sock/tcp.h @@ -191,16 +191,17 @@ int sock_tcp_accept(sock_tcp_queue_t *queue, sock_tcp_t **sock); * truncated and the remaining data can be retrieved * later on. * @param[in] timeout Timeout for receive in microseconds. - * This value can be ignored (no timeout) if the - * @ref sys_xtimer module is not present and the - * implementation does not support timeouts on its own. - * May be 0 for no timeout. + * If 0 and no data is available, the function returns + * immediately. + * May be SOCK_NO_TIMEOUT for no timeout (wait until data + * is available). * * @note Function may block. * * @return The number of bytes read on success. * @return 0, if no read data is available, but everything is in order. * @return -EADDRNOTAVAIL, if local of @p sock is not given. + * @return -EAGAIN, if @p timeout is `0` and no data is available. * @return -ECONNABORTED, if the connection is aborted while waiting for the * next data. * @return -ECONNRESET, if the connection was forcibly closed by remote end diff --git a/sys/include/net/sock/udp.h b/sys/include/net/sock/udp.h index f2f85a5e1376..0b7601c9ed60 100644 --- a/sys/include/net/sock/udp.h +++ b/sys/include/net/sock/udp.h @@ -46,7 +46,8 @@ * sock_udp_ep_t remote; * ssize_t res; * - * if ((res = sock_udp_recv(&sock, buf, sizeof(buf), 0, &remote)) >= 0) { + * if ((res = sock_udp_recv(&sock, buf, sizeof(buf), SOCK_NO_TIMEOUT, + * &remote)) >= 0) { * puts("Received a message"); * if (sock_udp_send(&sock, buf, res, &remote) < 0) { * puts("Error sending reply"); @@ -94,11 +95,11 @@ * } * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * The application then waits indefinitely for an incoming message in - * `buf` from `remote`. If we want to timeout this wait period we could - * alternatively set the `timeout` parameter of @ref sock_udp_recv() to a - * value `> 0`. If an error occurs on receive we just ignore it and continue - * looping. + * The application then waits indefinitely for an incoming message in `buf` + * from `remote`. If we want to timeout this wait period we could alternatively + * set the `timeout` parameter of @ref sock_udp_recv() to a value != @ref + * SOCK_NO_TIMEOUT. If an error occurs on receive we just ignore it and + * continue looping. * * If we receive a message we use its `remote` to reply. In case of an error on * send we print an according message: @@ -108,7 +109,7 @@ * sock_udp_ep_t remote; * ssize_t res; * - * if ((res = sock_udp_recv(&sock, buf, sizeof(buf), 0, &remote)) >= 0) { + * if ((res = sock_udp_recv(&sock, buf, sizeof(buf), SOCK_NO_TIMEOUT, &remote)) >= 0) { * puts("Received a message"); * if (sock_udp_send(&sock, buf, res, &remote) < 0) { * puts("Error sending reply"); @@ -377,10 +378,10 @@ int sock_udp_get_remote(sock_udp_t *sock, sock_udp_ep_t *ep); * @param[out] data Pointer where the received data should be stored. * @param[in] max_len Maximum space available at @p data. * @param[in] timeout Timeout for receive in microseconds. - * This value can be ignored (no timeout) if the - * @ref sys_xtimer module is not present or the - * implementation does not support timeouts on its own. - * May be 0 for no timeout. + * If 0 and no data is available, the function returns + * immediately. + * May be SOCK_NO_TIMEOUT for no timeout (wait until data + * is available). * @param[out] remote Remote end point of the received data. * May be `NULL`, if it is not required by the application. * @@ -389,6 +390,7 @@ int sock_udp_get_remote(sock_udp_t *sock, sock_udp_ep_t *ep); * @return The number of bytes received on success. * @return 0, if no received data is available, but everything is in order. * @return -EADDRNOTAVAIL, if local of @p sock is not given. + * @return -EAGAIN, if @p timeout is `0` and no data is available. * @return -ENOBUFS, if buffer space is not large enough to store received * data. * @return -ENOMEM, if no memory was available to receive @p data.