From: Christopher Faulet Date: Mon, 1 Mar 2021 10:21:14 +0000 (+0100) Subject: BUG/MINOR: tcp-act: Don't forget to set the original port for IPv4 set-dst rule X-Git-Tag: v2.4-dev11~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e01ca0fbc9c72de95514816e016a58c5a28ab2a8;p=thirdparty%2Fhaproxy.git BUG/MINOR: tcp-act: Don't forget to set the original port for IPv4 set-dst rule If an IPv4 is set via a TCP/HTTP set-dst rule, the original port must be preserved or set to 0 if the previous family was neither AF_INET nor AF_INET6. The first case is not an issue because the port remains the same. But if the previous family was, for instance, AF_UNIX, the port is not set to 0 and have an undefined value. This patch must be backported as far as 1.7. --- diff --git a/src/tcp_act.c b/src/tcp_act.c index 0c6b7233a0..38da91f89d 100644 --- a/src/tcp_act.c +++ b/src/tcp_act.c @@ -91,6 +91,7 @@ static enum act_return tcp_action_req_set_dst(struct act_rule *rule, struct prox if (smp->data.type == SMP_T_IPV4) { ((struct sockaddr_in *)cli_conn->dst)->sin_family = AF_INET; ((struct sockaddr_in *)cli_conn->dst)->sin_addr.s_addr = smp->data.u.ipv4.s_addr; + ((struct sockaddr_in *)cli_conn->dst)->sin_port = port; } else if (smp->data.type == SMP_T_IPV6) { ((struct sockaddr_in6 *)cli_conn->dst)->sin6_family = AF_INET6; memcpy(&((struct sockaddr_in6 *)cli_conn->dst)->sin6_addr, &smp->data.u.ipv6, sizeof(struct in6_addr));