diff options
| author |   mpi <mpi@openbsd.org> | 2014-03-27 13:27:28 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-03-27 13:27:28 +0000 |
| commit | 8da457310822e8b1189beb909ea6788297cc2213 (patch) | |
| tree | 00b05c41d3550fac5fe04e7ca13d25698327f534 /sys/netinet/tcp_output.c | |
| parent | +.Xr smtpd 8 (diff) | |
| download | wireguard-openbsd-8da457310822e8b1189beb909ea6788297cc2213.tar.xz wireguard-openbsd-8da457310822e8b1189beb909ea6788297cc2213.zip | |
Retire kernel support for SO_DONTROUTE, since the plan is to always
use the routing table there's no future for an option that wants to
bypass it. This option has never been implemented for IPv6 anyway,
so let's just remove the IPv4 bits that you weren't aware of.
Tested by florian@, man pages inputs from jmc@, ok benno@
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 4ef6806d37d..d0633905556 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.101 2013/10/24 11:31:43 mpi Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.102 2014/03/27 13:27:28 mpi Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -1076,9 +1076,7 @@ send: } error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, - (ip_mtudisc ? IP_MTUDISC : 0) | - (so->so_options & SO_DONTROUTE), - (void *)NULL, tp->t_inpcb); + (ip_mtudisc ? IP_MTUDISC : 0), NULL, tp->t_inpcb); break; #endif /* INET */ #ifdef INET6 @@ -1099,8 +1097,7 @@ send: } error = ip6_output(m, tp->t_inpcb->inp_outputopts6, &tp->t_inpcb->inp_route6, - (so->so_options & SO_DONTROUTE), NULL, NULL, - tp->t_inpcb); + 0, NULL, NULL, tp->t_inpcb); break; #endif /* INET6 */ } |