diff --git a/net/usrsock/usrsock.h b/net/usrsock/usrsock.h index ae8b86e5a09..200fb745da8 100644 --- a/net/usrsock/usrsock.h +++ b/net/usrsock/usrsock.h @@ -50,6 +50,8 @@ #define USRSOCK_EVENT_INTERNAL_MASK (USRSOCK_EVENT_CONNECT_READY | \ USRSOCK_EVENT_REQ_COMPLETE) +#define USRSOCK_USOCKID_INVALID (-1) + /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c index d95fa5c85b4..21c4a0fe108 100644 --- a/net/usrsock/usrsock_close.c +++ b/net/usrsock/usrsock_close.c @@ -185,7 +185,7 @@ int usrsock_close(FAR struct usrsock_conn_s *conn) close_out: conn->state = USRSOCK_CONN_STATE_UNINITIALIZED; - conn->usockid = -1; + conn->usockid = USRSOCK_USOCKID_INVALID; errout: net_unlock(); diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c index 72cc0319c24..c87703d915a 100644 --- a/net/usrsock/usrsock_conn.c +++ b/net/usrsock/usrsock_conn.c @@ -117,7 +117,7 @@ FAR struct usrsock_conn_s *usrsock_alloc(void) /* Make sure that the connection is marked as uninitialized */ nxsem_init(&conn->resp.sem, 0, 1); - conn->usockid = -1; + conn->usockid = USRSOCK_USOCKID_INVALID; conn->state = USRSOCK_CONN_STATE_UNINITIALIZED; /* Enqueue the connection into the active list */ @@ -344,7 +344,7 @@ void usrsock_initialize(void) /* Mark the connection closed and move it to the free list */ - conn->usockid = -1; + conn->usockid = USRSOCK_USOCKID_INVALID; conn->state = USRSOCK_CONN_STATE_UNINITIALIZED; dq_addlast(&conn->sconn.node, &g_free_usrsock_connections); } diff --git a/net/usrsock/usrsock_event.c b/net/usrsock/usrsock_event.c index 7b1b699be50..66a61c5ffaf 100644 --- a/net/usrsock/usrsock_event.c +++ b/net/usrsock/usrsock_event.c @@ -87,6 +87,7 @@ int usrsock_event(FAR struct usrsock_conn_s *conn) if (events & USRSOCK_EVENT_ABORT) { conn->state = USRSOCK_CONN_STATE_ABORTED; + conn->usockid = USRSOCK_USOCKID_INVALID; } if ((conn->state == USRSOCK_CONN_STATE_READY ||