From da4515167a1da80236b161feab279d1dbbe6d2b1 Mon Sep 17 00:00:00 2001
From: Joel Sing <jsing@cvs.openbsd.org>
Date: Sun, 28 Sep 2008 14:39:56 +0000
Subject: Teach PF pf_print_state_parts() about IPv4 in IP and IPv6 in IP
 encapsulation. Decapitalise the 'v' in ICMPv6 whilst here.

ok henning@
---
 sys/net/pf.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys/net/pf.c b/sys/net/pf.c
index e4d67e4630b..f0622fe0db4 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.621 2008/09/17 20:10:37 chl Exp $ */
+/*	$OpenBSD: pf.c,v 1.622 2008/09/28 14:39:55 jsing Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1294,6 +1294,12 @@ pf_print_state_parts(struct pf_state *s,
 	dir = s ? s->direction : 0;
 
 	switch (proto) {
+	case IPPROTO_IPV4:
+		printf("IPv4");
+		break;
+	case IPPROTO_IPV6:
+		printf("IPv6");
+		break;
 	case IPPROTO_TCP:
 		printf("TCP");
 		break;
@@ -1304,7 +1310,7 @@ pf_print_state_parts(struct pf_state *s,
 		printf("ICMP");
 		break;
 	case IPPROTO_ICMPV6:
-		printf("ICMPV6");
+		printf("ICMPv6");
 		break;
 	default:
 		printf("%u", skw->proto);
-- 
cgit v1.2.3