mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: http: convert conn->addr.from to conn->src in sample fetches

Browse Source 
These calls are safe because the address' validity was already checked
prior to reaching that code.
This commit is contained in:
Willy Tarreau 2019-07-17 17:13:50 +02:00
parent 44a7d8ee89
commit 9a1efe1e15
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/http_fetch.c
View File

@ -34,6 +34,7 @@
#include <proto/arg.h>
#include <proto/auth.h>
#include <proto/channel.h>
#include <proto/connection.h>
#include <proto/http_fetch.h>
#include <proto/http_htx.h>
#include <proto/log.h>
@ -1089,16 +1090,16 @@ static int smp_fetch_base32_src(const struct arg *args, struct sample *smp, cons
*(unsigned int *) temp->area = htonl(smp->data.u.sint);
temp->data += sizeof(unsigned int);
switch (cli_conn->addr.from.ss_family) {
switch (cli_conn->src->ss_family) {
case AF_INET:
memcpy(temp->area + temp->data,
&((struct sockaddr_in *)&cli_conn->addr.from)->sin_addr,
&((struct sockaddr_in *)cli_conn->src)->sin_addr,
4);
temp->data += 4;
break;
case AF_INET6:
memcpy(temp->area + temp->data,
&((struct sockaddr_in6 *)&cli_conn->addr.from)->sin6_addr,
&((struct sockaddr_in6 *)cli_conn->src)->sin6_addr,
16);
temp->data += 16;
break;
@ -1794,16 +1795,16 @@ static int smp_fetch_url32_src(const struct arg *args, struct sample *smp, const
*(unsigned int *) temp->area = htonl(smp->data.u.sint);
temp->data += sizeof(unsigned int);
switch (cli_conn->addr.from.ss_family) {
switch (cli_conn->src->ss_family) {
case AF_INET:
memcpy(temp->area + temp->data,
&((struct sockaddr_in *)&cli_conn->addr.from)->sin_addr,
&((struct sockaddr_in *)cli_conn->src)->sin_addr,
4);
temp->data += 4;
break;
case AF_INET6:
memcpy(temp->area + temp->data,
&((struct sockaddr_in6 *)&cli_conn->addr.from)->sin6_addr,
&((struct sockaddr_in6 *)cli_conn->src)->sin6_addr,
16);
temp->data += 16;
break;