diff options
| author |   mpi <mpi@openbsd.org> | 2014-04-07 10:04:17 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-04-07 10:04:17 +0000 |
| commit | 8cedb4b1d113ed97d5c280c32c29f356047eca14 (patch) | |
| tree | cc14029d3461acfb7a376bef163269057e13e5d8 /sys/netinet/tcp_output.c | |
| parent | Update termtypes.master to upstream terminfo-20140329.src. (diff) | |
| download | wireguard-openbsd-8cedb4b1d113ed97d5c280c32c29f356047eca14.tar.xz wireguard-openbsd-8cedb4b1d113ed97d5c280c32c29f356047eca14.zip | |
Retire kernel support for SO_DONTROUTE, this time without breaking
localhost connections.
The plan is to always use the routing table for addresses and routes
resolutions, so there is 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 a least by lteo@, guenther@ and chrisz@, ok mikeb@, 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 7eec9e2d4c6..caacc1d8233 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.103 2014/03/28 08:33:51 sthen Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.104 2014/04/07 10:04:17 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 */ } |