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

BUILD: connection: fix naming of ip_v field

Browse Source 
AIX defines ip_v as ip_ff.ip_fv in netinet/ip.h using a macro, and
unfortunately we do have a local variable with such a name and which
uses the same header file. Let's rename the variable to ip_ver to fix
this.
This commit is contained in:
Willy Tarreau 2019-03-29 17:35:32 +01:00
parent a1bd1faeeb
commit 0ca24aa028
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/connection.c
View File

@ -789,7 +789,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
{ {
char *line; char *line;
uint32_t hdr_len; uint32_t hdr_len;
uint8_t ip_v; uint8_t ip_ver;
int ret; int ret;
/* we might have been called just after an asynchronous shutr */ /* we might have been called just after an asynchronous shutr */
@ -857,9 +857,9 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
goto missing; goto missing;
/* Get IP version from the first four bits */ /* Get IP version from the first four bits */
ip_v = (*line & 0xf0) >> 4; ip_ver = (*line & 0xf0) >> 4;
if (ip_v == 4) { if (ip_ver == 4) {
struct ip *hdr_ip4; struct ip *hdr_ip4;
struct my_tcphdr *hdr_tcp; struct my_tcphdr *hdr_tcp;
@ -889,7 +889,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
conn->flags |= CO_FL_ADDR_FROM_SET | CO_FL_ADDR_TO_SET; conn->flags |= CO_FL_ADDR_FROM_SET | CO_FL_ADDR_TO_SET;
} }
else if (ip_v == 6) { else if (ip_ver == 6) {
struct ip6_hdr *hdr_ip6; struct ip6_hdr *hdr_ip6;
struct my_tcphdr *hdr_tcp; struct my_tcphdr *hdr_tcp;