svn commit: r257227 - head/sbin/pfctl

[Baptiste Daroussin]

Author: bapt
Date: Sun Oct 27 21:07:37 2013
New Revision: 257227
URL: http://svnweb.freebsd.org/changeset/base/257227

Log:
  Import pf_print_state.c 1.54 from OpenBSD
  
  Original log:
  pfctl -ss printed state levels for ICMPv6. Disable this the same
  way it has already been done for ICMPv4.
  
  Difference with OpenBSD:
  - WITHOUT_INET6 safe
  
  Obtained from:	OpenBSD

Modified:
  head/sbin/pfctl/pf_print_state.c

Modified: head/sbin/pfctl/pf_print_state.c
==============================================================================
--- head/sbin/pfctl/pf_print_state.c	Sun Oct 27 21:06:17 2013	(r257226)
+++ head/sbin/pfctl/pf_print_state.c	Sun Oct 27 21:07:37 2013	(r257227)
@@ -285,8 +285,13 @@ print_state(struct pfsync_state *s, int 
 		const char *states[] = PFUDPS_NAMES;
 
 		printf("   %s:%s\n", states[src->state], states[dst->state]);
+#ifndef INET6
 	} else if (s->proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES &&
 	    dst->state < PFOTHERS_NSTATES) {
+#else
+	} else if (s->proto != IPPROTO_ICMP && s->proto != IPPROTO_ICMPV6 &&
+	    src->state < PFOTHERS_NSTATES && dst->state < PFOTHERS_NSTATES) {
+#endif
 		/* XXX ICMP doesn't really have state levels */
 		const char *states[] = PFOTHERS_NAMES;