Deleted Added
full compact
tcp_reass.c (105194) tcp_reass.c (105199)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
34 * $FreeBSD: head/sys/netinet/tcp_reass.c 105194 2002-10-16 01:54:46Z sam $
34 * $FreeBSD: head/sys/netinet/tcp_reass.c 105199 2002-10-16 02:25:05Z sam $
35 */
36
37#include "opt_ipfw.h" /* for ipfw_fwd */
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41#include "opt_tcpdebug.h"
42#include "opt_tcp_input.h"

--- 36 unchanged lines hidden (view full) ---

79#include <netinet/tcp_timer.h>
80#include <netinet/tcp_var.h>
81#include <netinet6/tcp6_var.h>
82#include <netinet/tcpip.h>
83#ifdef TCPDEBUG
84#include <netinet/tcp_debug.h>
85#endif /* TCPDEBUG */
86
35 */
36
37#include "opt_ipfw.h" /* for ipfw_fwd */
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41#include "opt_tcpdebug.h"
42#include "opt_tcp_input.h"

--- 36 unchanged lines hidden (view full) ---

79#include <netinet/tcp_timer.h>
80#include <netinet/tcp_var.h>
81#include <netinet6/tcp6_var.h>
82#include <netinet/tcpip.h>
83#ifdef TCPDEBUG
84#include <netinet/tcp_debug.h>
85#endif /* TCPDEBUG */
86
87#ifdef FAST_IPSEC
88#include <netipsec/ipsec.h>
89#ifdef INET6
90#include <netipsec/ipsec6.h>
91#endif
92#endif /*FAST_IPSEC*/
93
87#ifdef IPSEC
88#include <netinet6/ipsec.h>
89#include <netinet6/ipsec6.h>
90#include <netkey/key.h>
91#endif /*IPSEC*/
92
93#include <machine/in_cksum.h>
94

--- 466 unchanged lines hidden (view full) ---

561 }
562 } else {
563 if (inp != NULL && ipsec4_in_reject_so(m, inp->inp_socket)) {
564 ipsecstat.in_polvio++;
565 goto drop;
566 }
567 }
568#endif
94#ifdef IPSEC
95#include <netinet6/ipsec.h>
96#include <netinet6/ipsec6.h>
97#include <netkey/key.h>
98#endif /*IPSEC*/
99
100#include <machine/in_cksum.h>
101

--- 466 unchanged lines hidden (view full) ---

568 }
569 } else {
570 if (inp != NULL && ipsec4_in_reject_so(m, inp->inp_socket)) {
571 ipsecstat.in_polvio++;
572 goto drop;
573 }
574 }
575#endif
576#ifdef FAST_IPSEC
577#ifdef INET6
578 if (isipv6) {
579 if (inp != NULL && ipsec6_in_reject(m, inp)) {
580 goto drop;
581 }
582 } else
583#endif /* INET6 */
584 if (inp != NULL && ipsec4_in_reject(m, inp)) {
585 goto drop;
586 }
587#endif /*FAST_IPSEC*/
569
570 /*
571 * If the state is CLOSED (i.e., TCB does not exist) then
572 * all data in the incoming segment is discarded.
573 * If the TCB exists but is in CLOSED state, it is embryonic,
574 * but should either do a listen or a connect soon.
575 */
576 if (inp == NULL) {

--- 2214 unchanged lines hidden ---
588
589 /*
590 * If the state is CLOSED (i.e., TCB does not exist) then
591 * all data in the incoming segment is discarded.
592 * If the TCB exists but is in CLOSED state, it is embryonic,
593 * but should either do a listen or a connect soon.
594 */
595 if (inp == NULL) {

--- 2214 unchanged lines hidden ---