server: Make disconnecting a named pipe immediately close the client's…

server: Make disconnecting a named pipe immediately close the client's connection and allow the server to initiate a new connection. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Make disconnecting a named pipe immediately close the client's…
780ede1c · Ken Thomases · Alexandre Julliard · 88168d4b · 780ede1c
Commit 780ede1c authored Oct 20, 2016 by Ken Thomases Committed by Alexandre Julliard Oct 21, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

named_pipe.c server/named_pipe.c +4 -12

No files found.
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -60,7 +60,6 @@ enum pipe_state
    ps_wait_open,
    ps_connected_server,
    ps_wait_disconnect,
-    ps_disconnected_server,
    ps_wait_connect
 };

@@ -344,7 +343,6 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state 
        assert( !server->fd );
        set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING );
        break;
-    case ps_disconnected_server:
    case ps_wait_connect:
        assert( !server->fd );
        set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED );
@@ -430,9 +428,6 @@ static void pipe_client_destroy( struct object *obj)
               do a successful flush without it. */
            set_server_state( server, ps_wait_disconnect );
            break;
-        case ps_disconnected_server:
-            set_server_state( server, ps_wait_connect );
-            break;
        case ps_idle_server:
        case ps_wait_open:
        case ps_wait_disconnect:
@@ -623,9 +618,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a
        case ps_connected_server:
            set_error( STATUS_PIPE_CONNECTED );
            break;
-        case ps_disconnected_server:
-            set_error( STATUS_PIPE_BUSY );
-            break;
        case ps_wait_disconnect:
            set_error( STATUS_NO_DATA_DETECTED );
            break;
@@ -644,10 +636,11 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a

            notify_empty( server );

-            /* dump the client and server fds, but keep the pointers
-               around - client loses all waiting data */
+            /* dump the client and server fds - client loses all waiting data */
            do_disconnect( server );
-            set_server_state( server, ps_disconnected_server );
+            server->client->server = NULL;
+            server->client = NULL;
+            set_server_state( server, ps_wait_connect );
            break;
        case ps_wait_disconnect:
            assert( !server->client );
@@ -658,7 +651,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a
        case ps_wait_open:
            set_error( STATUS_PIPE_LISTENING );
            break;
-        case ps_disconnected_server:
        case ps_wait_connect:
            set_error( STATUS_PIPE_DISCONNECTED );
            break;