diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-07-12 00:50:23 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-07-12 00:50:23 +0000 |
| commit | 6e3431722ad570e1ff9bb6a8b42d12338d50a340 (patch) | |
| tree | c27e3faa9916c2210e6fe871f6e7e9ebc261034c /sys | |
| parent | e97384facece63d62be2b3114980bf848f685059 (diff) | |
remove PF_FORWARD (which was introduced by ipv6 reass-on-scrub).
daniel found it.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfvar.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 74fa7161d5e..1e23993297c 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.201 2004/07/11 15:54:21 itojun Exp $ */ +/* $OpenBSD: pfvar.h,v 1.202 2004/07/12 00:50:22 itojun Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -47,7 +47,7 @@ struct ip; #define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0) #define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1) -enum { PF_INOUT, PF_IN, PF_OUT, PF_FORWARD }; +enum { PF_INOUT, PF_IN, PF_OUT }; enum { PF_LAN_EXT, PF_EXT_GWY, PF_ID }; enum { PF_PASS, PF_DROP, PF_SCRUB, PF_NAT, PF_NONAT, PF_BINAT, PF_NOBINAT, PF_RDR, PF_NORDR, PF_SYNPROXY_DROP }; diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 188455ad852..eaea4690d38 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.32 2004/06/25 00:42:58 itojun Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.33 2004/07/12 00:50:22 itojun Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -429,7 +429,7 @@ ip6_forward(m, srcrt) ip6->ip6_dst.s6_addr16[1] = 0; #if NPF > 0 - if (pf_test6(PF_FORWARD, rt->rt_ifp, &m, NULL) != PF_PASS) { + if (pf_test6(PF_OUT, rt->rt_ifp, &m, NULL) != PF_PASS) { m_freem(m); goto senderr; } |