Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_RCVBUF.
Alexandre Julliard
julliard at winehq.org
Mon Jun 28 16:49:36 CDT 2021
Module: wine
Branch: master
Commit: 1a2b1d75a8543d742b69f0481a5ea14bcd2124e5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2b1d75a8543d742b69f0481a5ea14bcd2124e5
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Jun 25 20:21:06 2021 -0500
server: Introduce IOCTL_AFD_WINE_GET_SO_RCVBUF.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/wine/afd.h | 1 +
server/sock.c | 27 +++++++++++++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 99df0b8d65e..0692394459e 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -170,6 +170,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params
{
diff --git a/server/sock.c b/server/sock.c
index aaac693d098..8bad31efdd1 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -207,6 +207,7 @@ struct sock
struct connect_req *connect_req; /* pending connection request */
union win_sockaddr addr; /* socket name */
int addr_len; /* socket name length */
+ unsigned int rcvbuf; /* advisory recv buffer size */
unsigned int rd_shutdown : 1; /* is the read end shut down? */
unsigned int wr_shutdown : 1; /* is the write end shut down? */
unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */
@@ -1386,6 +1387,7 @@ static struct sock *create_socket(void)
sock->wr_shutdown_pending = 0;
sock->nonblocking = 0;
sock->bound = 0;
+ sock->rcvbuf = 0;
init_async_queue( &sock->read_q );
init_async_queue( &sock->write_q );
init_async_queue( &sock->ifchange_q );
@@ -1477,7 +1479,8 @@ static void set_dont_fragment( int fd, int level, int value )
static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags )
{
unsigned int options = 0;
- int sockfd, unix_type, unix_family, unix_protocol;
+ int sockfd, unix_type, unix_family, unix_protocol, value;
+ socklen_t len;
unix_family = get_unix_family( family );
unix_type = get_unix_type( type );
@@ -1543,6 +1546,10 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u
}
#endif
+ len = sizeof(value);
+ if (!getsockopt( sockfd, SOL_SOCKET, SO_RCVBUF, &value, &len ))
+ sock->rcvbuf = value;
+
sock->state = (type == WS_SOCK_STREAM ? SOCK_UNCONNECTED : SOCK_CONNECTIONLESS);
sock->flags = flags;
sock->proto = protocol;
@@ -2580,6 +2587,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
return 1;
}
+ case IOCTL_AFD_WINE_GET_SO_RCVBUF:
+ {
+ int rcvbuf = sock->rcvbuf;
+
+ if (get_reply_max_size() < sizeof(rcvbuf))
+ {
+ set_error( STATUS_BUFFER_TOO_SMALL );
+ return 0;
+ }
+
+ set_reply_data( &rcvbuf, sizeof(rcvbuf) );
+ return 1;
+ }
+
case IOCTL_AFD_WINE_SET_SO_RCVBUF:
{
DWORD rcvbuf;
@@ -2591,7 +2612,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
}
rcvbuf = *(DWORD *)get_req_data();
- if (setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) ) < 0)
+ if (!setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) ))
+ sock->rcvbuf = rcvbuf;
+ else
set_error( sock_get_ntstatus( errno ) );
return 0;
}
More information about the wine-cvs
mailing list