mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-25 21:01:09 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: backend: Get client dst address to set the server's one only if needful

Browse Source 
In alloc_dst_address(), the client destination address must only be
retrieved when we are sure to use it. Most of time, this save a syscall to
getsockname(). It is not a bugfix in itself. But it revealed a bug in the
QUIC part. The CO_FL_ADDR_TO_SET flag is not set when the destination
address is create for anew quic client connection.
This commit is contained in:
Christopher Faulet 2021-11-05 12:02:56 +01:00
parent b0006eee09
commit 34a3eb4c42
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend.c
View File

@ -846,18 +846,18 @@ static int alloc_dst_address(struct sockaddr_storage **ss,
**ss = srv->addr; **ss = srv->addr;
set_host_port(*ss, srv->svc_port); set_host_port(*ss, srv->svc_port);
dst = si_dst(&s->si[0]); if (!is_addr(*ss)) {
if (!is_addr(*ss) && dst) {
/* if the server has no address, we use the same address /* if the server has no address, we use the same address
* the client asked, which is handy for remapping ports * the client asked, which is handy for remapping ports
* locally on multiple addresses at once. Nothing is done * locally on multiple addresses at once. Nothing is done
* for AF_UNIX addresses. * for AF_UNIX addresses.
*/ */
if (dst->ss_family == AF_INET) { dst = si_dst(&s->si[0]);
if (dst && dst->ss_family == AF_INET) {
((struct sockaddr_in *)*ss)->sin_family = AF_INET; ((struct sockaddr_in *)*ss)->sin_family = AF_INET;
((struct sockaddr_in *)*ss)->sin_addr = ((struct sockaddr_in *)*ss)->sin_addr =
((struct sockaddr_in *)dst)->sin_addr; ((struct sockaddr_in *)dst)->sin_addr;
} else if (dst->ss_family == AF_INET6) { } else if (dst && dst->ss_family == AF_INET6) {
((struct sockaddr_in6 *)*ss)->sin6_family = AF_INET6; ((struct sockaddr_in6 *)*ss)->sin6_family = AF_INET6;
((struct sockaddr_in6 *)*ss)->sin6_addr = ((struct sockaddr_in6 *)*ss)->sin6_addr =
((struct sockaddr_in6 *)dst)->sin6_addr; ((struct sockaddr_in6 *)dst)->sin6_addr;
@ -866,9 +866,11 @@ static int alloc_dst_address(struct sockaddr_storage **ss,
/* if this server remaps proxied ports, we'll use /* if this server remaps proxied ports, we'll use
* the port the client connected to with an offset. */ * the port the client connected to with an offset. */
if ((srv->flags & SRV_F_MAPPORTS) && dst) { if ((srv->flags & SRV_F_MAPPORTS)) {
int base_port; int base_port;
dst = si_dst(&s->si[0]);
if (dst) {
/* First, retrieve the port from the incoming connection */ /* First, retrieve the port from the incoming connection */
base_port = get_host_port(dst); base_port = get_host_port(dst);
@ -877,6 +879,7 @@ static int alloc_dst_address(struct sockaddr_storage **ss,
set_host_port(*ss, base_port); set_host_port(*ss, base_port);
} }
} }
}
else if (s->be->options & PR_O_DISPATCH) { else if (s->be->options & PR_O_DISPATCH) {
if (!sockaddr_alloc(ss, NULL, 0)) if (!sockaddr_alloc(ss, NULL, 0))
return SRV_STATUS_INTERNAL; return SRV_STATUS_INTERNAL;
@ -885,12 +888,12 @@ static int alloc_dst_address(struct sockaddr_storage **ss,
**ss = s->be->dispatch_addr; **ss = s->be->dispatch_addr;
} }
else if ((s->be->options & PR_O_TRANSP)) { else if ((s->be->options & PR_O_TRANSP)) {
dst = si_dst(&s->si[0]); if (!sockaddr_alloc(ss, NULL, 0))
if (!dst || !sockaddr_alloc(ss, NULL, 0))
return SRV_STATUS_INTERNAL; return SRV_STATUS_INTERNAL;
/* in transparent mode, use the original dest addr if no dispatch specified */ /* in transparent mode, use the original dest addr if no dispatch specified */
if ((dst->ss_family == AF_INET || dst->ss_family == AF_INET6)) dst = si_dst(&s->si[0]);
if (dst && (dst->ss_family == AF_INET || dst->ss_family == AF_INET6))
**ss = *dst; **ss = *dst;
} }
else { else {