| tcp_input.c (147637) | tcp_input.c (147666) |
|---|---|
| 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 147637 2005-06-27 22:27:42Z ps $ | 30 * $FreeBSD: head/sys/netinet/tcp_input.c 147666 2005-06-29 21:36:49Z simon $ |
| 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" --- 1038 unchanged lines hidden (view full) --- 1077 callout_reset(tp->tt_keep, tcp_keepidle, tcp_timer_keep, tp); 1078 1079 /* 1080 * Process options only when we get SYN/ACK back. The SYN case 1081 * for incoming connections is handled in tcp_syncache. 1082 * XXX this is traditional behavior, may need to be cleaned up. 1083 */ 1084 tcp_dooptions(&to, optp, optlen, thflags & TH_SYN); | 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" --- 1038 unchanged lines hidden (view full) --- 1077 callout_reset(tp->tt_keep, tcp_keepidle, tcp_timer_keep, tp); 1078 1079 /* 1080 * Process options only when we get SYN/ACK back. The SYN case 1081 * for incoming connections is handled in tcp_syncache. 1082 * XXX this is traditional behavior, may need to be cleaned up. 1083 */ 1084 tcp_dooptions(&to, optp, optlen, thflags & TH_SYN); |
| 1085 if (thflags & TH_SYN) { | 1085 if (tp->t_state == TCPS_SYN_SENT && (thflags & TH_SYN)) { |
| 1086 if (to.to_flags & TOF_SCALE) { 1087 tp->t_flags |= TF_RCVD_SCALE; 1088 tp->requested_s_scale = to.to_requested_s_scale; 1089 } 1090 if (to.to_flags & TOF_TS) { 1091 tp->t_flags |= TF_RCVD_TSTMP; 1092 tp->ts_recent = to.to_tsval; 1093 tp->ts_recent_age = ticks; --- 2149 unchanged lines hidden --- | 1086 if (to.to_flags & TOF_SCALE) { 1087 tp->t_flags |= TF_RCVD_SCALE; 1088 tp->requested_s_scale = to.to_requested_s_scale; 1089 } 1090 if (to.to_flags & TOF_TS) { 1091 tp->t_flags |= TF_RCVD_TSTMP; 1092 tp->ts_recent = to.to_tsval; 1093 tp->ts_recent_age = ticks; --- 2149 unchanged lines hidden --- |