diff options
author | julian <julian@FreeBSD.org> | 2010-02-07 09:00:22 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 2010-02-07 09:00:22 +0000 |
commit | ddbf933b1410751e0e9281e3d6e55be849f0f538 (patch) | |
tree | ebff912b1715d63c4798bae8c3d32f3a6d168b61 /sys/netinet6/ip6_forward.c | |
parent | 07aaef4a20946cf30c0c0e7a04742e6b5e180f71 (diff) | |
download | FreeBSD-src-ddbf933b1410751e0e9281e3d6e55be849f0f538.zip FreeBSD-src-ddbf933b1410751e0e9281e3d6e55be849f0f538.tar.gz |
MFC of 197952 and 198075
Virtualize the pfil hooks so that different jails may chose different
packet filters. ALso allows ipfw to be enabled on on ejail and disabled
on another. In 8.0 it's a global setting.
and
Unbreak the VIMAGE build with IPSEC, broken with r197952 by
virtualizing the pfil hooks.
For consistency add the V_ to virtualize the pfil hooks in here as well.
Diffstat (limited to 'sys/netinet6/ip6_forward.c')
-rw-r--r-- | sys/netinet6/ip6_forward.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7ba4977..cff29e1 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -551,11 +551,11 @@ skip_routing: in6_clearscope(&ip6->ip6_dst); /* Jump over all PFIL processing if hooks are not active. */ - if (!PFIL_HOOKED(&inet6_pfil_hook)) + if (!PFIL_HOOKED(&V_inet6_pfil_hook)) goto pass; /* Run through list of hooks for output packets. */ - error = pfil_run_hooks(&inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT, NULL); + error = pfil_run_hooks(&V_inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT, NULL); if (error != 0) goto senderr; if (m == NULL) |