Date: Mon, 12 Oct 2009 22:40:43 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r198008 - user/eri/pf45/head/sys/contrib/pf/net Message-ID: <200910122240.n9CMehnL087654@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Mon Oct 12 22:40:43 2009 New Revision: 198008 URL: http://svn.freebsd.org/changeset/base/198008 Log: Unbreak building of userland utilities. Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Mon Oct 12 22:26:10 2009 (r198007) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Mon Oct 12 22:40:43 2009 (r198008) @@ -53,9 +53,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/tcp.h> #include <net/if.h> -#ifdef __FreeBSD__ -#include <net/vnet.h> -#endif #include <net/pfvar.h> #ifdef INET6 @@ -100,7 +97,7 @@ __FBSDID("$FreeBSD$"); #endif /* _KERNEL */ -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(_KERNEL) VNET_DEFINE(struct pf_anchor_global, pf_anchors); VNET_DEFINE(struct pf_anchor, pf_main_anchor); #else Modified: user/eri/pf45/head/sys/contrib/pf/net/pfvar.h ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Mon Oct 12 22:26:10 2009 (r198007) +++ user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Mon Oct 12 22:40:43 2009 (r198008) @@ -934,6 +934,7 @@ struct pfsync_state { } __packed; #ifdef __FreeBSD__ +#ifdef _KERNEL /* pfsync */ typedef int pfsync_state_import_t(struct pfsync_state *, u_int8_t); typedef void pfsync_insert_state_t(struct pf_state *); @@ -981,6 +982,7 @@ VNET_DECLARE(pflog_packet_t, *pflog_pac /* pf uid hack */ #define debug_pfugidhack VNET(debug_pfugidhack) +#endif /* Macros to set/clear/test flags. */ #ifdef _KERNEL @@ -1218,8 +1220,10 @@ RB_HEAD(pfi_ifhead, pfi_kif); /* state tables */ #ifdef __FreeBSD__ +#ifdef _KERNEL VNET_DECLARE(struct pf_state_tree, pf_statetbl); #define pf_statetbl VNET(pf_statetbl) +#endif #else extern struct pf_state_tree pf_statetbl; #endif @@ -2143,10 +2147,12 @@ struct pf_fragment { #endif /* _KERNEL */ #ifdef __FreeBSD__ +#ifdef _KERNEL VNET_DECLARE(struct pf_anchor_global, pf_anchors); #define pf_anchors VNET(pf_anchors) VNET_DECLARE(struct pf_anchor, pf_main_anchor); #define pf_main_anchor VNET(pf_main_anchor) +#endif #else extern struct pf_anchor_global pf_anchors; extern struct pf_anchor pf_main_anchor;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910122240.n9CMehnL087654>