From owner-svn-src-all@FreeBSD.ORG  Sun Oct 27 21:07:37 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 998AC47B;
 Sun, 27 Oct 2013 21:07:37 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 86A8F2C95;
 Sun, 27 Oct 2013 21:07:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RL7bu8032599;
 Sun, 27 Oct 2013 21:07:37 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RL7bQ5032598;
 Sun, 27 Oct 2013 21:07:37 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310272107.r9RL7bQ5032598@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 27 Oct 2013 21:07:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257227 - head/sbin/pfctl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Oct 2013 21:07:37 -0000

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;