summaryrefslogtreecommitdiffstats
path: root/sys/net/pf_osfp.c
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2016-10-26 21:07:22 +0000
committerbluhm <bluhm@openbsd.org>2016-10-26 21:07:22 +0000
commitab417b3aceab3374446d64a762fe7a3053ef6401 (patch)
tree470c61ca2e44b1cac4226372f9c797eae386a83c /sys/net/pf_osfp.c
parentIn addition to forwarding and path MTU discovery with pf, check (diff)
downloadwireguard-openbsd-ab417b3aceab3374446d64a762fe7a3053ef6401.tar.xz
wireguard-openbsd-ab417b3aceab3374446d64a762fe7a3053ef6401.zip
Put union pf_headers and struct pf_pdesc into separate header file
pfvar_priv.h. The pf_headers had to be defined in multiple .c files before. In pfvar.h it would have unknown storage size, this file is included in too many places. The idea is to have a private pf header that is only included in the pf part of the kernel. For now it contains pf_pdesc and pf_headers, it may be extended later. discussion, input and OK henning@ procter@ sashan@
Diffstat (limited to 'sys/net/pf_osfp.c')
-rw-r--r--sys/net/pf_osfp.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index 5e571444d71..4e98517449d 100644
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_osfp.c,v 1.37 2016/09/15 02:00:18 dlg Exp $ */
+/* $OpenBSD: pf_osfp.c,v 1.38 2016/10/26 21:07:22 bluhm Exp $ */
/*
* Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -27,15 +27,21 @@
#include <sys/mbuf.h>
#include <sys/syslog.h>
+#include <net/if.h>
+
#include <netinet/in.h>
#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
#include <netinet/tcp.h>
+#include <netinet/udp.h>
-#include <net/if.h>
-#include <net/pfvar.h>
-
+#ifdef INET6
#include <netinet/ip6.h>
+#include <netinet/icmp6.h>
+#endif /* INET6 */
+#include <net/pfvar.h>
+#include <net/pfvar_priv.h>
#ifdef _KERNEL
typedef struct pool pool_t;