Deleted Added
full compact
tcp_reass.c (60798) tcp_reass.c (62587)
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 60798 2000-05-22 16:12:28Z dan $
34 * $FreeBSD: head/sys/netinet/tcp_reass.c 62587 2000-07-04 16:35:15Z itojun $
35 */
36
37#include "opt_ipfw.h" /* for ipfw_fwd */
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_tcpdebug.h"
41#include "opt_tcp_input.h"
42

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

55#include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */
56
57#include <net/if.h>
58#include <net/route.h>
59
60#include <netinet/in.h>
61#include <netinet/in_systm.h>
62#include <netinet/ip.h>
35 */
36
37#include "opt_ipfw.h" /* for ipfw_fwd */
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_tcpdebug.h"
41#include "opt_tcp_input.h"
42

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

55#include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */
56
57#include <net/if.h>
58#include <net/route.h>
59
60#include <netinet/in.h>
61#include <netinet/in_systm.h>
62#include <netinet/ip.h>
63#include
64#ifdef INET6
65#include <netinet/ip6.h>
63#include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */
66#include <netinet/in_var.h>
64#include <netinet/in_var.h>
67#include <netinet6/nd6.h>
68#include <netinet/icmp6.h>
69#endif
65#include <netinet/icmp_var.h> /* for ICMP_BANDLIM */
70#include <netinet/in_pcb.h>
66#include <netinet/in_pcb.h>
71#ifdef INET6
72#include <netinet6/in6_pcb.h>
73#endif
74#include <netinet/ip_var.h>
75#ifdef INET6
67#include <netinet/ip_var.h>
68#ifdef INET6
69#include <netinet/ip6.h>
70#include <netinet/icmp6.h>
71#include <netinet6/nd6.h>
76#include <netinet6/ip6_var.h>
72#include <netinet6/ip6_var.h>
73#include <netinet6/in6_pcb.h>
77#endif
74#endif
78#include <netinet/icmp_var.h>
79#include <netinet/tcp.h>
80#include <netinet/tcp_fsm.h>
81#include <netinet/tcp_seq.h>
82#include <netinet/tcp_timer.h>
83#include <netinet/tcp_var.h>
84#ifdef INET6
85#include <netinet6/tcp6_var.h>
86#endif

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

152
153/* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */
154#ifdef INET6
155#define ND6_HINT(tp) \
156do { \
157 if ((tp) && (tp)->t_inpcb && \
158 ((tp)->t_inpcb->inp_vflag & INP_IPV6) != 0 && \
159 (tp)->t_inpcb->in6p_route.ro_rt) \
75#include <netinet/tcp.h>
76#include <netinet/tcp_fsm.h>
77#include <netinet/tcp_seq.h>
78#include <netinet/tcp_timer.h>
79#include <netinet/tcp_var.h>
80#ifdef INET6
81#include <netinet6/tcp6_var.h>
82#endif

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

148
149/* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */
150#ifdef INET6
151#define ND6_HINT(tp) \
152do { \
153 if ((tp) && (tp)->t_inpcb && \
154 ((tp)->t_inpcb->inp_vflag & INP_IPV6) != 0 && \
155 (tp)->t_inpcb->in6p_route.ro_rt) \
160 nd6_nud_hint((tp)->t_inpcb->in6p_route.ro_rt, NULL); \
156 nd6_nud_hint((tp)->t_inpcb->in6p_route.ro_rt, NULL, 0); \
161} while (0)
162#else
163#define ND6_HINT(tp)
164#endif
165
166/*
167 * Insert segment which inludes th into reassembly queue of tcp with
168 * control block tp. Return TH_FIN if reassembly now includes

--- 2691 unchanged lines hidden ---
157} while (0)
158#else
159#define ND6_HINT(tp)
160#endif
161
162/*
163 * Insert segment which inludes th into reassembly queue of tcp with
164 * control block tp. Return TH_FIN if reassembly now includes

--- 2691 unchanged lines hidden ---