Deleted Added
full compact
tcp_output.c (258622) tcp_output.c (262763)
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 258622 2013-11-26 08:46:27Z avg $");
33__FBSDID("$FreeBSD: head/sys/netinet/tcp_output.c 262763 2014-03-05 01:17:47Z glebius $");
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>

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

1189 TCP_PROBE5(send, NULL, tp, ip6, tp, th);
1190
1191 /* TODO: IPv6 IP6TOS_ECT bit on */
1192 error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ro,
1193 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0),
1194 NULL, NULL, tp->t_inpcb);
1195
1196 if (error == EMSGSIZE && ro.ro_rt != NULL)
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>

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

1189 TCP_PROBE5(send, NULL, tp, ip6, tp, th);
1190
1191 /* TODO: IPv6 IP6TOS_ECT bit on */
1192 error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ro,
1193 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0),
1194 NULL, NULL, tp->t_inpcb);
1195
1196 if (error == EMSGSIZE && ro.ro_rt != NULL)
1197 mtu = ro.ro_rt->rt_rmx.rmx_mtu;
1197 mtu = ro.ro_rt->rt_mtu;
1198 RO_RTFREE(&ro);
1199 }
1200#endif /* INET6 */
1201#if defined(INET) && defined(INET6)
1202 else
1203#endif
1204#ifdef INET
1205 {

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

1227
1228 TCP_PROBE5(send, NULL, tp, ip, tp, th);
1229
1230 error = ip_output(m, tp->t_inpcb->inp_options, &ro,
1231 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
1232 tp->t_inpcb);
1233
1234 if (error == EMSGSIZE && ro.ro_rt != NULL)
1198 RO_RTFREE(&ro);
1199 }
1200#endif /* INET6 */
1201#if defined(INET) && defined(INET6)
1202 else
1203#endif
1204#ifdef INET
1205 {

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

1227
1228 TCP_PROBE5(send, NULL, tp, ip, tp, th);
1229
1230 error = ip_output(m, tp->t_inpcb->inp_options, &ro,
1231 ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
1232 tp->t_inpcb);
1233
1234 if (error == EMSGSIZE && ro.ro_rt != NULL)
1235 mtu = ro.ro_rt->rt_rmx.rmx_mtu;
1235 mtu = ro.ro_rt->rt_mtu;
1236 RO_RTFREE(&ro);
1237 }
1238#endif /* INET */
1239
1240out:
1241 /*
1242 * In transmit state, time the transmission and arrange for
1243 * the retransmit. In persist state, just set snd_max.

--- 337 unchanged lines hidden ---
1236 RO_RTFREE(&ro);
1237 }
1238#endif /* INET */
1239
1240out:
1241 /*
1242 * In transmit state, time the transmission and arrange for
1243 * the retransmit. In persist state, just set snd_max.

--- 337 unchanged lines hidden ---