diff options
| author | ume <ume@FreeBSD.org> | 2004-02-17 14:02:37 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2004-02-17 14:02:37 +0000 |
| commit | 92aaace6046096db0cee26a2d09ade66657e9b41 (patch) | |
| tree | 303603fd5ead37b54a0b79fac7c02061fb5e5222 /sys/netinet/tcp_reass.c | |
| parent | 180ac35cac1b391fa9fb698f9b690a29311b3132 (diff) | |
| download | FreeBSD-src-92aaace6046096db0cee26a2d09ade66657e9b41.zip FreeBSD-src-92aaace6046096db0cee26a2d09ade66657e9b41.tar.gz | |
IPSEC and FAST_IPSEC have the same internal API now;
so merge these (IPSEC has an extra ipsecstat)
Submitted by: "Bjoern A. Zeeb" <bzeeb+freebsd@zabbadoz.net>
Diffstat (limited to 'sys/netinet/tcp_reass.c')
| -rw-r--r-- | sys/netinet/tcp_reass.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index a868f80..01033ff 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -567,29 +567,21 @@ findpcb: 1, m->m_pkthdr.rcvif); } -#ifdef IPSEC +#if defined(IPSEC) || defined(FAST_IPSEC) if (isipv6) { if (inp != NULL && ipsec6_in_reject(m, inp)) { +#ifdef IPSEC ipsec6stat.in_polvio++; +#endif /*IPSEC*/ goto drop; } - } else { - if (inp != NULL && ipsec4_in_reject(m, inp)) { - ipsecstat.in_polvio++; - goto drop; - } - } -#endif -#ifdef FAST_IPSEC - if (isipv6) { - if (inp != NULL && ipsec6_in_reject(m, inp)) { - goto drop; - } - } else - if (inp != NULL && ipsec4_in_reject(m, inp)) { + } else if (inp != NULL && ipsec4_in_reject(m, inp)) { +#ifdef IPSEC + ipsecstat.in_polvio++; +#endif /*IPSEC*/ goto drop; } -#endif /*FAST_IPSEC*/ +#endif /*IPSEC || FAST_IPSEC*/ /* * If the state is CLOSED (i.e., TCB does not exist) then |
