Remove some stale IPv6 debugging
This commit is contained in:
parent
f836e1f11b
commit
7921c4a0bf
39
os/access.c
39
os/access.c
|
@ -480,7 +480,7 @@ DefineLocalHost:
|
||||||
#define ifraddr_size(a) (sizeof (a))
|
#define ifraddr_size(a) (sizeof (a))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6))
|
#if defined(IPv6) && defined(AF_INET6)
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -616,19 +616,6 @@ DefineSelf (int fd)
|
||||||
if (family == FamilyInternet6)
|
if (family == FamilyInternet6)
|
||||||
in6_fillscopeid((struct sockaddr_in6 *)&IFR_IFR_ADDR);
|
in6_fillscopeid((struct sockaddr_in6 *)&IFR_IFR_ADDR);
|
||||||
#endif
|
#endif
|
||||||
#ifdef DEF_SELF_DEBUG
|
|
||||||
if (family == FamilyInternet)
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %d.%d.%d.%d\n",
|
|
||||||
IFR_IFR_NAME, addr[0], addr[1], addr[2], addr[3]);
|
|
||||||
#if defined(IPv6) && defined(AF_INET6)
|
|
||||||
else if (family == FamilyInternet6) {
|
|
||||||
char cp[INET6_ADDRSTRLEN] = "";
|
|
||||||
inet_ntop(AF_INET6, addr, cp, sizeof(cp));
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %s\n",
|
|
||||||
IFR_IFR_NAME, cp);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif /* DEF_SELF_DEBUG */
|
|
||||||
for (host = selfhosts;
|
for (host = selfhosts;
|
||||||
host && !addrEqual (family, addr, len, host);
|
host && !addrEqual (family, addr, len, host);
|
||||||
host = host->next)
|
host = host->next)
|
||||||
|
@ -738,11 +725,6 @@ DefineSelf (int fd)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif /* SIOCGIFBRDADDR */
|
#endif /* SIOCGIFBRDADDR */
|
||||||
#ifdef DEF_SELF_DEBUG
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s, baddr = %s\n",
|
|
||||||
IFR_IFR_NAME,
|
|
||||||
inet_ntoa(((struct sockaddr_in *) &broad_addr)->sin_addr));
|
|
||||||
#endif /* DEF_SELF_DEBUG */
|
|
||||||
XdmcpRegisterBroadcastAddress ((struct sockaddr_in *) &broad_addr);
|
XdmcpRegisterBroadcastAddress ((struct sockaddr_in *) &broad_addr);
|
||||||
}
|
}
|
||||||
#endif /* XDMCP */
|
#endif /* XDMCP */
|
||||||
|
@ -770,20 +752,6 @@ DefineSelf (int fd)
|
||||||
in6_fillscopeid((struct sockaddr_in6 *)ifr->ifa_addr);
|
in6_fillscopeid((struct sockaddr_in6 *)ifr->ifa_addr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEF_SELF_DEBUG
|
|
||||||
if (family == FamilyInternet)
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %d.%d.%d.%d\n",
|
|
||||||
ifr->ifa_name, addr[0], addr[1], addr[2], addr[3]);
|
|
||||||
#if defined(IPv6) && defined(AF_INET6)
|
|
||||||
else if (family == FamilyInternet6) {
|
|
||||||
char cp[INET6_ADDRSTRLEN];
|
|
||||||
|
|
||||||
inet_ntop(AF_INET6, addr, cp, sizeof(cp));
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s addr = %s\n",
|
|
||||||
ifr->ifa_name, cp);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif /* DEF_SELF_DEBUG */
|
|
||||||
for (host = selfhosts;
|
for (host = selfhosts;
|
||||||
host != NULL && !addrEqual(family, addr, len, host);
|
host != NULL && !addrEqual(family, addr, len, host);
|
||||||
host = host->next)
|
host = host->next)
|
||||||
|
@ -848,11 +816,6 @@ DefineSelf (int fd)
|
||||||
broad_addr = *ifr->ifa_broadaddr;
|
broad_addr = *ifr->ifa_broadaddr;
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
#ifdef DEF_SELF_DEBUG
|
|
||||||
ErrorF("Xserver: DefineSelf(): ifname = %s, baddr = %s\n",
|
|
||||||
ifr->ifa_name,
|
|
||||||
inet_ntoa(((struct sockaddr_in *) &broad_addr)->sin_addr));
|
|
||||||
#endif /* DEF_SELF_DEBUG */
|
|
||||||
XdmcpRegisterBroadcastAddress((struct sockaddr_in *)
|
XdmcpRegisterBroadcastAddress((struct sockaddr_in *)
|
||||||
&broad_addr);
|
&broad_addr);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user