system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 10:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2017-06-06 09:56:01 +02:00 committed by Alexandre Julliard
parent b458799863
commit 1fb0e25cfb
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/webservices/channel.c
View file

@ -637,7 +637,7 @@ static HRESULT connect_channel_tcp( struct channel *channel )
winsock_init();
hr = resolve_hostname( host, port, addr, &addr_len );
hr = resolve_hostname( host, port, addr, &addr_len, 0 );
heap_free( host );
if (hr != S_OK) return hr;
@ -675,7 +675,7 @@ static HRESULT connect_channel_udp( struct channel *channel )
winsock_init();
hr = resolve_hostname( host, port, addr, &addr_len );
hr = resolve_hostname( host, port, addr, &addr_len, 0 );
heap_free( host );
if (hr != S_OK) return hr;

14
dlls/webservices/listener.c
View file

@ -256,16 +256,20 @@ void WINAPI WsFreeListener( WS_LISTENER *handle )
free_listener( listener );
}
HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len )
HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len, int flags )
{
static const WCHAR fmtW[] = {'%','u',0};
WCHAR service[6];
ADDRINFOW *res, *info;
ADDRINFOW hints, *res, *info;
HRESULT hr = WS_E_ADDRESS_NOT_AVAILABLE;
memset( &hints, 0, sizeof(hints) );
hints.ai_flags = flags;
hints.ai_family = AF_INET;
*addr_len = 0;
sprintfW( service, fmtW, port );
if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() );
if (GetAddrInfoW( host, service, &hints, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() );
info = res;
while (info && info->ai_family != AF_INET) info = info->ai_next;
@ -330,7 +334,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur
winsock_init();
hr = resolve_hostname( host, port, addr, &addr_len );
hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE );
heap_free( host );
if (hr != S_OK) return hr;
@ -381,7 +385,7 @@ static HRESULT open_listener_udp( struct listener *listener, const WS_STRING *ur
winsock_init();
hr = resolve_hostname( host, port, addr, &addr_len );
hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE );
heap_free( host );
if (hr != S_OK) return hr;

2
dlls/webservices/sock.h
View file

@ -19,6 +19,6 @@
#include "ws2tcpip.h"
void winsock_init(void) DECLSPEC_HIDDEN;
HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN;
HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int *, int ) DECLSPEC_HIDDEN;
HRESULT channel_accept_tcp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN;
HRESULT channel_accept_udp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN;