in the same manner of checkport flag, we found out some consistency
problem. For instance, SRV_F_AGENTADDR flag is set when the "addr"
option is set on a server line but not for the "agent-addr" option.
The issue is similar in the cli where we never set the flag.
A consequence of this patch is that agentaddr is no longer used, at
least for now. We might reintroduced it later if we need it.
Signed-off-by: William Dauchy <wdau...@gmail.com>
---
include/haproxy/server-t.h | 2 --
src/check.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 131b97cb6..382caa218 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -138,8 +138,6 @@ enum srv_initaddr {
#define SRV_F_NON_STICK 0x0004 /* never add connections allocated to
this server to a stick table */
#define SRV_F_USE_NS_FROM_PP 0x0008 /* use namespace associated with
connection if present */
#define SRV_F_FORCED_ID 0x0010 /* server's ID was forced in the
configuration */
-#define SRV_F_CHECKADDR 0x0020 /* this server has a check addr
configured */
-#define SRV_F_AGENTADDR 0x0080 /* this server has a agent addr
configured */
#define SRV_F_COOKIESET 0x0100 /* this server has a cookie
configured, so don't generate dynamic cookies */
#define SRV_F_FASTOPEN 0x0200 /* Use TCP Fast Open to connect to
server */
#define SRV_F_SOCKS4_PROXY 0x0400 /* this server uses SOCKS4 proxy */
diff --git a/src/check.c b/src/check.c
index f4b11fc46..f4d5bd452 100644
--- a/src/check.c
+++ b/src/check.c
@@ -1527,8 +1527,6 @@ static int srv_parse_addr(char **args, int *cur_arg,
struct proxy *curpx, struct
}
srv->check.addr = srv->agent.addr = *sk;
- srv->flags |= SRV_F_CHECKADDR;
- srv->flags |= SRV_F_AGENTADDR;
out:
return err_code;
--
2.29.2
