ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Ensure datagram sockets are bound in send_socket. 

If the type of the socket is SOCK_DGRAM, it shall always be bound to an
address if we ever attempt to send datagrams through the socket, whether
the attempt succeeds or not.

Signed-off-by: Jinoh Kang <jinoh.kang.kr@gmail.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jinoh Kang 2022-03-24 02:25:20 +09:00 committed by Alexandre Julliard
parent 65d12984f2
commit 0ac256eacc
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
server/sock.c
View File

@ -471,6 +471,32 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl
} }
} }
static socklen_t get_unix_sockaddr_any( union unix_sockaddr *uaddr, int ws_family )
{
memset( uaddr, 0, sizeof(*uaddr) );
switch (ws_family)
{
case WS_AF_INET:
uaddr->in.sin_family = AF_INET;
return sizeof(uaddr->in);
case WS_AF_INET6:
uaddr->in6.sin6_family = AF_INET6;
return sizeof(uaddr->in6);
#ifdef HAS_IPX
case WS_AF_IPX:
uaddr->ipx.sipx_family = AF_IPX;
return sizeof(uaddr->ipx);
#endif
#ifdef HAS_IRDA
case WS_AF_IRDA:
uaddr->irda.sir_family = AF_IRDA;
return sizeof(uaddr->irda);
#endif
default:
return 0;
}
}
/* some events are generated at the same time but must be sent in a particular /* some events are generated at the same time but must be sent in a particular
* order (e.g. CONNECT must be sent before READ) */ * order (e.g. CONNECT must be sent before READ) */
static const enum afd_poll_bit event_bitorder[] = static const enum afd_poll_bit event_bitorder[] =
@ -3490,16 +3516,25 @@ DECL_HANDLER(send_socket)
if (!sock) return; if (!sock) return;
fd = sock->fd; fd = sock->fd;
if (sock->type == WS_SOCK_DGRAM) if (sock->type == WS_SOCK_DGRAM && !sock->bound)
{ {
/* sendto() and sendmsg() implicitly binds a socket */
union unix_sockaddr unix_addr; union unix_sockaddr unix_addr;
socklen_t unix_len = sizeof(unix_addr); socklen_t unix_len;
int bind_errno = 0;
int unix_fd = get_unix_fd( fd );
if (!sock->bound && !getsockname( get_unix_fd( fd ), &unix_addr.addr, &unix_len )) unix_len = get_unix_sockaddr_any( &unix_addr, sock->family );
if (bind( unix_fd, &unix_addr.addr, unix_len ) < 0)
bind_errno = errno;
if (getsockname( unix_fd, &unix_addr.addr, &unix_len ) >= 0)
{
sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) );
sock->bound = 1; sock->bound = 1;
} }
else if (status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY)
status = sock_get_ntstatus( bind_errno ? bind_errno : errno );
}
/* If we had a short write and the socket is nonblocking (and the client is /* If we had a short write and the socket is nonblocking (and the client is
* not trying to force the operation to be asynchronous), return success. * not trying to force the operation to be asynchronous), return success.