mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: sockpair: use conn->dst for the target address in ->connect()

Browse Source 
No extra check is needed since the destination must be set there.
This commit is contained in:
Willy Tarreau 2019-07-17 16:42:04 +02:00
parent ca9f5a927a
commit 3f4fa0964c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proto_sockpair.c
View File

@ -215,7 +215,7 @@ int send_fd_uxst(int fd, int send_fd)
* This function works like uxst_connect_server but instead of creating a * This function works like uxst_connect_server but instead of creating a
* socket and establishing a connection, it creates a pair of connected * socket and establishing a connection, it creates a pair of connected
* sockets, and send one of them through the destination FD. The destination FD * sockets, and send one of them through the destination FD. The destination FD
* is stored in addr.to->sin_addr.s_addr during configuration parsing. * is stored in conn->dst->sin_addr.s_addr during configuration parsing.
* *
* conn->target may point either to a valid server or to a backend, depending * conn->target may point either to a valid server or to a backend, depending
* on conn->target. Only OBJ_TYPE_PROXY and OBJ_TYPE_SERVER are supported. The * on conn->target. Only OBJ_TYPE_PROXY and OBJ_TYPE_SERVER are supported. The
@ -242,7 +242,7 @@ static int sockpair_connect_server(struct connection *conn, int flags)
int sv[2], fd, dst_fd = -1; int sv[2], fd, dst_fd = -1;
/* the FD is stored in the sockaddr struct */ /* the FD is stored in the sockaddr struct */
dst_fd = ((struct sockaddr_in *)&conn->addr.to)->sin_addr.s_addr; dst_fd = ((struct sockaddr_in *)conn->dst)->sin_addr.s_addr;
if (obj_type(conn->target) != OBJ_TYPE_PROXY && if (obj_type(conn->target) != OBJ_TYPE_PROXY &&
obj_type(conn->target) != OBJ_TYPE_SERVER) { obj_type(conn->target) != OBJ_TYPE_SERVER) {