From: William Lallemand <wlallemand@haproxy.org>
Date: Mon, 25 Jul 2022 14:04:38 +0000 (+0200)
Subject: MINOR: sockpair: move send_fd_uxst() error message in caller
X-Git-Tag: v2.7-dev3~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708949da492a27e874d2c4615c41633c9f55588a;p=thirdparty%2Fhaproxy.git

MINOR: sockpair: move send_fd_uxst() error message in caller

Move the ha_alert() in send_fd_uxst() in the callers and add the FD
numbers in the message.
---

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 60880b2905..1c5d7422f7 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -245,7 +245,6 @@ int send_fd_uxst(int fd, int send_fd)
 	memcpy(fdptr, &send_fd, sizeof(send_fd));
 
 	if (sendmsg(fd, &msghdr, 0) != sizeof(iobuf)) {
-		ha_warning("Failed to transfer socket\n");
 		return -1;
 	}
 
@@ -341,6 +340,7 @@ static int sockpair_connect_server(struct connection *conn, int flags)
 	/* The new socket is sent on the other side, it should be retrieved and
 	 * considered as an 'accept' socket on the server side */
 	if (send_fd_uxst(dst_fd, sv[0]) == -1) {
+		ha_alert("socketpair: Cannot transfer the fd %d over sockpair@%d. Giving up.\n", sv[0], dst_fd);
 		close(sv[0]);
 		close(sv[1]);
 		conn->err_code = CO_ER_SOCK_ERR;
diff --git a/src/sock.c b/src/sock.c
index a74e8194b2..1482c1a4f6 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -322,7 +322,7 @@ int sock_get_old_sockets(const char *unixsocket)
 		}
 
 		if (send_fd_uxst(dst_fd, sv[0]) == -1) {
-			ha_alert("socketpair: cannot transfer socket.\n");
+			ha_alert("socketpair: Cannot transfer the fd %d over sockpair@%d. Giving up.\n", sv[0], dst_fd);
 			close(sv[0]);
 			close(sv[1]);
 			goto out;