| tcp_input.c (317368) | tcp_input.c (319399) |
|---|---|
| 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: stable/11/sys/netinet/tcp_input.c 317368 2017-04-24 11:34:02Z smh $"); | 51__FBSDID("$FreeBSD: stable/11/sys/netinet/tcp_input.c 319399 2017-06-01 08:29:08Z tuexen $"); |
| 52 53#include "opt_inet.h" 54#include "opt_inet6.h" 55#include "opt_ipsec.h" 56#include "opt_tcpdebug.h" 57 58#include <sys/param.h> 59#include <sys/kernel.h> --- 1531 unchanged lines hidden (view full) --- 1591 KASSERT(tp->t_state != TCPS_TIME_WAIT, ("%s: TCPS_TIME_WAIT", 1592 __func__)); 1593 1594#ifdef TCPPCAP 1595 /* Save segment, if requested. */ 1596 tcp_pcap_add(th, m, &(tp->t_inpkts)); 1597#endif 1598 | 52 53#include "opt_inet.h" 54#include "opt_inet6.h" 55#include "opt_ipsec.h" 56#include "opt_tcpdebug.h" 57 58#include <sys/param.h> 59#include <sys/kernel.h> --- 1531 unchanged lines hidden (view full) --- 1591 KASSERT(tp->t_state != TCPS_TIME_WAIT, ("%s: TCPS_TIME_WAIT", 1592 __func__)); 1593 1594#ifdef TCPPCAP 1595 /* Save segment, if requested. */ 1596 tcp_pcap_add(th, m, &(tp->t_inpkts)); 1597#endif 1598 |
| 1599 if ((thflags & TH_SYN) && (thflags & TH_FIN) && V_drop_synfin) { 1600 if ((s = tcp_log_addrs(inc, th, NULL, NULL))) { 1601 log(LOG_DEBUG, "%s; %s: " 1602 "SYN|FIN segment ignored (based on " 1603 "sysctl setting)\n", s, __func__); 1604 free(s, M_TCPLOG); 1605 } 1606 goto drop; 1607 } 1608 |
|
| 1599 /* 1600 * Segment received on connection. 1601 * Reset idle time and keep-alive timer. 1602 * XXX: This should be done after segment 1603 * validation to ignore broken/spoofed segs. 1604 */ 1605 tp->t_rcvtime = ticks; 1606 if (TCPS_HAVEESTABLISHED(tp->t_state)) --- 2251 unchanged lines hidden --- | 1609 /* 1610 * Segment received on connection. 1611 * Reset idle time and keep-alive timer. 1612 * XXX: This should be done after segment 1613 * validation to ignore broken/spoofed segs. 1614 */ 1615 tp->t_rcvtime = ticks; 1616 if (TCPS_HAVEESTABLISHED(tp->t_state)) --- 2251 unchanged lines hidden --- |