At the end of tcp_splice_forward(), we check for half-closed connections
and propagate the FIN to the other side with a shutdown(2). Currently we
check for a half closed connection in either direction. That's unnecessary
here, because tcp_splice_forward() will already be called for each
direction if there are any relevant events.
Signed-off-by: David Gibson
---
tcp_splice.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/tcp_splice.c b/tcp_splice.c
index b45f0060..e5018f2e 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -582,21 +582,15 @@ retry:
break;
}
- if (!conn->pending[fromsidei] &&
- conn->events & FIN_RCVD(fromsidei)) {
- unsigned sidei;
-
- flow_foreach_sidei(sidei) {
- if ((conn->events & FIN_RCVD(sidei)) &&
- !(conn->events & FIN_SENT(!sidei))) {
- if (shutdown(conn->s[!sidei], SHUT_WR) < 0) {
- flow_perror(conn, "shutdown() on %s",
- pif_name(conn->f.pif[!sidei]));
- return -1;
- }
- conn_event(conn, FIN_SENT(!sidei));
- }
+ if ((conn->events & FIN_RCVD(fromsidei)) &&
+ !(conn->events & FIN_SENT(!fromsidei)) &&
+ !conn->pending[fromsidei]) {
+ if (shutdown(conn->s[!fromsidei], SHUT_WR) < 0) {
+ flow_perror(conn, "shutdown() on %s",
+ pif_name(conn->f.pif[!fromsidei]));
+ return -1;
}
+ conn_event(conn, FIN_SENT(!fromsidei));
}
return 0;
--
2.54.0