system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Retry send on ECONNREFUSED in try_send().

Browse source
This commit is contained in:
Paul Gofman 2023-04-20 19:32:18 -06:00 committed by Alexandre Julliard
parent 0e622f64e0
commit afaf678615
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/ntdll/unix/socket.c
View file

@ -984,6 +984,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async )
{
union unix_sockaddr unix_addr;
struct msghdr hdr;
int attempt = 0;
ssize_t ret;
memset( &hdr, 0, sizeof(hdr) );
@ -1028,6 +1029,17 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async )
else if (errno != EINTR)
{
if (errno != EWOULDBLOCK) WARN( "sendmsg: %s\n", strerror( errno ) );
/* ECONNREFUSED may be returned if this is connected datagram socket and the system received
* ICMP "destination port unreachable" message from the peer. That is ignored
* on Windows. The first sendmsg() will clear the error in this case and the next
* call should succeed. */
if (!attempt && errno == ECONNREFUSED)
{
++attempt;
continue;
}
return sock_errno_to_status( errno );
}
}

25
dlls/ws2_32/tests/sock.c
View file

@ -2962,7 +2962,9 @@ static void test_UDP(void)
/* peer 0 receives data from all other peers */
struct sock_info peer[NUM_UDP_PEERS];
char buf[16];
int ss, i, n_recv, n_sent;
int ss, i, n_recv, n_sent, ret;
struct sockaddr_in addr;
int sock;
memset (buf,0,sizeof(buf));
for ( i = NUM_UDP_PEERS - 1; i >= 0; i-- ) {
@ -3000,6 +3002,27 @@ static void test_UDP(void)
ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv );
ok ( memcmp ( &peer[0].peer.sin_port, buf, sizeof(peer[0].addr.sin_port) ) == 0, "UDP: port numbers do not match\n" );
}
sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP);
ok( sock != INVALID_SOCKET, "got error %u.\n", WSAGetLastError() );
memset( &addr, 0, sizeof(addr) );
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = inet_addr("127.0.0.1");
addr.sin_port = htons(255);
ret = connect( sock, (struct sockaddr *)&addr, sizeof(addr) );
ok( !ret, "got error %u.\n", WSAGetLastError() );
/* Send to UDP socket succeeds even if the packets are not received and the network is replying with
* "destination port unreachable" ICMP messages. */
for (i = 0; i < 10; ++i)
{
ret = send( sock, buf, sizeof(buf), 0 );
ok( ret == sizeof(buf), "got %d, error %u.\n", ret, WSAGetLastError() );
}
closesocket(sock);
}
static void test_WSASocket(void)