fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-17 16:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix IPv6 setup (the default on Vista)

Browse source 
Ensure that the right struct is passed.

Cherry-picked from commit 172d60d100d04e301e51ff475ada02007f1709dc in
the dbus4win repository by tml@iki.fi.
This commit is contained in:
Frank Osterfeld 2009-10-21 20:39:51 +03:00 • committed by Ralf Habacker
parent c8f73b36a5
commit 9d27253f36
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dbus/dbus-sysdeps-win.c
View file

@ -1516,6 +1516,16 @@ _dbus_listen_tcp_socket (const char *host,
struct addrinfo hints;
struct addrinfo *ai, *tmp;
// On Vista, sockaddr_gen must be a sockaddr_in6, and not a sockaddr_in6_old
//That's required for family == IPv6(which is the default on Vista if family is not given)
//So we use our own union instead of sockaddr_gen:
typedef union {
struct sockaddr Address;
struct sockaddr_in AddressIn;
struct sockaddr_in6 AddressIn6;
} mysockaddr_gen;
*fds_p = NULL;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
@ -1608,7 +1618,7 @@ _dbus_listen_tcp_socket (const char *host,
to use the same port */
if (!port || !strcmp(port, "0"))
{
sockaddr_gen addr;
mysockaddr_gen addr;
socklen_t addrlen = sizeof(addr);
char portbuf[10];