From: Paul Gofman <pgofman@codeweavers.com> --- dlls/nsiproxy.sys/device.c | 13 +++++++------ dlls/nsiproxy.sys/icmp_echo.c | 20 ++++++++++---------- dlls/nsiproxy.sys/nsi.c | 2 +- dlls/nsiproxy.sys/nsiproxy_private.h | 2 +- dlls/nsiproxy.sys/unix_private.h | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 4595bf8020c..72b7b380290 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -63,7 +63,7 @@ enum unix_calls { icmp_cancel_listen, icmp_close, - icmp_listen, + icmp_get_reply, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -225,13 +225,13 @@ static int icmp_echo_reply_struct_len( ULONG family, ULONG bits ) return 0; } -static DWORD WINAPI listen_thread_proc( void *arg ) +static DWORD WINAPI icmp_wait_reply( void *arg ) { IRP *irp = arg; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; struct icmp_close_params close_params; - struct icmp_listen_params params; + struct icmp_get_reply_params params; NTSTATUS status; TRACE( "\n" ); @@ -243,8 +243,8 @@ static DWORD WINAPI listen_thread_proc( void *arg ) params.reply = irp->AssociatedIrp.SystemBuffer; params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; - status = nsiproxy_call( icmp_listen, ¶ms ); - TRACE( "icmp_listen rets %08lx\n", status ); + status = nsiproxy_call( icmp_get_reply, ¶ms ); + TRACE( "icmp_get_reply rets %08lx\n", status ); EnterCriticalSection( &icmp_echo_completion_cs ); close_params.handle = irp_set_icmp_handle( irp, 0 ); @@ -263,6 +263,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static NTSTATUS handle_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + struct icmp_close_params close_params; struct icmp_send_echo_params params; icmp_handle handle; NTSTATUS status; @@ -297,7 +298,7 @@ static NTSTATUS handle_send_echo( IRP *irp ) } IoMarkIrpPending( irp ); irp_set_icmp_handle( irp, handle ); - RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); + RtlQueueWorkItem( icmp_wait_reply, irp, WT_EXECUTELONGFUNCTION ); return STATUS_PENDING; } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 8d7502b2d85..55eae0779c2 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -289,14 +289,14 @@ static void ipv4_linux_ping_set_socket_opts( struct icmp_socket *s ) } #endif -static int ipv4_reply_buffer_len( struct icmp_listen_params *params ) +static int ipv4_reply_buffer_len( struct icmp_get_reply_params *params ) { int struct_len = (params->bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); return sizeof(struct ip_hdr) + sizeof(struct icmp_hdr) + params->reply_len - struct_len; } #ifdef __linux__ -static int ipv4_linux_ping_reply_buffer_len( struct icmp_listen_params *params ) +static int ipv4_linux_ping_reply_buffer_len( struct icmp_get_reply_params *params ) { int struct_len = (params->bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); return sizeof(struct icmp_hdr) + params->reply_len - struct_len; @@ -434,7 +434,7 @@ static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, i return 0; } -static void ipv4_fill_reply( struct icmp_listen_params *params, struct icmp_reply_ctx *ctx) +static void ipv4_fill_reply( struct icmp_get_reply_params *params, struct icmp_reply_ctx *ctx) { void *options_data; ULONG data_offset; @@ -489,10 +489,10 @@ struct family_ops unsigned short (*chksum)( struct icmp_data *icmp_data, BYTE *data, unsigned int count ); int (*set_reply_ip_status)( IP_STATUS ip_status, unsigned int bits, void *out ); void (*set_socket_opts)( struct icmp_socket *s ); - int (*reply_buffer_len)( struct icmp_listen_params *params ); + int (*reply_buffer_len)( struct icmp_get_reply_params *params ); BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, int *ip_hdr_len, struct icmp_reply_ctx *ctx ); int (*parse_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_len, struct icmp_reply_ctx *ctx ); - void (*fill_reply)( struct icmp_listen_params *params, struct icmp_reply_ctx *ctx ); + void (*fill_reply)( struct icmp_get_reply_params *params, struct icmp_reply_ctx *ctx ); }; static const struct family_ops ipv4 = @@ -606,7 +606,7 @@ static void ipv6_set_socket_opts( struct icmp_socket *s ) #endif } -static int ipv6_reply_buffer_len( struct icmp_listen_params *params ) +static int ipv6_reply_buffer_len( struct icmp_get_reply_params *params ) { return sizeof(struct icmp_hdr) + params->reply_len - sizeof(ICMPV6_ECHO_REPLY); } @@ -695,7 +695,7 @@ static int ipv6_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, return 0; } -static void ipv6_fill_reply( struct icmp_listen_params *params, struct icmp_reply_ctx *ctx) +static void ipv6_fill_reply( struct icmp_get_reply_params *params, struct icmp_reply_ctx *ctx) { ICMPV6_ECHO_REPLY *reply = params->reply; @@ -928,7 +928,7 @@ static ULONG get_rtt( LARGE_INTEGER start ) return (now.QuadPart - start.QuadPart) / 10000; } -static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *params ) +static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_get_reply_params *params ) { struct sockaddr_storage addr; struct icmp_reply_ctx ctx; @@ -979,9 +979,9 @@ skip: return STATUS_RETRY; } -NTSTATUS icmp_listen( void *args ) +NTSTATUS icmp_get_reply( void *args ) { - struct icmp_listen_params *params = args; + struct icmp_get_reply_params *params = args; struct icmp_data *data; struct pollfd fds[2]; NTSTATUS status; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 7fe1e1c9274..41aace2c2c4 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -345,7 +345,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { icmp_cancel_listen, icmp_close, - icmp_listen, + icmp_get_reply, icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index ab40fa2057a..a15d594bbdd 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -30,7 +30,7 @@ struct icmp_close_params icmp_handle handle; }; -struct icmp_listen_params +struct icmp_get_reply_params { icmp_handle handle; void *reply; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 5487de5111d..8a332f2ba07 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -179,5 +179,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) NTSTATUS icmp_cancel_listen( void *args ); NTSTATUS icmp_close( void *args ); -NTSTATUS icmp_listen( void *args ); +NTSTATUS icmp_get_reply( void *args ); NTSTATUS icmp_send_echo( void *args ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10954