frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: drop extra ifdefs for AF_INET6 

Since IPv6 is now only defined if IPv6 is really supported, we don't
need to ifdef on AF_INET6 anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1539>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-18 15:24:07 +02:00 committed by Marge Bot
parent bc55a98d62
commit f8057261fe
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
os/access.c
View File

@ -455,13 +455,13 @@ DefineSelf(int fd)
union { union {
struct sockaddr sa; struct sockaddr sa;
struct sockaddr_in in; struct sockaddr_in in;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
#endif #endif
} saddr; } saddr;
struct sockaddr_in *inetaddr; struct sockaddr_in *inetaddr;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct sockaddr_in6 *inet6addr; struct sockaddr_in6 *inet6addr;
#endif #endif
struct sockaddr_in broad_addr; struct sockaddr_in broad_addr;
@ -486,7 +486,7 @@ DefineSelf(int fd)
memcpy(&(inetaddr->sin_addr), hp->h_addr, hp->h_length); memcpy(&(inetaddr->sin_addr), hp->h_addr, hp->h_length);
len = sizeof(saddr.sa); len = sizeof(saddr.sa);
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case AF_INET6: case AF_INET6:
inet6addr = (struct sockaddr_in6 *) (&(saddr.sa)); inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
memcpy(&(inet6addr->sin6_addr), hp->h_addr, hp->h_length); memcpy(&(inet6addr->sin6_addr), hp->h_addr, hp->h_length);
@ -530,7 +530,7 @@ DefineSelf(int fd)
XdmcpRegisterBroadcastAddress((struct sockaddr_in *) XdmcpRegisterBroadcastAddress((struct sockaddr_in *)
&broad_addr); &broad_addr);
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (family == FamilyInternet6 && else if (family == FamilyInternet6 &&
!(IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))) { !(IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))) {
XdmcpRegisterConnection(family, (char *) addr, len); XdmcpRegisterConnection(family, (char *) addr, len);
@ -578,7 +578,7 @@ DefineSelf(int fd)
#define ifraddr_size(a) (sizeof (a)) #define ifraddr_size(a) (sizeof (a))
#endif #endif
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static void static void
in6_fillscopeid(struct sockaddr_in6 *sin6) in6_fillscopeid(struct sockaddr_in6 *sin6)
{ {
@ -671,7 +671,7 @@ DefineSelf(int fd)
&len, (void **) &addr); &len, (void **) &addr);
if (family == -1 || family == FamilyLocal) if (family == -1 || family == FamilyLocal)
continue; continue;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (family == FamilyInternet6) if (family == FamilyInternet6)
in6_fillscopeid((struct sockaddr_in6 *) &IFR_IFR_ADDR); in6_fillscopeid((struct sockaddr_in6 *) &IFR_IFR_ADDR);
#endif #endif
@ -699,7 +699,7 @@ DefineSelf(int fd)
* If this isn't an Internet Address, don't register it. * If this isn't an Internet Address, don't register it.
*/ */
if (family != FamilyInternet if (family != FamilyInternet
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
&& family != FamilyInternet6 && family != FamilyInternet6
#endif #endif
) )
@ -712,7 +712,7 @@ DefineSelf(int fd)
if (family == FamilyInternet && if (family == FamilyInternet &&
addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1) addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1)
continue; continue;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (family == FamilyInternet6 && else if (family == FamilyInternet6 &&
IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr)) IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
continue; continue;
@ -729,7 +729,7 @@ DefineSelf(int fd)
XdmcpRegisterConnection(family, (char *) addr, len); XdmcpRegisterConnection(family, (char *) addr, len);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
/* IPv6 doesn't support broadcasting, so we drop out here */ /* IPv6 doesn't support broadcasting, so we drop out here */
if (family == FamilyInternet6) if (family == FamilyInternet6)
continue; continue;
@ -796,7 +796,7 @@ DefineSelf(int fd)
(void **) &addr); (void **) &addr);
if (family == -1 || family == FamilyLocal) if (family == -1 || family == FamilyLocal)
continue; continue;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (family == FamilyInternet6) if (family == FamilyInternet6)
in6_fillscopeid((struct sockaddr_in6 *) ifr->ifa_addr); in6_fillscopeid((struct sockaddr_in6 *) ifr->ifa_addr);
#endif #endif
@ -820,7 +820,7 @@ DefineSelf(int fd)
* If this isn't an Internet Address, don't register it. * If this isn't an Internet Address, don't register it.
*/ */
if (family != FamilyInternet if (family != FamilyInternet
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
&& family != FamilyInternet6 && family != FamilyInternet6
#endif #endif
) )
@ -845,13 +845,13 @@ DefineSelf(int fd)
if (len == 4 && if (len == 4 &&
addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] == 0) addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] == 0)
continue; continue;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (family == FamilyInternet6 && else if (family == FamilyInternet6 &&
IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr)) IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
continue; continue;
#endif #endif
XdmcpRegisterConnection(family, (char *) addr, len); XdmcpRegisterConnection(family, (char *) addr, len);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (family == FamilyInternet6) if (family == FamilyInternet6)
/* IPv6 doesn't support broadcasting, so we drop out here */ /* IPv6 doesn't support broadcasting, so we drop out here */
continue; continue;
@ -939,7 +939,7 @@ ResetHosts(const char *display)
char *ptr; char *ptr;
int i, hostlen; int i, hostlen;
#if defined(TCPCONN) && (!defined(IPv6) || !defined(AF_INET6)) #if defined(TCPCONN) && (!defined(IPv6))
union { union {
struct sockaddr sa; struct sockaddr sa;
struct sockaddr_in in; struct sockaddr_in in;
@ -991,7 +991,7 @@ ResetHosts(const char *display)
family = FamilyInternet; family = FamilyInternet;
hostname = ohostname + 5; hostname = ohostname + 5;
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (!strncmp("inet6:", lhostname, 6)) { else if (!strncmp("inet6:", lhostname, 6)) {
family = FamilyInternet6; family = FamilyInternet6;
hostname = ohostname + 6; hostname = ohostname + 6;
@ -1013,7 +1013,7 @@ ResetHosts(const char *display)
else else
#if defined(TCPCONN) #if defined(TCPCONN)
{ {
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if ((family == FamilyInternet) || (family == FamilyInternet6) || if ((family == FamilyInternet) || (family == FamilyInternet6) ||
(family == FamilyWild)) { (family == FamilyWild)) {
struct addrinfo *addresses; struct addrinfo *addresses;
@ -1324,7 +1324,7 @@ AddHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
LocalHostEnabled = TRUE; LocalHostEnabled = TRUE;
break; break;
case FamilyInternet: case FamilyInternet:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case FamilyInternet6: case FamilyInternet6:
#endif #endif
case FamilyDECnet: case FamilyDECnet:
@ -1407,7 +1407,7 @@ RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in p
LocalHostEnabled = FALSE; LocalHostEnabled = FALSE;
break; break;
case FamilyInternet: case FamilyInternet:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case FamilyInternet6: case FamilyInternet6:
#endif #endif
case FamilyDECnet: case FamilyDECnet:
@ -1491,7 +1491,7 @@ CheckAddr(int family, const void *pAddr, unsigned length)
else else
len = -1; len = -1;
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case FamilyInternet6: case FamilyInternet6:
if (length == sizeof(struct in6_addr)) if (length == sizeof(struct in6_addr))
len = length; len = length;
@ -1576,7 +1576,7 @@ ConvertAddr(register struct sockaddr *saddr, int *len, void **addr)
*len = sizeof(struct in_addr); *len = sizeof(struct in_addr);
*addr = (void *) &(((struct sockaddr_in *) saddr)->sin_addr); *addr = (void *) &(((struct sockaddr_in *) saddr)->sin_addr);
return FamilyInternet; return FamilyInternet;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) saddr; struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) saddr;
@ -1806,7 +1806,7 @@ siHostnameAddrMatch(int family, void *addr, int len,
* support for other address families, such as DECnet, could be added if * support for other address families, such as DECnet, could be added if
* desired. * desired.
*/ */
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if ((family == FamilyInternet) || (family == FamilyInternet6)) { if ((family == FamilyInternet) || (family == FamilyInternet6)) {
char hostname[SI_HOSTNAME_MAXLEN]; char hostname[SI_HOSTNAME_MAXLEN];
struct addrinfo *addresses; struct addrinfo *addresses;
@ -1929,7 +1929,7 @@ siHostnameCheckAddr(const char *valueString, int length, void *typePriv)
return len; return len;
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
/*** /***
* "ipv6" server interpreted type * "ipv6" server interpreted type
* *
@ -2139,7 +2139,7 @@ static void
siTypesInitialize(void) siTypesInitialize(void)
{ {
siTypeAdd("hostname", siHostnameAddrMatch, siHostnameCheckAddr, NULL); siTypeAdd("hostname", siHostnameAddrMatch, siHostnameCheckAddr, NULL);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
siTypeAdd("ipv6", siIPv6AddrMatch, siIPv6CheckAddr, NULL); siTypeAdd("ipv6", siIPv6AddrMatch, siIPv6CheckAddr, NULL);
#endif #endif
#if !defined(NO_LOCAL_CLIENT_CRED) #if !defined(NO_LOCAL_CLIENT_CRED)

2
os/connection.c
View File

@ -397,7 +397,7 @@ AuthAudit(ClientPtr client, Bool letin,
snprintf(addr, sizeof(addr), "IP %s", snprintf(addr, sizeof(addr), "IP %s",
inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr)); inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr));
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case AF_INET6:{ case AF_INET6:{
char ipaddr[INET6_ADDRSTRLEN]; char ipaddr[INET6_ADDRSTRLEN];

6
os/utils.c
View File

@ -1075,7 +1075,7 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
char hname[1024], *hnameptr; char hname[1024], *hnameptr;
unsigned int len; unsigned int len;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct addrinfo hints, *ai = NULL; struct addrinfo hints, *ai = NULL;
#else #else
struct hostent *host; struct hostent *host;
@ -1086,7 +1086,7 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
#endif #endif
gethostname(hname, 1024); gethostname(hname, 1024);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
if (getaddrinfo(hname, NULL, &hints, &ai) == 0) { if (getaddrinfo(hname, NULL, &hints, &ai) == 0) {
@ -1116,7 +1116,7 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
p += sizeof(AUTHORIZATION_NAME); p += sizeof(AUTHORIZATION_NAME);
memcpy(p, hnameptr, len); memcpy(p, hnameptr, len);
p += len; p += len;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (ai) { if (ai) {
freeaddrinfo(ai); freeaddrinfo(ai);
} }

62
os/xdmcp.c
View File

@ -72,7 +72,7 @@ static const char *defaultDisplayClass = "MIT-unspecified";
static int xdmcpSocket, sessionSocket; static int xdmcpSocket, sessionSocket;
static xdmcp_states state; static xdmcp_states state;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static int xdmcpSocket6; static int xdmcpSocket6;
static struct sockaddr_storage req_sockaddr; static struct sockaddr_storage req_sockaddr;
#else #else
@ -91,7 +91,7 @@ static char *xdmAuthCookie;
static XdmcpBuffer buffer; static XdmcpBuffer buffer;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static struct addrinfo *mgrAddr; static struct addrinfo *mgrAddr;
static struct addrinfo *mgrAddrFirst; static struct addrinfo *mgrAddrFirst;
@ -130,7 +130,7 @@ static SOCKADDR_TYPE FromAddress;
static SOCKLEN_TYPE ManagerAddressLen, FromAddressLen; static SOCKLEN_TYPE ManagerAddressLen, FromAddressLen;
#endif #endif
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static struct multicastinfo { static struct multicastinfo {
struct multicastinfo *next; struct multicastinfo *next;
struct addrinfo *ai; struct addrinfo *ai;
@ -183,7 +183,7 @@ static void get_fromaddr_by_name(int argc,
char **argv, char **argv,
int i); int i);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static int get_mcast_options(int argc, static int get_mcast_options(int argc,
char **argv, char **argv,
int i); int i);
@ -226,7 +226,7 @@ XdmcpUseMsg(void)
{ {
ErrorF("-query host-name contact named host for XDMCP\n"); ErrorF("-query host-name contact named host for XDMCP\n");
ErrorF("-broadcast broadcast for XDMCP\n"); ErrorF("-broadcast broadcast for XDMCP\n");
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
ErrorF("-multicast [addr [hops]] IPv6 multicast for XDMCP\n"); ErrorF("-multicast [addr [hops]] IPv6 multicast for XDMCP\n");
#endif #endif
ErrorF("-indirect host-name contact named host for indirect XDMCP\n"); ErrorF("-indirect host-name contact named host for indirect XDMCP\n");
@ -265,7 +265,7 @@ XdmcpOptions(int argc, char **argv, int i)
XdmcpDefaultListen(); XdmcpDefaultListen();
return i + 1; return i + 1;
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (strcmp(argv[i], "-multicast") == 0) { if (strcmp(argv[i], "-multicast") == 0) {
i = get_mcast_options(argc, argv, ++i); i = get_mcast_options(argc, argv, ++i);
XDM_INIT_STATE = XDM_MULTICAST; XDM_INIT_STATE = XDM_MULTICAST;
@ -471,7 +471,7 @@ XdmcpRegisterConnection(int type, const char *address, int addrlen)
if (SOCKADDR_FAMILY(FromAddress) == AF_INET) { if (SOCKADDR_FAMILY(FromAddress) == AF_INET) {
fromAddr = &((struct sockaddr_in *) &FromAddress)->sin_addr; fromAddr = &((struct sockaddr_in *) &FromAddress)->sin_addr;
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET6) && else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET6) &&
IN6_IS_ADDR_V4MAPPED(& IN6_IS_ADDR_V4MAPPED(&
((struct sockaddr_in6 *) ((struct sockaddr_in6 *)
@ -482,7 +482,7 @@ XdmcpRegisterConnection(int type, const char *address, int addrlen)
} }
#endif #endif
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (addrlen == sizeof(struct in6_addr)) { else if (addrlen == sizeof(struct in6_addr)) {
if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) { if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) {
fromAddr = &((struct sockaddr_in6 *) &FromAddress)->sin6_addr; fromAddr = &((struct sockaddr_in6 *) &FromAddress)->sin6_addr;
@ -579,7 +579,7 @@ xdmcp_reset(void)
timeOutRtx = 0; timeOutRtx = 0;
if (xdmcpSocket >= 0) if (xdmcpSocket >= 0)
SetNotifyFd(xdmcpSocket, XdmcpSocketNotify, X_NOTIFY_READ, NULL); SetNotifyFd(xdmcpSocket, XdmcpSocketNotify, X_NOTIFY_READ, NULL);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (xdmcpSocket6 >= 0) if (xdmcpSocket6 >= 0)
SetNotifyFd(xdmcpSocket6, XdmcpSocketNotify, X_NOTIFY_READ, NULL); SetNotifyFd(xdmcpSocket6, XdmcpSocketNotify, X_NOTIFY_READ, NULL);
#endif #endif
@ -715,7 +715,7 @@ static ARRAY8 UnwillingMessage = { (CARD8) 14, (CARD8 *) "Host unwilling" };
static void static void
receive_packet(int socketfd) receive_packet(int socketfd)
{ {
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct sockaddr_storage from; struct sockaddr_storage from;
#else #else
struct sockaddr_in from; struct sockaddr_in from;
@ -774,7 +774,7 @@ send_packet(void)
case XDM_QUERY: case XDM_QUERY:
case XDM_BROADCAST: case XDM_BROADCAST:
case XDM_INDIRECT: case XDM_INDIRECT:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case XDM_MULTICAST: case XDM_MULTICAST:
#endif #endif
send_query_msg(); send_query_msg();
@ -838,7 +838,7 @@ timeout(void)
return; return;
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (state == XDM_COLLECT_QUERY || state == XDM_COLLECT_INDIRECT_QUERY) { if (state == XDM_COLLECT_QUERY || state == XDM_COLLECT_INDIRECT_QUERY) {
/* Try next address */ /* Try next address */
for (mgrAddr = mgrAddr->ai_next;; mgrAddr = mgrAddr->ai_next) { for (mgrAddr = mgrAddr->ai_next;; mgrAddr = mgrAddr->ai_next) {
@ -862,7 +862,7 @@ timeout(void)
case XDM_COLLECT_BROADCAST_QUERY: case XDM_COLLECT_BROADCAST_QUERY:
state = XDM_BROADCAST; state = XDM_BROADCAST;
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case XDM_COLLECT_MULTICAST_QUERY: case XDM_COLLECT_MULTICAST_QUERY:
state = XDM_MULTICAST; state = XDM_MULTICAST;
break; break;
@ -919,7 +919,7 @@ get_xdmcp_sock(void)
int soopts = 1; int soopts = 1;
int socketfd = -1; int socketfd = -1;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if ((xdmcpSocket6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) if ((xdmcpSocket6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
XdmcpWarning("INET6 UDP socket creation failed"); XdmcpWarning("INET6 UDP socket creation failed");
#endif #endif
@ -936,7 +936,7 @@ get_xdmcp_sock(void)
if (SOCKADDR_FAMILY(FromAddress) == AF_INET) if (SOCKADDR_FAMILY(FromAddress) == AF_INET)
socketfd = xdmcpSocket; socketfd = xdmcpSocket;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) else if (SOCKADDR_FAMILY(FromAddress) == AF_INET6)
socketfd = xdmcpSocket6; socketfd = xdmcpSocket6;
#endif #endif
@ -955,7 +955,7 @@ send_query_msg(void)
XdmcpHeader header; XdmcpHeader header;
Bool broadcast = FALSE; Bool broadcast = FALSE;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
Bool multicast = FALSE; Bool multicast = FALSE;
#endif #endif
int i; int i;
@ -972,7 +972,7 @@ send_query_msg(void)
state = XDM_COLLECT_BROADCAST_QUERY; state = XDM_COLLECT_BROADCAST_QUERY;
broadcast = TRUE; broadcast = TRUE;
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case XDM_MULTICAST: case XDM_MULTICAST:
header.opcode = (CARD16) BROADCAST_QUERY; header.opcode = (CARD16) BROADCAST_QUERY;
state = XDM_COLLECT_MULTICAST_QUERY; state = XDM_COLLECT_MULTICAST_QUERY;
@ -998,7 +998,7 @@ send_query_msg(void)
(XdmcpNetaddr) &BroadcastAddresses[i], (XdmcpNetaddr) &BroadcastAddresses[i],
sizeof(struct sockaddr_in)); sizeof(struct sockaddr_in));
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
else if (multicast) { else if (multicast) {
struct multicastinfo *mcl; struct multicastinfo *mcl;
struct addrinfo *ai; struct addrinfo *ai;
@ -1030,7 +1030,7 @@ send_query_msg(void)
} }
#endif #endif
else { else {
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (SOCKADDR_FAMILY(ManagerAddress) == AF_INET6) if (SOCKADDR_FAMILY(ManagerAddress) == AF_INET6)
socketfd = xdmcpSocket6; socketfd = xdmcpSocket6;
#endif #endif
@ -1059,7 +1059,7 @@ recv_willing_msg(struct sockaddr *from, int fromlen, unsigned length)
XdmcpSelectHost(from, fromlen, &authenticationName); XdmcpSelectHost(from, fromlen, &authenticationName);
break; break;
case XDM_COLLECT_BROADCAST_QUERY: case XDM_COLLECT_BROADCAST_QUERY:
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case XDM_COLLECT_MULTICAST_QUERY: case XDM_COLLECT_MULTICAST_QUERY:
#endif #endif
case XDM_COLLECT_INDIRECT_QUERY: case XDM_COLLECT_INDIRECT_QUERY:
@ -1090,7 +1090,7 @@ send_request_msg(void)
case AF_INET: case AF_INET:
XdmcpConnectionType = FamilyInternet; XdmcpConnectionType = FamilyInternet;
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
case AF_INET6: case AF_INET6:
XdmcpConnectionType = FamilyInternet6; XdmcpConnectionType = FamilyInternet6;
break; break;
@ -1154,7 +1154,7 @@ send_request_msg(void)
XdmcpDisposeARRAY8(&authenticationData); XdmcpDisposeARRAY8(&authenticationData);
XdmcpWriteARRAYofARRAY8(&buffer, &AuthorizationNames); XdmcpWriteARRAYofARRAY8(&buffer, &AuthorizationNames);
XdmcpWriteARRAY8(&buffer, &ManufacturerDisplayID); XdmcpWriteARRAY8(&buffer, &ManufacturerDisplayID);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6) if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6)
socketfd = xdmcpSocket6; socketfd = xdmcpSocket6;
#endif #endif
@ -1248,7 +1248,7 @@ send_manage_msg(void)
XdmcpWriteCARD16(&buffer, DisplayNumber); XdmcpWriteCARD16(&buffer, DisplayNumber);
XdmcpWriteARRAY8(&buffer, &DisplayClass); XdmcpWriteARRAY8(&buffer, &DisplayClass);
state = XDM_AWAIT_MANAGE_RESPONSE; state = XDM_AWAIT_MANAGE_RESPONSE;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6) if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6)
socketfd = xdmcpSocket6; socketfd = xdmcpSocket6;
#endif #endif
@ -1305,7 +1305,7 @@ send_keepalive_msg(void)
XdmcpWriteCARD32(&buffer, SessionID); XdmcpWriteCARD32(&buffer, SessionID);
state = XDM_AWAIT_ALIVE_RESPONSE; state = XDM_AWAIT_ALIVE_RESPONSE;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6) if (SOCKADDR_FAMILY(req_sockaddr) == AF_INET6)
socketfd = xdmcpSocket6; socketfd = xdmcpSocket6;
#endif #endif
@ -1353,12 +1353,12 @@ get_addr_by_name(const char *argtype,
const char *namestr, const char *namestr,
int port, int port,
int socktype, SOCKADDR_TYPE * addr, SOCKLEN_TYPE * addrlen int socktype, SOCKADDR_TYPE * addr, SOCKLEN_TYPE * addrlen
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
, struct addrinfo **aip, struct addrinfo **aifirstp , struct addrinfo **aip, struct addrinfo **aifirstp
#endif #endif
) )
{ {
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct addrinfo *ai; struct addrinfo *ai;
struct addrinfo hints; struct addrinfo hints;
char portstr[6]; char portstr[6];
@ -1437,7 +1437,7 @@ get_manager_by_name(int argc, char **argv, int i)
get_addr_by_name(argv[i], argv[i + 1], xdm_udp_port, SOCK_DGRAM, get_addr_by_name(argv[i], argv[i + 1], xdm_udp_port, SOCK_DGRAM,
&ManagerAddress, &ManagerAddressLen &ManagerAddress, &ManagerAddressLen
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
, &mgrAddr, &mgrAddrFirst , &mgrAddr, &mgrAddrFirst
#endif #endif
); );
@ -1446,7 +1446,7 @@ get_manager_by_name(int argc, char **argv, int i)
static void static void
get_fromaddr_by_name(int argc, char **argv, int i) get_fromaddr_by_name(int argc, char **argv, int i)
{ {
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
struct addrinfo *ai = NULL; struct addrinfo *ai = NULL;
struct addrinfo *aifirst = NULL; struct addrinfo *aifirst = NULL;
#endif #endif
@ -1454,18 +1454,18 @@ get_fromaddr_by_name(int argc, char **argv, int i)
FatalError("Xserver: missing -from host name in command line\n"); FatalError("Xserver: missing -from host name in command line\n");
} }
get_addr_by_name("-from", argv[i], 0, 0, &FromAddress, &FromAddressLen get_addr_by_name("-from", argv[i], 0, 0, &FromAddress, &FromAddressLen
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
, &ai, &aifirst , &ai, &aifirst
#endif #endif
); );
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
if (aifirst != NULL) if (aifirst != NULL)
freeaddrinfo(aifirst); freeaddrinfo(aifirst);
#endif #endif
xdm_from = argv[i]; xdm_from = argv[i];
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6)
static int static int
get_mcast_options(int argc, char **argv, int i) get_mcast_options(int argc, char **argv, int i)
{ {