From cafb94bcea1cdf048e81b7eb2d24808e1a8c5280 Mon Sep 17 00:00:00 2001 From: bms Date: Wed, 16 Jun 2004 09:35:07 +0000 Subject: Fix build for IPSEC && !INET6 PR: kern/66125 Submitted by: Cyrille Lefevre --- sys/netinet/tcp_input.c | 9 ++++++--- sys/netinet/tcp_reass.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 03ed420..9b6636b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -641,17 +641,20 @@ findpcb: } #if defined(IPSEC) || defined(FAST_IPSEC) +#ifdef INET6 if (isipv6) { if (inp != NULL && ipsec6_in_reject(m, inp)) { #ifdef IPSEC ipsec6stat.in_polvio++; -#endif /*IPSEC*/ +#endif goto drop; } - } else if (inp != NULL && ipsec4_in_reject(m, inp)) { + } else +#endif /* INET6 */ + if (inp != NULL && ipsec4_in_reject(m, inp)) { #ifdef IPSEC ipsecstat.in_polvio++; -#endif /*IPSEC*/ +#endif goto drop; } #endif /*IPSEC || FAST_IPSEC*/ diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 03ed420..9b6636b 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -641,17 +641,20 @@ findpcb: } #if defined(IPSEC) || defined(FAST_IPSEC) +#ifdef INET6 if (isipv6) { if (inp != NULL && ipsec6_in_reject(m, inp)) { #ifdef IPSEC ipsec6stat.in_polvio++; -#endif /*IPSEC*/ +#endif goto drop; } - } else if (inp != NULL && ipsec4_in_reject(m, inp)) { + } else +#endif /* INET6 */ + if (inp != NULL && ipsec4_in_reject(m, inp)) { #ifdef IPSEC ipsecstat.in_polvio++; -#endif /*IPSEC*/ +#endif goto drop; } #endif /*IPSEC || FAST_IPSEC*/ -- cgit v1.1