svn commit: r363277 - head/contrib/ipfilter/tools

[Cy Schubert]

Author: cy
Date: Fri Jul 17 19:07:34 2020
New Revision: 363277
URL: https://svnweb.freebsd.org/changeset/base/363277

Log:
  Only use the use_inet6 variable when INET6 is a build option.
  
  This is a prerequisite to upcoming argument processing cleanups which
  will resolve consistency as was done with ippool previously.
  
  PR:		247952
  MFC after:	1 week

Modified:
  head/contrib/ipfilter/tools/ipfstat.c

Modified: head/contrib/ipfilter/tools/ipfstat.c
==============================================================================
--- head/contrib/ipfilter/tools/ipfstat.c	Fri Jul 17 15:50:03 2020	(r363276)
+++ head/contrib/ipfilter/tools/ipfstat.c	Fri Jul 17 19:07:34 2020	(r363277)
@@ -57,7 +57,9 @@ static	wordtab_t	*state_fields = NULL;
 
 int	nohdrfields = 0;
 int	opts = 0;
+#ifdef	USE_INET6
 int	use_inet6 = 0;
+#endif
 int	live_kernel = 1;
 int	state_fd = -1;
 int	ipf_fd = -1;
@@ -410,8 +412,13 @@ int main(argc,argv)
 #ifdef STATETOP
 	else if (opts & OPT_STATETOP)
 		topipstates(saddr, daddr, sport, dport, protocol,
-			    use_inet6 ? 6 : 4, refreshtime, topclosed, filter);
+#ifdef	USE_INET6
+			    use_inet6 ? 6 : 4,
+#else
+			    4,
 #endif
+#endif
+			    refreshtime, topclosed, filter);
 	else if (opts & OPT_AUTHSTATS)
 		showauthstates(frauthstp);
 	else if (opts & OPT_GROUPS)
@@ -904,10 +911,13 @@ static void printdeadlist(fiop, out, set, fp, group, c
 			return;
 		}
 		fp = &fb;
+#ifdef	USE_INET6
 		if (use_inet6 != 0) {
 			if (fp->fr_family != 0 && fp->fr_family != 6)
 				continue;
-		} else {
+		} else
+#endif
+		{
 			if (fp->fr_family != 0 && fp->fr_family != 4)
 				continue;
 		}