Deleted Added
full compact
tcp_reass.c (95023) tcp_reass.c (95552)
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 95023 2002-04-19 04:46:24Z suz $
34 * $FreeBSD: head/sys/netinet/tcp_reass.c 95552 2002-04-27 08:24:29Z tanimura $
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

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

1837 if (ourfinisacked) {
1838 /*
1839 * If we can't receive any more
1840 * data, then closing user can proceed.
1841 * Starting the timer is contrary to the
1842 * specification, but if we don't get a FIN
1843 * we'll hang forever.
1844 */
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

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

1837 if (ourfinisacked) {
1838 /*
1839 * If we can't receive any more
1840 * data, then closing user can proceed.
1841 * Starting the timer is contrary to the
1842 * specification, but if we don't get a FIN
1843 * we'll hang forever.
1844 */
1845 SIGIO_SLOCK();
1845 if (so->so_state & SS_CANTRCVMORE) {
1846 if (so->so_state & SS_CANTRCVMORE) {
1846 soisdisconnected(so);
1847 soisdisconnected_locked(so);
1848 SIGIO_SUNLOCK();
1847 callout_reset(tp->tt_2msl, tcp_maxidle,
1848 tcp_timer_2msl, tp);
1849 callout_reset(tp->tt_2msl, tcp_maxidle,
1850 tcp_timer_2msl, tp);
1851 } else {
1852 SIGIO_SUNLOCK();
1849 }
1850 tp->t_state = TCPS_FIN_WAIT_2;
1851 }
1852 break;
1853
1854 /*
1855 * In CLOSING STATE in addition to the processing for
1856 * the ESTABLISHED state if the ACK acknowledges our FIN

--- 879 unchanged lines hidden ---
1853 }
1854 tp->t_state = TCPS_FIN_WAIT_2;
1855 }
1856 break;
1857
1858 /*
1859 * In CLOSING STATE in addition to the processing for
1860 * the ESTABLISHED state if the ACK acknowledges our FIN

--- 879 unchanged lines hidden ---