diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-11-21 06:56:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:54:44 -0500 |
commit | 8e8c71f1ab0ca1c4e74efad14533b991524dcb6c (patch) | |
tree | ab9cf593ce85ca9eb278ccb1b683fbe459686cbd /net/dccp/proto.c | |
parent | 9b91ad2747891767c0efb4fb965c5dfed8d4f88e (diff) |
[DCCP]: Honour and make use of shutdown option set by user
This extends the DCCP socket API by honouring any shutdown(2) option set by the user.
The behaviour is, as much as possible, made consistent with the API for TCP's shutdown.
This patch exploits the information provided by the user via the socket API to reduce
processing costs:
* if the read end is closed (SHUT_RD), it is not necessary to deliver to input CCID;
* if the write end is closed (SHUT_WR), the same idea applies, but with a difference -
as long as the TX queue has not been drained, we need to receive feedback to keep
congestion-control rates up to date. Hence SHUT_WR is honoured only after the last
packet (under congestion control) has been sent;
* although SHUT_RDWR seems nonsensical, it is nevertheless supported in the same manner
as for TCP (and agrees with test for SHUTDOWN_MASK in dccp_poll() in net/dccp/proto.c).
Furthermore, most of the code already honours the sk_shutdown flags (dccp_recvmsg() for
instance sets the read length to 0 if SHUT_RD had been called); CCID handling is now added
to this by the present patch.
There will also no longer be any delivery when the socket is in the final stages, i.e. when
one of dccp_close(), dccp_fin(), or dccp_done() has been called - which is fine since at
that stage the connection is its final stages.
Motivation and background are on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/shutdown
A FIXME has been added to notify the other end if SHUT_RD has been set (RFC 4340, 11.7).
Note: There is a comment in inet_shutdown() in net/ipv4/af_inet.c which asks to "make
sure the socket is a TCP socket". This should probably be extended to mean
`TCP or DCCP socket' (the code is also used by UDP and raw sockets).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r-- | net/dccp/proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 7a3bea9c28c1..0aec73592124 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -981,7 +981,7 @@ EXPORT_SYMBOL_GPL(dccp_close); | |||
981 | 981 | ||
982 | void dccp_shutdown(struct sock *sk, int how) | 982 | void dccp_shutdown(struct sock *sk, int how) |
983 | { | 983 | { |
984 | dccp_pr_debug("entry\n"); | 984 | dccp_pr_debug("called shutdown(%x)\n", how); |
985 | } | 985 | } |
986 | 986 | ||
987 | EXPORT_SYMBOL_GPL(dccp_shutdown); | 987 | EXPORT_SYMBOL_GPL(dccp_shutdown); |