From 4be5446dc4e5f6649bb5df907055c2e1fc0ea062 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Fri, 27 Mar 2026 15:37:04 +0100 Subject: [PATCH] MINOR: tcpcheck: Add a function to stringify the healthcheck type tcpcheck_ruleset_type_to_str() function is created to return a string corresponding to a tcpcheck type. --- include/haproxy/tcpcheck.h | 16 ++++++++++++++++ src/check.c | 14 +------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/haproxy/tcpcheck.h b/include/haproxy/tcpcheck.h index cab0b6732..c90cbe7fc 100644 --- a/include/haproxy/tcpcheck.h +++ b/include/haproxy/tcpcheck.h @@ -129,6 +129,22 @@ static inline int tcpchk_rules_type_to_proto_mode(int tcpchk_rules_type) return mode; } +static inline const char *tcpcheck_ruleset_type_to_str(struct tcpcheck_ruleset *rs) +{ + switch (rs->flags & TCPCHK_RULES_PROTO_CHK) { + case TCPCHK_RULES_PGSQL_CHK: return "PGSQL"; break; + case TCPCHK_RULES_REDIS_CHK: return "REDIS"; break; + case TCPCHK_RULES_SMTP_CHK: return "SMTP"; break; + case TCPCHK_RULES_HTTP_CHK: return "HTTP"; break; + case TCPCHK_RULES_MYSQL_CHK: return "MYSQL"; break; + case TCPCHK_RULES_LDAP_CHK: return "LDAP"; break; + case TCPCHK_RULES_SSL3_CHK: return "SSL3"; break; + case TCPCHK_RULES_AGENT_CHK: return "AGENT"; break; + case TCPCHK_RULES_SPOP_CHK: return "SPOP"; break; + case TCPCHK_RULES_TCP_CHK: return "TCP"; break; + default: return "???"; break; + } +} #endif /* _HAPROXY_TCPCHECK_H */ /* diff --git a/src/check.c b/src/check.c index 5b33e85c4..b13a9f8ee 100644 --- a/src/check.c +++ b/src/check.c @@ -235,19 +235,7 @@ static void check_trace(enum trace_level level, uint64_t mask, if (mask & CHK_EV_TCPCHK) { const char *type; - switch (check->tcpcheck->rs->flags & TCPCHK_RULES_PROTO_CHK) { - case TCPCHK_RULES_PGSQL_CHK: type = "PGSQL"; break; - case TCPCHK_RULES_REDIS_CHK: type = "REDIS"; break; - case TCPCHK_RULES_SMTP_CHK: type = "SMTP"; break; - case TCPCHK_RULES_HTTP_CHK: type = "HTTP"; break; - case TCPCHK_RULES_MYSQL_CHK: type = "MYSQL"; break; - case TCPCHK_RULES_LDAP_CHK: type = "LDAP"; break; - case TCPCHK_RULES_SSL3_CHK: type = "SSL3"; break; - case TCPCHK_RULES_AGENT_CHK: type = "AGENT"; break; - case TCPCHK_RULES_SPOP_CHK: type = "SPOP"; break; - case TCPCHK_RULES_TCP_CHK: type = "TCP"; break; - default: type = "???"; break; - } + type = tcpcheck_ruleset_type_to_str(check->tcpcheck->rs); if (check->current_step) chunk_appendf(&trace_buf, " - tcp-check=(%s,%d)", type, tcpcheck_get_step_id(check, NULL)); else