d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up IPFIREWALL_FORWARD sections and comments.

Browse Source
This commit is contained in:
Andre Oppermann 2007-03-21 18:56:03 +00:00
parent 794235b737
commit b10fbdeafa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/tcp_input.c
View File

@ -30,7 +30,7 @@
* $FreeBSD$
*/
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
@ -657,8 +657,9 @@ findpcb:
}
/* Remove the tag from the packet. We don't need it anymore. */
m_tag_delete(m, fwd_tag);
} else {
} else
#endif /* IPFIREWALL_FORWARD */
{
if (isipv6) {
#ifdef INET6
inp = in6_pcblookup_hash(&tcbinfo,
@ -673,9 +674,7 @@ findpcb:
ip->ip_dst, th->th_dport,
INPLOOKUP_WILDCARD,
m->m_pkthdr.rcvif);
#ifdef IPFIREWALL_FORWARD
}
#endif /* IPFIREWALL_FORWARD */
#if defined(IPSEC) || defined(FAST_IPSEC)
#ifdef INET6

7
sys/netinet/tcp_reass.c
View File

@ -30,7 +30,7 @@
* $FreeBSD$
*/
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
@ -657,8 +657,9 @@ findpcb:
}
/* Remove the tag from the packet. We don't need it anymore. */
m_tag_delete(m, fwd_tag);
} else {
} else
#endif /* IPFIREWALL_FORWARD */
{
if (isipv6) {
#ifdef INET6
inp = in6_pcblookup_hash(&tcbinfo,
@ -673,9 +674,7 @@ findpcb:
ip->ip_dst, th->th_dport,
INPLOOKUP_WILDCARD,
m->m_pkthdr.rcvif);
#ifdef IPFIREWALL_FORWARD
}
#endif /* IPFIREWALL_FORWARD */
#if defined(IPSEC) || defined(FAST_IPSEC)
#ifdef INET6