Deleted Added
full compact
tcp_output.c (287775) tcp_output.c (289276)
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 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

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

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_output.c 8.4 (Berkeley) 5/24/95
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 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

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

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_output.c 8.4 (Berkeley) 5/24/95
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet/tcp_output.c 287775 2015-09-14 08:36:22Z hselasky $");
33__FBSDID("$FreeBSD: head/sys/netinet/tcp_output.c 289276 2015-10-14 00:35:37Z hiren $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_ipsec.h"
38#include "opt_tcpdebug.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

69#include <netinet6/ip6_var.h>
70#endif
71#define TCPOUTFLAGS
72#include <netinet/tcp_fsm.h>
73#include <netinet/tcp_seq.h>
74#include <netinet/tcp_timer.h>
75#include <netinet/tcp_var.h>
76#include <netinet/tcpip.h>
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_ipsec.h"
38#include "opt_tcpdebug.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

69#include <netinet6/ip6_var.h>
70#endif
71#define TCPOUTFLAGS
72#include <netinet/tcp_fsm.h>
73#include <netinet/tcp_seq.h>
74#include <netinet/tcp_timer.h>
75#include <netinet/tcp_var.h>
76#include <netinet/tcpip.h>
77#ifdef TCPPCAP
78#include <netinet/tcp_pcap.h>
79#endif
77#ifdef TCPDEBUG
78#include <netinet/tcp_debug.h>
79#endif
80#ifdef TCP_OFFLOAD
81#include <netinet/tcp_offload.h>
82#endif
83
84#ifdef IPSEC

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

1300 else
1301 tp->t_flags2 &= ~TF2_PLPMTU_PMTUD;
1302
1303 if (tp->t_state == TCPS_SYN_SENT)
1304 TCP_PROBE5(connect__request, NULL, tp, ip6, tp, th);
1305
1306 TCP_PROBE5(send, NULL, tp, ip6, tp, th);
1307
80#ifdef TCPDEBUG
81#include <netinet/tcp_debug.h>
82#endif
83#ifdef TCP_OFFLOAD
84#include <netinet/tcp_offload.h>
85#endif
86
87#ifdef IPSEC

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

1303 else
1304 tp->t_flags2 &= ~TF2_PLPMTU_PMTUD;
1305
1306 if (tp->t_state == TCPS_SYN_SENT)
1307 TCP_PROBE5(connect__request, NULL, tp, ip6, tp, th);
1308
1309 TCP_PROBE5(send, NULL, tp, ip6, tp, th);
1310
1311#ifdef TCPPCAP
1312 /* Save packet, if requested. */
1313 tcp_pcap_add(th, m, &(tp->t_outpkts));
1314#endif
1315
1308 /* TODO: IPv6 IP6TOS_ECT bit on */
1309 error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ro,
1310 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0),
1311 NULL, NULL, tp->t_inpcb);
1312
1313 if (error == EMSGSIZE && ro.ro_rt != NULL)
1314 mtu = ro.ro_rt->rt_mtu;
1315 RO_RTFREE(&ro);

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

1343 tp->t_flags2 &= ~TF2_PLPMTU_PMTUD;
1344 }
1345
1346 if (tp->t_state == TCPS_SYN_SENT)
1347 TCP_PROBE5(connect__request, NULL, tp, ip, tp, th);
1348
1349 TCP_PROBE5(send, NULL, tp, ip, tp, th);
1350
1316 /* TODO: IPv6 IP6TOS_ECT bit on */
1317 error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ro,
1318 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0),
1319 NULL, NULL, tp->t_inpcb);
1320
1321 if (error == EMSGSIZE && ro.ro_rt != NULL)
1322 mtu = ro.ro_rt->rt_mtu;
1323 RO_RTFREE(&ro);

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

1351 tp->t_flags2 &= ~TF2_PLPMTU_PMTUD;
1352 }
1353
1354 if (tp->t_state == TCPS_SYN_SENT)
1355 TCP_PROBE5(connect__request, NULL, tp, ip, tp, th);
1356
1357 TCP_PROBE5(send, NULL, tp, ip, tp, th);
1358
1359#ifdef TCPPCAP
1360 /* Save packet, if requested. */
1361 tcp_pcap_add(th, m, &(tp->t_outpkts));
1362#endif
1363
1351 error = ip_output(m, tp->t_inpcb->inp_options, &ro,
1352 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
1353 tp->t_inpcb);
1354
1355 if (error == EMSGSIZE && ro.ro_rt != NULL)
1356 mtu = ro.ro_rt->rt_mtu;
1357 RO_RTFREE(&ro);
1358 }

--- 367 unchanged lines hidden ---
1364 error = ip_output(m, tp->t_inpcb->inp_options, &ro,
1365 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
1366 tp->t_inpcb);
1367
1368 if (error == EMSGSIZE && ro.ro_rt != NULL)
1369 mtu = ro.ro_rt->rt_mtu;
1370 RO_RTFREE(&ro);
1371 }

--- 367 unchanged lines hidden ---