server: Record the error for connected and connectionless sockets sockets in sock_error().

As long as we do it for connecting and listening sockets, do it here for the remaining socket types as well.

server: Record the error for connected and connectionless sockets sockets in sock_error().
a2f2b773 · Zebediah Figura · Alexandre Julliard · a1fd99cf · a2f2b773
Commit a2f2b773 authored Jul 11, 2022 by Zebediah Figura Committed by Alexandre Julliard Jul 21, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 4 deletions

sock.c server/sock.c +19 -4

No files found.
--- a/server/sock.c
+++ b/server/sock.c
@@ -645,20 +645,35 @@ static inline int sock_error( struct sock *sock )
    socklen_t len = sizeof(error);

    getsockopt( get_unix_fd(sock->fd), SOL_SOCKET, SO_ERROR, (void *)&error, &len);
-    if (sock->state == SOCK_CONNECTING)
+
+    switch (sock->state)
    {
+    case SOCK_UNCONNECTED:
+        break;
+
+    case SOCK_CONNECTING:
        if (error)
            sock->errors[AFD_POLL_BIT_CONNECT_ERR] = error;
        else
            error = sock->errors[AFD_POLL_BIT_CONNECT_ERR];
-    }
-    else if (sock->state == SOCK_LISTENING)
-    {
+        break;
+
+    case SOCK_LISTENING:
        if (error)
            sock->errors[AFD_POLL_BIT_ACCEPT] = error;
        else
            error = sock->errors[AFD_POLL_BIT_ACCEPT];
+        break;
+
+    case SOCK_CONNECTED:
+    case SOCK_CONNECTIONLESS:
+        if (error)
+            sock->errors[AFD_POLL_BIT_HUP] = error;
+        else
+            error = sock->errors[AFD_POLL_BIT_HUP];
+        break;
    }
+
    return error;
 }