Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5819c52f
Commit
5819c52f
authored
Jul 27, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jul 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Move the getsockopt(IP_UNICAST_IF) implementation to ntdll.
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9715bd25
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
socket.c
dlls/ntdll/unix/socket.c
+9
-0
socket.c
dlls/ws2_32/socket.c
+1
-12
afd.h
include/wine/afd.h
+1
-0
No files found.
dlls/ntdll/unix/socket.c
View file @
5819c52f
...
@@ -88,6 +88,10 @@
...
@@ -88,6 +88,10 @@
#define TCP_KEEPIDLE TCP_KEEPALIVE
#define TCP_KEEPIDLE TCP_KEEPALIVE
#endif
#endif
#if defined(linux) && !defined(IP_UNICAST_IF)
#define IP_UNICAST_IF 50
#endif
WINE_DEFAULT_DEBUG_CHANNEL
(
winsock
);
WINE_DEFAULT_DEBUG_CHANNEL
(
winsock
);
#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2)
#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2)
...
@@ -1790,6 +1794,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
...
@@ -1790,6 +1794,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case
IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE
:
case
IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE
:
return
do_setsockopt
(
handle
,
io
,
IPPROTO_IP
,
IP_UNBLOCK_SOURCE
,
in_buffer
,
in_size
);
return
do_setsockopt
(
handle
,
io
,
IPPROTO_IP
,
IP_UNBLOCK_SOURCE
,
in_buffer
,
in_size
);
#ifdef IP_UNICAST_IF
case
IOCTL_AFD_WINE_GET_IP_UNICAST_IF
:
return
do_getsockopt
(
handle
,
io
,
IPPROTO_IP
,
IP_UNICAST_IF
,
out_buffer
,
out_size
);
#endif
default:
default:
{
{
if
((
code
>>
16
)
==
FILE_DEVICE_NETWORK
)
if
((
code
>>
16
)
==
FILE_DEVICE_NETWORK
)
...
...
dlls/ws2_32/socket.c
View file @
5819c52f
...
@@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
...
@@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
case
WS_IP_TTL
:
case
WS_IP_TTL
:
return
server_getsockopt
(
s
,
IOCTL_AFD_WINE_GET_IP_TTL
,
optval
,
optlen
);
return
server_getsockopt
(
s
,
IOCTL_AFD_WINE_GET_IP_TTL
,
optval
,
optlen
);
#ifdef IP_UNICAST_IF
case
WS_IP_UNICAST_IF
:
case
WS_IP_UNICAST_IF
:
#endif
return
server_getsockopt
(
s
,
IOCTL_AFD_WINE_GET_IP_UNICAST_IF
,
optval
,
optlen
);
if
(
(
fd
=
get_sock_fd
(
s
,
0
,
NULL
))
==
-
1
)
return
SOCKET_ERROR
;
convert_sockopt
(
&
level
,
&
optname
);
if
(
getsockopt
(
fd
,
level
,
optname
,
optval
,
(
socklen_t
*
)
optlen
)
!=
0
)
{
SetLastError
(
wsaErrno
());
ret
=
SOCKET_ERROR
;
}
release_sock_fd
(
s
,
fd
);
return
ret
;
default:
default:
FIXME
(
"unrecognized IP option %u
\n
"
,
optname
);
FIXME
(
"unrecognized IP option %u
\n
"
,
optname
);
...
...
include/wine/afd.h
View file @
5819c52f
...
@@ -205,6 +205,7 @@ struct afd_get_events_params
...
@@ -205,6 +205,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260)
#define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260)
#define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261)
#define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261)
#define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262)
#define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262)
#define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263)
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