Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a7f39e3f
Commit
a7f39e3f
authored
Jun 24, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Move the setsockopt(SO_KEEPALIVE) implementation to ntdll.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8aaef4ca
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
socket.c
dlls/ntdll/unix/socket.c
+3
-0
socket.c
dlls/ws2_32/socket.c
+3
-1
afd.h
include/wine/afd.h
+1
-0
No files found.
dlls/ntdll/unix/socket.c
View file @
a7f39e3f
...
@@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
...
@@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case
IOCTL_AFD_WINE_GET_SO_KEEPALIVE
:
case
IOCTL_AFD_WINE_GET_SO_KEEPALIVE
:
return
do_getsockopt
(
handle
,
io
,
SOL_SOCKET
,
SO_KEEPALIVE
,
out_buffer
,
out_size
);
return
do_getsockopt
(
handle
,
io
,
SOL_SOCKET
,
SO_KEEPALIVE
,
out_buffer
,
out_size
);
case
IOCTL_AFD_WINE_SET_SO_KEEPALIVE
:
return
do_setsockopt
(
handle
,
io
,
SOL_SOCKET
,
SO_KEEPALIVE
,
in_buffer
,
in_size
);
default:
default:
{
{
if
((
code
>>
16
)
==
FILE_DEVICE_NETWORK
)
if
((
code
>>
16
)
==
FILE_DEVICE_NETWORK
)
...
...
dlls/ws2_32/socket.c
View file @
a7f39e3f
...
@@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
...
@@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
SetLastError
(
WSAENOPROTOOPT
);
SetLastError
(
WSAENOPROTOOPT
);
return
-
1
;
return
-
1
;
case
WS_SO_KEEPALIVE
:
return
server_setsockopt
(
s
,
IOCTL_AFD_WINE_SET_SO_KEEPALIVE
,
optval
,
optlen
);
/* Some options need some conversion before they can be sent to
/* Some options need some conversion before they can be sent to
* setsockopt. The conversions are done here, then they will fall through
* setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to
* to the general case. Special options that are not passed to
...
@@ -3610,7 +3613,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
...
@@ -3610,7 +3613,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
/* The options listed here don't need any special handling. Thanks to
/* The options listed here don't need any special handling. Thanks to
* the conversion happening above, options from there will fall through
* the conversion happening above, options from there will fall through
* to this, too.*/
* to this, too.*/
case
WS_SO_KEEPALIVE
:
case
WS_SO_OOBINLINE
:
case
WS_SO_OOBINLINE
:
/* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.
/* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.
* however, using it the BSD way fixes bug 8513 and seems to be what
* however, using it the BSD way fixes bug 8513 and seems to be what
...
...
include/wine/afd.h
View file @
a7f39e3f
...
@@ -164,6 +164,7 @@ struct afd_get_events_params
...
@@ -164,6 +164,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct
afd_create_params
struct
afd_create_params
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment