summaryrefslogtreecommitdiff
path: root/usr.bin/systat/netcmds.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-09-29 21:59:29 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-09-29 21:59:29 +0000
commitc3927aa7978bf5d386ccb0cd22ede3327c083c4a (patch)
tree3492b8eb1e823fc557e73c4d6fe243075f930e56 /usr.bin/systat/netcmds.c
parent62f45902e89003b33035f7a056f8080964551bc9 (diff)
always compile in INET6 support
Diffstat (limited to 'usr.bin/systat/netcmds.c')
-rw-r--r--usr.bin/systat/netcmds.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 41786a583a5..0d9a54cbd37 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcmds.c,v 1.13 2004/04/26 19:22:30 itojun Exp $ */
+/* $OpenBSD: netcmds.c,v 1.14 2004/09/29 21:59:28 deraadt Exp $ */
/* $NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: netcmds.c,v 1.13 2004/04/26 19:22:30 itojun Exp $";
+static char rcsid[] = "$OpenBSD: netcmds.c,v 1.14 2004/09/29 21:59:28 deraadt Exp $";
#endif /* not lint */
/*
@@ -260,13 +260,11 @@ addrcmp(struct sockaddr *sa1, struct sockaddr *sa2)
((struct sockaddr_in *)sa2)->sin_addr.s_addr)
return 1;
break;
-#ifdef INET6
case AF_INET6:
if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)sa1)->sin6_addr,
&((struct sockaddr_in6 *)sa2)->sin6_addr))
return 1;
break;
-#endif
default:
if (memcmp(sa1, sa2, sa1->sa_len) == 0)
return 1;
@@ -319,7 +317,6 @@ checkhost(struct inpcb *inp)
sin->sin_addr.s_addr == inp->inp_faddr.s_addr)
return (p->onoff);
}
-#ifdef INET6
if (((struct sockaddr *)&p->addr)->sa_family == AF_INET6 &&
(inp->inp_flags & INP_IPV6)) {
struct sockaddr_in6 *sin6;
@@ -328,7 +325,6 @@ checkhost(struct inpcb *inp)
IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, &inp->inp_faddr6))
return (p->onoff);
}
-#endif
}
return (1);
}