Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 16 Jul 2012 06:43:05 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r238514 - head/usr.bin/netstat
Message-ID:  <201207160643.q6G6h5di011993@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tuexen
Date: Mon Jul 16 06:43:04 2012
New Revision: 238514
URL: http://svn.freebsd.org/changeset/base/238514

Log:
  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

Modified:
  head/usr.bin/netstat/Makefile
  head/usr.bin/netstat/sctp.c

Modified: head/usr.bin/netstat/Makefile
==============================================================================
--- head/usr.bin/netstat/Makefile	Mon Jul 16 02:10:26 2012	(r238513)
+++ head/usr.bin/netstat/Makefile	Mon Jul 16 06:43:04 2012	(r238514)
@@ -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

Modified: head/usr.bin/netstat/sctp.c
==============================================================================
--- head/usr.bin/netstat/sctp.c	Mon Jul 16 02:10:26 2012	(r238513)
+++ head/usr.bin/netstat/sctp.c	Mon Jul 16 06:43:04 2012	(r238514)
@@ -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 
 	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));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207160643.q6G6h5di011993>