summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2012-07-16 06:43:04 +0000
committertuexen <tuexen@FreeBSD.org>2012-07-16 06:43:04 +0000
commit8843fcf6f31a321d74db332f1b9596b33b1b51bd (patch)
treed1fe4106fc9969877184444126da5828a2c9778c
parent8f708ce43310175fbbc15562068838d620a857e2 (diff)
downloadFreeBSD-src-8843fcf6f31a321d74db332f1b9596b33b1b51bd.zip
FreeBSD-src-8843fcf6f31a321d74db332f1b9596b33b1b51bd.tar.gz
Allow netstat to be build if INET is not defined in the kernel.
Thanks to Garrett Cooper for reporting the issue. MFC after: 3 days X-MFC: 238501
-rw-r--r--usr.bin/netstat/Makefile4
-rw-r--r--usr.bin/netstat/sctp.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index ce5cdab..1071f0e 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -13,6 +13,10 @@ CFLAGS+=-fno-strict-aliasing
CFLAGS+=-DIPSEC
CFLAGS+=-DSCTP
+.if ${MK_INET_SUPPORT} != "no"
+CFLAGS+=-DINET
+.endif
+
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= inet6.c
CFLAGS+=-DINET6
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 3f13b71..2f67b0c 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -107,6 +107,7 @@ struct xraddr_entry {
* If numeric_addr has been supplied, give
* numeric value, otherwise try for symbolic name.
*/
+#ifdef INET
static char *
inetname(struct in_addr *inp)
{
@@ -146,6 +147,7 @@ inetname(struct in_addr *inp)
}
return (line);
}
+#endif
#ifdef INET6
static char ntop_buf[INET6_ADDRSTRLEN];
@@ -197,9 +199,11 @@ sctp_print_address(union sctp_sockstore *address, int port, int num_port)
int width;
switch (address->sa.sa_family) {
+#ifdef INET
case AF_INET:
sprintf(line, "%.*s.", Wflag ? 39 : 16, inetname(&address->sin.sin_addr));
break;
+#endif
#ifdef INET6
case AF_INET6:
sprintf(line, "%.*s.", Wflag ? 39 : 16, inet6name(&address->sin6.sin6_addr));
OpenPOWER on IntegriCloud