aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorScott Long <scottl@FreeBSD.org>2004-08-18 23:27:42 +0000
committerScott Long <scottl@FreeBSD.org>2004-08-18 23:27:42 +0000
commit9a49abc426f6fbe832f3e72e5631288f816056de (patch)
tree39e94aefad25548fca45a3e530d42ce0acf7f2a7 /sys/netinet
parent66ffd88f6b3665c6244070bcf734b0b44ea759c3 (diff)
Notes
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_input.c2
-rw-r--r--sys/netinet/ip_output.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index fc4ab6e706ca..f6068995b471 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -451,7 +451,7 @@ tooshort:
#endif /* PFIL_HOOKS */
-#if defined(FAST_IPSEC) && !defined(IPSEC_FILTERGIF)
+#if (defined(FAST_IPSEC) || defined(IPSEC)) && !defined(IPSEC_FILTERGIF)
pass:
#endif
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index c40c682c2a50..7ed86b6b73da 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -132,7 +132,9 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro,
struct in_ifaddr *ia = NULL;
int isbroadcast, sw_csum;
struct route iproute;
+#ifdef PFIL_HOOKS
struct in_addr odst;
+#endif
#ifdef IPFIREWALL_FORWARD
struct m_tag *fwd_tag = NULL;
#endif
@@ -185,7 +187,9 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro,
}
dst = (struct sockaddr_in *)&ro->ro_dst;
+#ifdef PFIL_HOOKS
again:
+#endif
/*
* If there is a cached route,
* check that it is to the same destination