Page MenuHomeFreeBSD
Files F154022921

D36452.id.diff
No OneTemporary
Actions

D36452.id.diff
View Options

diff --git a/sys/net/pfil.h b/sys/net/pfil.h
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -80,7 +80,7 @@
#define PFIL_IN 0x00010000
#define PFIL_OUT 0x00020000
-#define PFIL_FWD 0x00040000
+/* UNUSED 0x00040000 */
#define PFIL_DIR(f) ((f) & (PFIL_IN|PFIL_OUT))
#define PFIL_MEMPTR 0x00080000
#define PFIL_HEADPTR 0x00100000
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -403,7 +403,7 @@
goto passout;
if (pfil_run_hooks(V_inet_pfil_head, &m, nh->nh_ifp,
- PFIL_OUT | PFIL_FWD, NULL) != PFIL_PASS)
+ PFIL_OUT, NULL) != PFIL_PASS)
goto drop;
M_ASSERTVALID(m);
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -117,9 +117,6 @@
struct ip *ip;
int pflags = PFIL_OUT;
- if (flags & IP_FORWARDING)
- pflags |= PFIL_FWD;
-
m = *mp;
ip = mtod(m, struct ip *);
diff --git a/sys/netinet6/ip6_fastfwd.c b/sys/netinet6/ip6_fastfwd.c
--- a/sys/netinet6/ip6_fastfwd.c
+++ b/sys/netinet6/ip6_fastfwd.c
@@ -214,8 +214,8 @@
/*
* Outgoing packet firewall processing.
*/
- if (pfil_run_hooks(V_inet6_pfil_head, &m, nh->nh_ifp, PFIL_OUT |
- PFIL_FWD, NULL) != PFIL_PASS)
+ if (pfil_run_hooks(V_inet6_pfil_head, &m, nh->nh_ifp, PFIL_OUT,
+ NULL) != PFIL_PASS)
goto dropout;
/*
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -313,8 +313,8 @@
odst = ip6->ip6_dst;
/* Run through list of hooks for forwarded packets. */
- if (pfil_run_hooks(V_inet6_pfil_head, &m, nh->nh_ifp, PFIL_OUT |
- PFIL_FWD, NULL) != PFIL_PASS)
+ if (pfil_run_hooks(V_inet6_pfil_head, &m, nh->nh_ifp, PFIL_OUT,
+ NULL) != PFIL_PASS)
goto freecopy;
ip6 = mtod(m, struct ip6_hdr *);

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 1:10 PM (10 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32185636
Default Alt Text
D36452.id.diff (1 KB)

Event Timeline