From 0ca24aa028159874d77677076a835930de79ba8d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 29 Mar 2019 17:35:32 +0100 Subject: [PATCH] BUILD: connection: fix naming of ip_v field 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. --- src/connection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/connection.c b/src/connection.c index 37e48c528..303f6df42 100644 --- a/src/connection.c +++ b/src/connection.c @@ -789,7 +789,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag) { char *line; uint32_t hdr_len; - uint8_t ip_v; + uint8_t ip_ver; int ret; /* 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; /* 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 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; } - else if (ip_v == 6) { + else if (ip_ver == 6) { struct ip6_hdr *hdr_ip6; struct my_tcphdr *hdr_tcp;