From: Willy Tarreau <w@1wt.eu>
Date: Thu, 24 Sep 2020 16:20:37 +0000 (+0200)
Subject: MINOR: listeners: move fd_stop_recv() to the receiver's socket code
X-Git-Tag: v2.3-dev6~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e53608b2cdde551048d585fa5b60925c923c58f0;p=thirdparty%2Fhaproxy.git

MINOR: listeners: move fd_stop_recv() to the receiver's socket code

fd_stop_recv() has nothing to do in the generic listener code, it's per
protocol as some don't need it. For instance with abns@ it could even
lead to fd_stop_recv(-1). And later with QUIC we don't want to touch
the fd at all! It used to be that since commit f2cb169487 delegating
fd manipulation to their respective threads it wasn't possible to call
it down there but it's not the case anymore, so let's perform the action
in the protocol-specific code.
---

diff --git a/src/listener.c b/src/listener.c
index b2a6862ca9..39f5b340f6 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -362,7 +362,6 @@ int pause_listener(struct listener *l)
 
 	MT_LIST_DEL(&l->wait_queue);
 
-	fd_stop_recv(l->rx.fd);
 	listener_set_state(l, LI_PAUSED);
 
 	if (px && !px->li_ready) {
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 83b23b9b55..b9bc97e425 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -743,6 +743,7 @@ int tcp_pause_listener(struct listener *l)
 	if (shutdown(l->rx.fd, SHUT_RD) != 0)
 		goto check_already_done; /* show always be OK */
 
+	fd_stop_recv(l->rx.fd);
 	return 1;
 
  check_already_done:
@@ -752,11 +753,15 @@ int tcp_pause_listener(struct listener *l)
 	 */
 	opt_val = 0;
 	opt_len = sizeof(opt_val);
-	if (getsockopt(l->rx.fd, SOL_SOCKET, SO_ACCEPTCONN, &opt_val, &opt_len) == -1)
+	if (getsockopt(l->rx.fd, SOL_SOCKET, SO_ACCEPTCONN, &opt_val, &opt_len) == -1) {
+		fd_stop_recv(l->rx.fd);
 		return 0; /* the socket is really unrecoverable */
+	}
 
-	if (!opt_val)
+	if (!opt_val) {
+		fd_stop_recv(l->rx.fd);
 		return 1; /* already paused by another process */
+	}
 
 	/* something looks fishy here */
 	return -1;
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index bafe97dcfb..c477d193dc 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -151,7 +151,8 @@ static void uxst_add_listener(struct listener *listener, int port)
 /* Pause a listener. Returns < 0 in case of failure, 0 if the listener
  * was totally stopped, or > 0 if correctly paused. Nothing is done for
  * plain unix sockets since currently it's the new process which handles
- * the renaming. Abstract sockets are completely unbound.
+ * the renaming. Abstract sockets are completely unbound and closed so
+ * there's no need to stop the poller.
  */
 static int uxst_pause_listener(struct listener *l)
 {