| tcp_input.c (288914) | tcp_input.c (289276) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995 3 * The Regents of the University of California. All rights reserved. 4 * Copyright (c) 2007-2008,2010 5 * Swinburne University of Technology, Melbourne, Australia. 6 * Copyright (c) 2009-2010 Lawrence Stewart <lstewart@freebsd.org> 7 * Copyright (c) 2010 The FreeBSD Foundation 8 * Copyright (c) 2010-2011 Juniper Networks, Inc. --- 34 unchanged lines hidden (view full) --- 43 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 44 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 45 * SUCH DAMAGE. 46 * 47 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 48 */ 49 50#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995 3 * The Regents of the University of California. All rights reserved. 4 * Copyright (c) 2007-2008,2010 5 * Swinburne University of Technology, Melbourne, Australia. 6 * Copyright (c) 2009-2010 Lawrence Stewart <lstewart@freebsd.org> 7 * Copyright (c) 2010 The FreeBSD Foundation 8 * Copyright (c) 2010-2011 Juniper Networks, Inc. --- 34 unchanged lines hidden (view full) --- 43 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 44 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 45 * SUCH DAMAGE. 46 * 47 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 48 */ 49 50#include <sys/cdefs.h> |
| 51__FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 288914 2015-10-06 07:46:19Z hiren $"); | 51__FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 289276 2015-10-14 00:35:37Z hiren $"); |
| 52 53#include "opt_ipfw.h" /* for ipfw_fwd */ 54#include "opt_inet.h" 55#include "opt_inet6.h" 56#include "opt_ipsec.h" 57#include "opt_tcpdebug.h" 58 59#include <sys/param.h> --- 39 unchanged lines hidden (view full) --- 99#include <netinet6/ip6_var.h> 100#include <netinet6/nd6.h> 101#include <netinet/tcp_fsm.h> 102#include <netinet/tcp_seq.h> 103#include <netinet/tcp_timer.h> 104#include <netinet/tcp_var.h> 105#include <netinet6/tcp6_var.h> 106#include <netinet/tcpip.h> | 52 53#include "opt_ipfw.h" /* for ipfw_fwd */ 54#include "opt_inet.h" 55#include "opt_inet6.h" 56#include "opt_ipsec.h" 57#include "opt_tcpdebug.h" 58 59#include <sys/param.h> --- 39 unchanged lines hidden (view full) --- 99#include <netinet6/ip6_var.h> 100#include <netinet6/nd6.h> 101#include <netinet/tcp_fsm.h> 102#include <netinet/tcp_seq.h> 103#include <netinet/tcp_timer.h> 104#include <netinet/tcp_var.h> 105#include <netinet6/tcp6_var.h> 106#include <netinet/tcpip.h> |
| 107#ifdef TCPPCAP 108#include <netinet/tcp_pcap.h> 109#endif |
|
| 107#include <netinet/tcp_syncache.h> 108#ifdef TCPDEBUG 109#include <netinet/tcp_debug.h> 110#endif /* TCPDEBUG */ 111#ifdef TCP_OFFLOAD 112#include <netinet/tcp_offload.h> 113#endif 114 --- 1404 unchanged lines hidden (view full) --- 1519#endif 1520 } 1521 INP_WLOCK_ASSERT(tp->t_inpcb); 1522 KASSERT(tp->t_state > TCPS_LISTEN, ("%s: TCPS_LISTEN", 1523 __func__)); 1524 KASSERT(tp->t_state != TCPS_TIME_WAIT, ("%s: TCPS_TIME_WAIT", 1525 __func__)); 1526 | 110#include <netinet/tcp_syncache.h> 111#ifdef TCPDEBUG 112#include <netinet/tcp_debug.h> 113#endif /* TCPDEBUG */ 114#ifdef TCP_OFFLOAD 115#include <netinet/tcp_offload.h> 116#endif 117 --- 1404 unchanged lines hidden (view full) --- 1522#endif 1523 } 1524 INP_WLOCK_ASSERT(tp->t_inpcb); 1525 KASSERT(tp->t_state > TCPS_LISTEN, ("%s: TCPS_LISTEN", 1526 __func__)); 1527 KASSERT(tp->t_state != TCPS_TIME_WAIT, ("%s: TCPS_TIME_WAIT", 1528 __func__)); 1529 |
| 1530#ifdef TCPPCAP 1531 /* Save segment, if requested. */ 1532 tcp_pcap_add(th, m, &(tp->t_inpkts)); 1533#endif 1534 |
|
| 1527 /* 1528 * Segment received on connection. 1529 * Reset idle time and keep-alive timer. 1530 * XXX: This should be done after segment 1531 * validation to ignore broken/spoofed segs. 1532 */ 1533 tp->t_rcvtime = ticks; 1534 if (TCPS_HAVEESTABLISHED(tp->t_state)) --- 2191 unchanged lines hidden --- | 1535 /* 1536 * Segment received on connection. 1537 * Reset idle time and keep-alive timer. 1538 * XXX: This should be done after segment 1539 * validation to ignore broken/spoofed segs. 1540 */ 1541 tp->t_rcvtime = ticks; 1542 if (TCPS_HAVEESTABLISHED(tp->t_state)) --- 2191 unchanged lines hidden --- |