Deleted Added
full compact
tcp_input.c (147781) tcp_input.c (149371)
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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
30 * $FreeBSD: head/sys/netinet/tcp_input.c 147781 2005-07-05 19:23:02Z ps $
30 * $FreeBSD: head/sys/netinet/tcp_input.c 149371 2005-08-22 16:13:08Z andre $
31 */
32
33#include "opt_ipfw.h" /* for ipfw_fwd */
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipsec.h"
37#include "opt_mac.h"
38#include "opt_tcpdebug.h"

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

735 default:
736 goto drop;
737 }
738 }
739 rstreason = BANDLIM_RST_CLOSEDPORT;
740 goto dropwithreset;
741 }
742 INP_LOCK(inp);
31 */
32
33#include "opt_ipfw.h" /* for ipfw_fwd */
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipsec.h"
37#include "opt_mac.h"
38#include "opt_tcpdebug.h"

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

735 default:
736 goto drop;
737 }
738 }
739 rstreason = BANDLIM_RST_CLOSEDPORT;
740 goto dropwithreset;
741 }
742 INP_LOCK(inp);
743
744 /* Check the minimum TTL for socket. */
745 if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl)
746 goto drop;
747
743 if (inp->inp_vflag & INP_TIMEWAIT) {
744 /*
745 * The only option of relevance is TOF_CC, and only if
746 * present in a SYN segment. See tcp_timewait().
747 */
748 if (thflags & TH_SYN)
749 tcp_dooptions(&to, optp, optlen, 1);
750 if (tcp_timewait((struct tcptw *)inp->inp_ppcb,

--- 2500 unchanged lines hidden ---
748 if (inp->inp_vflag & INP_TIMEWAIT) {
749 /*
750 * The only option of relevance is TOF_CC, and only if
751 * present in a SYN segment. See tcp_timewait().
752 */
753 if (thflags & TH_SYN)
754 tcp_dooptions(&to, optp, optlen, 1);
755 if (tcp_timewait((struct tcptw *)inp->inp_ppcb,

--- 2500 unchanged lines hidden ---