RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
William Lallemand 2022-07-25 16:04:38 +02:00
parent f67e8fb92c
commit 708949da49
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_sockpair.c
View File

@ -245,7 +245,6 @@ int send_fd_uxst(int fd, int send_fd)
memcpy(fdptr, &send_fd, sizeof(send_fd)); memcpy(fdptr, &send_fd, sizeof(send_fd));
if (sendmsg(fd, &msghdr, 0) != sizeof(iobuf)) { if (sendmsg(fd, &msghdr, 0) != sizeof(iobuf)) {
ha_warning("Failed to transfer socket\n");
return -1; 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 /* The new socket is sent on the other side, it should be retrieved and
* considered as an 'accept' socket on the server side */ * considered as an 'accept' socket on the server side */
if (send_fd_uxst(dst_fd, sv[0]) == -1) { 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[0]);
close(sv[1]); close(sv[1]);
conn->err_code = CO_ER_SOCK_ERR; conn->err_code = CO_ER_SOCK_ERR;

2
src/sock.c
View File

@ -322,7 +322,7 @@ int sock_get_old_sockets(const char *unixsocket)
} }
if (send_fd_uxst(dst_fd, sv[0]) == -1) { 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[0]);
close(sv[1]); close(sv[1]);
goto out; goto out;