summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2008-09-28 14:39:55 +0000
committerjsing <jsing@openbsd.org>2008-09-28 14:39:55 +0000
commit7e6c4eb87399dae32b21a7ecdbb8e7e730210fb4 (patch)
tree164c155906ca97b7b825d45c28fb0ac5aec599ee
parentinitialize the ether_vtag field like the rest of the packet header (diff)
downloadwireguard-openbsd-7e6c4eb87399dae32b21a7ecdbb8e7e730210fb4.tar.xz
wireguard-openbsd-7e6c4eb87399dae32b21a7ecdbb8e7e730210fb4.zip
Teach PF pf_print_state_parts() about IPv4 in IP and IPv6 in IP
encapsulation. Decapitalise the 'v' in ICMPv6 whilst here. ok henning@
-rw-r--r--sys/net/pf.c10
1 files 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);