[PATCH v2 5/7] server: Introduce IOCTL_AFD_WINE_GET_SO_SNDBUF.

[Hans Leidekker]

On Tue, 2021-06-29 at 11:43 -0500, Zebediah Figura wrote:
> diff --git a/include/wine/afd.h b/include/wine/afd.h
> index ddf780500b7..f2a5abf726d 100644
> --- a/include/wine/afd.h
> +++ b/include/wine/afd.h
> @@ -176,6 +176,7 @@ struct afd_get_events_params
>  #define IOCTL_AFD_WINE_GET_SO_REUSEADDR     CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS)
>  #define IOCTL_AFD_WINE_SET_SO_REUSEADDR     CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS)
>  #define IOCTL_AFD_WINE_SET_SO_SNDBUF        CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS)
> +#define IOCTL_AFD_WINE_GET_SO_SNDBUF        CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS)
>  
> 
>  struct afd_create_params
>  {
> diff --git a/server/sock.c b/server/sock.c
> index bcbf3d245be..79e9c7e8c8e 100644
> --- a/server/sock.c
> +++ b/server/sock.c
> @@ -208,6 +208,7 @@ struct sock
>      union win_sockaddr  addr;        /* socket name */
>      int                 addr_len;    /* socket name length */
>      unsigned int        rcvbuf;      /* advisory recv buffer size */
> +    unsigned int        sndbuf;      /* advisory send buffer size */
>      unsigned int        rcvtimeo;    /* receive timeout in ms */
>      unsigned int        rd_shutdown : 1; /* is the read end shut down? */
>      unsigned int        wr_shutdown : 1; /* is the write end shut down? */
> @@ -1389,6 +1390,7 @@ static struct sock *create_socket(void)
>      sock->nonblocking = 0;
>      sock->bound = 0;
>      sock->rcvbuf = 0;
> +    sock->sndbuf = 0;
>      sock->rcvtimeo = 0;
>      init_async_queue( &sock->read_q );
>      init_async_queue( &sock->write_q );
> @@ -1552,6 +1554,10 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u
>      if (!getsockopt( sockfd, SOL_SOCKET, SO_RCVBUF, &value, &len ))
>          sock->rcvbuf = value;
>  
> 
> +    len = sizeof(value);
> +    if (!getsockopt( sockfd, SOL_SOCKET, SO_SNDBUF, &value, &len ))
> +        sock->sndbuf = value;
> +
>      sock->state  = (type == WS_SOCK_STREAM ? SOCK_UNCONNECTED : SOCK_CONNECTIONLESS);
>      sock->flags  = flags;
>      sock->proto  = protocol;
> @@ -2650,6 +2656,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
>          return 0;
>      }
>  
> 
> +    case IOCTL_AFD_WINE_GET_SO_SNDBUF:
> +    {
> +        int sndbuf = sock->sndbuf;
> +
> +        if (get_reply_max_size() < sizeof(sndbuf))
> +        {
> +            set_error( STATUS_BUFFER_TOO_SMALL );
> +            return 0;
> +        }
> +
> +        set_reply_data( &sndbuf, sizeof(sndbuf) );
> +        return 1;
> +    }
> +
>      case IOCTL_AFD_WINE_SET_SO_SNDBUF:
>      {
>          DWORD sndbuf;
> @@ -2665,11 +2685,14 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
>          if (!sndbuf)
>          {
>              /* setsockopt fails if a zero value is passed */
> +            sock->sndbuf = sndbuf;
>              return 0;
>          }
>  #endif
>  
> 
> -        if (setsockopt( unix_fd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, sizeof(sndbuf) ) < 0)
> +        if (!setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&sndbuf, sizeof(sndbuf) ))
> +            sock->sndbuf = sndbuf;
> +        else
>              set_error( sock_get_ntstatus( errno ) );
>          return 0;
>      }

The typo is back ;-)