From 92aaace6046096db0cee26a2d09ade66657e9b41 Mon Sep 17 00:00:00 2001 From: ume Date: Tue, 17 Feb 2004 14:02:37 +0000 Subject: IPSEC and FAST_IPSEC have the same internal API now; so merge these (IPSEC has an extra ipsecstat) Submitted by: "Bjoern A. Zeeb" --- sys/netinet/tcp_input.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'sys/netinet/tcp_input.c') diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index a868f80..01033ff 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.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 -- cgit v1.1