From: Willy Tarreau <w@1wt.eu>
Date: Tue, 13 Oct 2020 15:42:21 +0000 (+0200)
Subject: CLEANUP: unix: make use of sock_accept_conn() where relevant
X-Git-Tag: v2.3-dev7~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85d2ba6b78f12939ecaf8f3dcad8a693da1c8b66;p=thirdparty%2Fhaproxy.git

CLEANUP: unix: make use of sock_accept_conn() where relevant

This allows to get rid of one getsockopt(SO_ACCEPTCONN) in the binding
code.
---

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index d9d5a07b00..5cf16a7ad4 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -94,7 +94,6 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
 {
 	int fd, err;
 	int ready;
-	socklen_t ready_len;
 	char *msg = NULL;
 
 	err = ERR_NONE;
@@ -112,11 +111,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
 	}
 
 	fd = listener->rx.fd;
-
-	ready = 0;
-	ready_len = sizeof(ready);
-	if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &ready, &ready_len) == -1)
-		ready = 0;
+	ready = sock_accept_conn(&listener->rx) > 0;
 
 	if (!ready && /* only listen if not already done by external process */
 	    listen(fd, listener_backlog(listener)) < 0) {