From: Zebediah Figura Subject: [PATCH 5/5] server: Remove the no longer used set_socket_deferred request. Message-Id: <20210618015824.185630-5-z.figura12@gmail.com> Date: Thu, 17 Jun 2021 20:58:24 -0500 In-Reply-To: <20210618015824.185630-1-z.figura12@gmail.com> References: <20210618015824.185630-1-z.figura12@gmail.com> Signed-off-by: Zebediah Figura --- server/protocol.def | 6 ------ server/sock.c | 18 ------------------ 2 files changed, 24 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index d3f44482c37..72f2f2c20ae 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1445,12 +1445,6 @@ enum server_fd_type @END -@REQ(set_socket_deferred) - obj_handle_t handle; /* handle to the socket */ - obj_handle_t deferred; /* handle to the socket for which accept() is deferred */ -@END - - /* Perform a recv on a socket */ @REQ(recv_socket) int oob; /* are we receiving OOB data? */ diff --git a/server/sock.c b/server/sock.c index 7b40b6e3f30..547287572d5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2950,24 +2950,6 @@ DECL_HANDLER(get_socket_event) release_object( &sock->obj ); } -DECL_HANDLER(set_socket_deferred) -{ - struct sock *sock, *acceptsock; - - sock=(struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops ); - if ( !sock ) - return; - - acceptsock = (struct sock *)get_handle_obj( current->process, req->deferred, 0, &sock_ops ); - if ( !acceptsock ) - { - release_object( sock ); - return; - } - sock->deferred = acceptsock; - release_object( sock ); -} - DECL_HANDLER(get_socket_info) { struct sock *sock; -- 2.30.2