From 4dfbcb631f679c1cf1d5d106cdc40ae835576798 Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Wed, 1 Mar 2023 13:51:25 +0000 Subject: [PATCH] coap_io.c: Map Windows WSA errors into errno for CoAP layer simplification --- src/coap_io.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/coap_io.c b/src/coap_io.c index 02223321..b73ff693 100644 --- a/src/coap_io.c +++ b/src/coap_io.c @@ -475,6 +475,22 @@ coap_update_epoll_timer(coap_context_t *context, coap_tick_t delay) #endif /* COAP_EPOLL_SUPPORT */ +#ifdef _WIN32 +static void +coap_win_error_to_errno(void) { + int error = WSAGetLastError(); + switch (error) { + case WSAEWOULDBLOCK: errno = EWOULDBLOCK; break; + case WSAECONNRESET: errno = ECONNRESET; break; + case WSAECONNREFUSED: errno = ECONNREFUSED; break; + case WSAEINVAL: errno = EINVAL; break; + default: + coap_log_debug("WSAGetLastError: %d mapping to errno undefined\n", error); + break; + } +} +#endif /* _WIN32 */ + ssize_t coap_socket_write(coap_socket_t *sock, const uint8_t *data, size_t data_len) { ssize_t r; @@ -490,12 +506,14 @@ coap_socket_write(coap_socket_t *sock, const uint8_t *data, size_t data_len) { #endif if (r == COAP_SOCKET_ERROR) { #ifdef _WIN32 - if (WSAGetLastError() == WSAEWOULDBLOCK) { + coap_win_error_to_errno(); + if (WSAGetLastError() == WSAEWOULDBLOCK) #elif EAGAIN != EWOULDBLOCK - if (errno==EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { + if (errno==EAGAIN || errno == EWOULDBLOCK || errno == EINTR) #else - if (errno==EAGAIN || errno == EINTR) { + if (errno==EAGAIN || errno == EINTR) #endif + { sock->flags |= COAP_SOCKET_WANT_WRITE; #ifdef COAP_EPOLL_SUPPORT coap_epoll_ctl_mod(sock, @@ -544,17 +562,20 @@ coap_socket_read(coap_socket_t *sock, uint8_t *data, size_t data_len) { if (r == 0) { /* graceful shutdown */ sock->flags &= ~COAP_SOCKET_CAN_READ; + errno = ECONNRESET; return -1; } else if (r == COAP_SOCKET_ERROR) { sock->flags &= ~COAP_SOCKET_CAN_READ; #ifdef _WIN32 + coap_win_error_to_errno(); error = WSAGetLastError(); - if (error == WSAEWOULDBLOCK) { + if (error == WSAEWOULDBLOCK) #elif EAGAIN != EWOULDBLOCK - if (errno==EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { + if (errno==EAGAIN || errno == EWOULDBLOCK || errno == EINTR) #else - if (errno==EAGAIN || errno == EINTR) { + if (errno==EAGAIN || errno == EINTR) #endif + { return 0; } #ifdef _WIN32 @@ -829,6 +850,7 @@ coap_socket_recv(coap_socket_t *sock, coap_packet_t *packet) { #endif if (len < 0) { #ifdef _WIN32 + coap_win_error_to_errno(); if (WSAGetLastError() == WSAECONNRESET || WSAGetLastError() == WSAECONNREFUSED) { #else @@ -905,6 +927,7 @@ coap_socket_recv(coap_socket_t *sock, coap_packet_t *packet) { if (len < 0) { #ifdef _WIN32 + coap_win_error_to_errno(); if (WSAGetLastError() == WSAECONNRESET) { #else if (errno == ECONNREFUSED) { @@ -1375,6 +1398,7 @@ coap_io_process_with_fds(coap_context_t *ctx, uint32_t timeout_ms, if (result < 0) { /* error */ #ifdef _WIN32 + coap_win_error_to_errno(); if (WSAGetLastError() != WSAEINVAL) /* May happen because of ICMP */ #else if (errno != EINTR)