From 3dcc856b6c7602905faa8aecbf225d933a364513 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Mon, 16 Jul 2012 06:43:04 +0000 Subject: [PATCH] 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 --- usr.bin/netstat/Makefile | 4 ++++ usr.bin/netstat/sctp.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index ce5cdab4c2b3..1071f0e97a24 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 3f13b7195756..2f67b0cde066 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));