Deleted Added
full compact
tcp_usrreq.c (166405) tcp_usrreq.c (166433)
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California.
4 * Copyright (c) 2006 Robert N. M. Watson
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California.
4 * Copyright (c) 2006 Robert N. M. Watson
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
32 * $FreeBSD: head/sys/netinet/tcp_usrreq.c 166405 2007-02-01 18:32:13Z andre $
32 * $FreeBSD: head/sys/netinet/tcp_usrreq.c 166433 2007-02-02 18:34:18Z bms $
33 */
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>

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

1240 ti->tcpi_options |= TCPI_OPT_TIMESTAMPS;
1241 if (tp->sack_enable)
1242 ti->tcpi_options |= TCPI_OPT_SACK;
1243 if ((tp->t_flags & TF_REQ_SCALE) && (tp->t_flags & TF_RCVD_SCALE)) {
1244 ti->tcpi_options |= TCPI_OPT_WSCALE;
1245 ti->tcpi_snd_wscale = tp->snd_scale;
1246 ti->tcpi_rcv_wscale = tp->rcv_scale;
1247 }
33 */
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>

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

1240 ti->tcpi_options |= TCPI_OPT_TIMESTAMPS;
1241 if (tp->sack_enable)
1242 ti->tcpi_options |= TCPI_OPT_SACK;
1243 if ((tp->t_flags & TF_REQ_SCALE) && (tp->t_flags & TF_RCVD_SCALE)) {
1244 ti->tcpi_options |= TCPI_OPT_WSCALE;
1245 ti->tcpi_snd_wscale = tp->snd_scale;
1246 ti->tcpi_rcv_wscale = tp->rcv_scale;
1247 }
1248
1249 ti->tcpi_rtt = ((u_int64_t)tp->t_srtt * tick) >> TCP_RTT_SHIFT;
1250 ti->tcpi_rttvar = ((u_int64_t)tp->t_rttvar * tick) >> TCP_RTTVAR_SHIFT;
1251
1248 ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
1249 ti->tcpi_snd_cwnd = tp->snd_cwnd;
1250
1251 /*
1252 * FreeBSD-specific extension fields for tcp_info.
1253 */
1254 ti->tcpi_rcv_space = tp->rcv_wnd;
1255 ti->tcpi_snd_wnd = tp->snd_wnd;

--- 324 unchanged lines hidden ---
1252 ti->tcpi_snd_ssthresh = tp->snd_ssthresh;
1253 ti->tcpi_snd_cwnd = tp->snd_cwnd;
1254
1255 /*
1256 * FreeBSD-specific extension fields for tcp_info.
1257 */
1258 ti->tcpi_rcv_space = tp->rcv_wnd;
1259 ti->tcpi_snd_wnd = tp->snd_wnd;

--- 324 unchanged lines hidden ---