From e8540b3f2643cd07ad1745bb48b09fd9c208a706 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Thu, 16 Sep 2021 08:26:01 +0200 Subject: pasta, tcp: Don't reset 'never_read' flag on write retries Signed-off-by: Stefano Brivio --- tcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tcp.c b/tcp.c index b398bbe..d5a45e4 100644 --- a/tcp.c +++ b/tcp.c @@ -2577,7 +2577,7 @@ static void tcp_conn_from_sock(struct ctx *c, union epoll_ref ref, void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref, uint32_t events) { - int move_from, move_to, *pipes, eof; + int move_from, move_to, *pipes, eof, never_read; struct tcp_splice_conn *conn; struct epoll_event ev; @@ -2657,9 +2657,10 @@ void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref, swap: eof = 0; + never_read = 1; while (1) { - int never_read = 1, retry_write = 1; + int retry_write = 1; ssize_t read, to_write = 0, written; retry: -- cgit v1.2.3