diff options
author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-01-07 17:50:43 +0000 |
---|---|---|
committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-01-07 17:50:43 +0000 |
commit | ba8c20f2e182424ed1367b88d68e34f4af4c4ca3 (patch) | |
tree | 03d05a1b68a921ce094af5e6f7d44820280a8a6b /sys/netinet6/in6_proto.c | |
parent | 1f7e102bf0ea0844d71f0ac775bc385b4b7ffdd7 (diff) |
Add socket option SO_SPLICE to splice together two TCP sockets.
The data received on the source socket will automatically be sent
on the drain socket. This allows to write relay daemons with zero
data copy.
ok markus@
Diffstat (limited to 'sys/netinet6/in6_proto.c')
-rw-r--r-- | sys/netinet6/in6_proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 11c29783988..7d40de9db8f 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.59 2010/07/08 19:42:46 jsg Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.60 2011/01/07 17:50:42 bluhm Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -137,7 +137,7 @@ struct ip6protosw inet6sw[] = { 0, 0, 0, udp_sysctl, }, -{ SOCK_STREAM, &inet6domain, IPPROTO_TCP, PR_CONNREQUIRED|PR_WANTRCVD|PR_ABRTACPTDIS, +{ SOCK_STREAM, &inet6domain, IPPROTO_TCP, PR_CONNREQUIRED|PR_WANTRCVD|PR_ABRTACPTDIS|PR_SPLICE, tcp6_input, 0, tcp6_ctlinput, tcp_ctloutput, tcp_usrreq, #ifdef INET /* don't call initialization and timeout routines twice */ |