Zebediah Figura : server: Remove the no longer used accept_into_socket request.
Alexandre Julliard
julliard at winehq.org
Fri Oct 2 14:54:09 CDT 2020
Module: wine
Branch: master
Commit: e3ea5278357698e75b6cd51627c30e84e16845ca
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ea5278357698e75b6cd51627c30e84e16845ca
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Oct 1 23:14:02 2020 -0500
server: Remove the no longer used accept_into_socket request.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/wine/server_protocol.h | 19 +------------------
server/protocol.def | 7 -------
server/request.h | 5 -----
server/sock.c | 23 -----------------------
server/trace.c | 9 ---------
5 files changed, 1 insertion(+), 62 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 8c7ab39146..751ca59ad6 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -1695,20 +1695,6 @@ struct unlock_file_reply
-struct accept_into_socket_request
-{
- struct request_header __header;
- obj_handle_t lhandle;
- obj_handle_t ahandle;
- char __pad_20[4];
-};
-struct accept_into_socket_reply
-{
- struct reply_header __header;
-};
-
-
-
struct set_socket_event_request
{
struct request_header __header;
@@ -5481,7 +5467,6 @@ enum request
REQ_get_volume_info,
REQ_lock_file,
REQ_unlock_file,
- REQ_accept_into_socket,
REQ_set_socket_event,
REQ_get_socket_event,
REQ_get_socket_info,
@@ -5768,7 +5753,6 @@ union generic_request
struct get_volume_info_request get_volume_info_request;
struct lock_file_request lock_file_request;
struct unlock_file_request unlock_file_request;
- struct accept_into_socket_request accept_into_socket_request;
struct set_socket_event_request set_socket_event_request;
struct get_socket_event_request get_socket_event_request;
struct get_socket_info_request get_socket_info_request;
@@ -6053,7 +6037,6 @@ union generic_reply
struct get_volume_info_reply get_volume_info_reply;
struct lock_file_reply lock_file_reply;
struct unlock_file_reply unlock_file_reply;
- struct accept_into_socket_reply accept_into_socket_reply;
struct set_socket_event_reply set_socket_event_reply;
struct get_socket_event_reply get_socket_event_reply;
struct get_socket_info_reply get_socket_info_reply;
@@ -6283,7 +6266,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 648
+#define SERVER_PROTOCOL_VERSION 649
/* ### protocol_version end ### */
diff --git a/server/protocol.def b/server/protocol.def
index 6534092f2c..16c0b93674 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1383,13 +1383,6 @@ enum server_fd_type
@END
-/* Accept into an initialized socket */
- at REQ(accept_into_socket)
- obj_handle_t lhandle; /* handle to the listening socket */
- obj_handle_t ahandle; /* handle to the accepting socket */
- at END
-
-
/* Set socket event parameters */
@REQ(set_socket_event)
obj_handle_t handle; /* handle to the socket */
diff --git a/server/request.h b/server/request.h
index c02b616d75..fc60aa1e8c 100644
--- a/server/request.h
+++ b/server/request.h
@@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info);
DECL_HANDLER(get_volume_info);
DECL_HANDLER(lock_file);
DECL_HANDLER(unlock_file);
-DECL_HANDLER(accept_into_socket);
DECL_HANDLER(set_socket_event);
DECL_HANDLER(get_socket_event);
DECL_HANDLER(get_socket_info);
@@ -459,7 +458,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
(req_handler)req_get_volume_info,
(req_handler)req_lock_file,
(req_handler)req_unlock_file,
- (req_handler)req_accept_into_socket,
(req_handler)req_set_socket_event,
(req_handler)req_get_socket_event,
(req_handler)req_get_socket_info,
@@ -1052,9 +1050,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 );
C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 );
C_ASSERT( sizeof(struct unlock_file_request) == 32 );
-C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, lhandle) == 12 );
-C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, ahandle) == 16 );
-C_ASSERT( sizeof(struct accept_into_socket_request) == 24 );
C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 );
diff --git a/server/sock.c b/server/sock.c
index 360bf756f9..4f97fe7208 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1446,29 +1446,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
return create_named_object( root, &socket_device_ops, name, attr, sd );
}
-/* accept a socket into an initialized socket */
-DECL_HANDLER(accept_into_socket)
-{
- struct sock *sock, *acceptsock;
- const int all_attributes = FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES|FILE_READ_DATA;
-
- if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle,
- all_attributes, &sock_ops)))
- return;
-
- if (!(acceptsock = (struct sock *)get_handle_obj( current->process, req->ahandle,
- all_attributes, &sock_ops)))
- {
- release_object( sock );
- return;
- }
-
- if (accept_into_socket( sock, acceptsock ))
- acceptsock->wparam = req->ahandle; /* wparam for message is the socket handle */
- release_object( acceptsock );
- release_object( sock );
-}
-
/* set socket event parameters */
DECL_HANDLER(set_socket_event)
{
diff --git a/server/trace.c b/server/trace.c
index 5f8981cddf..17dd415b95 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1948,12 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req )
dump_uint64( ", count=", &req->count );
}
-static void dump_accept_into_socket_request( const struct accept_into_socket_request *req )
-{
- fprintf( stderr, " lhandle=%04x", req->lhandle );
- fprintf( stderr, ", ahandle=%04x", req->ahandle );
-}
-
static void dump_set_socket_event_request( const struct set_socket_event_request *req )
{
fprintf( stderr, " handle=%04x", req->handle );
@@ -4467,7 +4461,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_get_volume_info_request,
(dump_func)dump_lock_file_request,
(dump_func)dump_unlock_file_request,
- (dump_func)dump_accept_into_socket_request,
(dump_func)dump_set_socket_event_request,
(dump_func)dump_get_socket_event_request,
(dump_func)dump_get_socket_info_request,
@@ -4751,7 +4744,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_lock_file_reply,
NULL,
NULL,
- NULL,
(dump_func)dump_get_socket_event_reply,
(dump_func)dump_get_socket_info_reply,
NULL,
@@ -5033,7 +5025,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
"get_volume_info",
"lock_file",
"unlock_file",
- "accept_into_socket",
"set_socket_event",
"get_socket_event",
"get_socket_info",
More information about the wine-cvs
mailing list