mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: checks: define a tcp-check connect type

Browse Source 
The check rule itself is not changed, only its representation.
This commit is contained in:
Gaetan Rivet 2020-02-21 18:49:05 +01:00 committed by Christopher Faulet
parent 48219dc50e
commit 06d963aeca
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/types/checks.h
View File

@ -211,6 +211,16 @@ struct analyze_status {
unsigned char lr[HANA_OBS_SIZE]; /* result for l4/l7: 0 = ignore, 1 - error, 2 - OK */ unsigned char lr[HANA_OBS_SIZE]; /* result for l4/l7: 0 = ignore, 1 - error, 2 - OK */
}; };
#define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */
#define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */
#define TCPCHK_OPT_SSL 0x0002 /* SSL connection */
#define TCPCHK_OPT_LINGER 0x0004 /* Do not RST connection, let it linger */
struct tcpcheck_connect {
uint16_t port; /* port to connect to */
uint16_t options; /* options when setting up a new connection */
};
enum tcpcheck_send_type { enum tcpcheck_send_type {
TCPCHK_SEND_UNDEF = 0, /* Send is not parsed. */ TCPCHK_SEND_UNDEF = 0, /* Send is not parsed. */
TCPCHK_SEND_STRING, /* Send an ASCII string. */ TCPCHK_SEND_STRING, /* Send an ASCII string. */
@ -252,23 +262,16 @@ enum tcpcheck_rule_type {
TCPCHK_ACT_COMMENT, /* no action, simply a comment used for logs */ TCPCHK_ACT_COMMENT, /* no action, simply a comment used for logs */
}; };
/* flags used by tcpcheck_rule->conn_opts */
#define TCPCHK_OPT_NONE 0x0000 /* no options specified, default */
#define TCPCHK_OPT_SEND_PROXY 0x0001 /* send proxy-protocol string */
#define TCPCHK_OPT_SSL 0x0002 /* SSL connection */
#define TCPCHK_OPT_LINGER 0x0004 /* Do not RST connection, let it linger */
struct tcpcheck_rule { struct tcpcheck_rule {
struct list list; /* list linked to from the proxy */ struct list list; /* list linked to from the proxy */
enum tcpcheck_rule_type action; /* type of the rule. */ enum tcpcheck_rule_type action; /* type of the rule. */
int index; /* Index within the list. Starts at 0. */ int index; /* Index within the list. Starts at 0. */
char *comment; /* comment to be used in the logs and on the stats socket */ char *comment; /* comment to be used in the logs and on the stats socket */
union { union {
struct tcpcheck_connect connect; /* Connect rule. */
struct tcpcheck_send send; /* Send rule. */ struct tcpcheck_send send; /* Send rule. */
struct tcpcheck_expect expect; /* Expected pattern. */ struct tcpcheck_expect expect; /* Expected pattern. */
}; };
unsigned short port; /* port to connect to */
unsigned short conn_opts; /* options when setting up a new connection */
}; };
#endif /* _TYPES_CHECKS_H */ #endif /* _TYPES_CHECKS_H */

23
src/checks.c
View File

@ -635,8 +635,8 @@ static void chk_report_conn_err(struct check *check, int errno_bck, int expired)
chunk_printf(chk, " at step %d of tcp-check", step); chunk_printf(chk, " at step %d of tcp-check", step);
/* we were looking for a string */ /* we were looking for a string */
if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_CONNECT) { if (check->last_started_step && check->last_started_step->action == TCPCHK_ACT_CONNECT) {
if (check->last_started_step->port) if (check->last_started_step->connect.port)
chunk_appendf(chk, " (connect port %d)" ,check->last_started_step->port); chunk_appendf(chk, " (connect port %d)" ,check->last_started_step->connect.port);
else else
chunk_appendf(chk, " (connect)"); chunk_appendf(chk, " (connect)");
} }
@ -2893,6 +2893,7 @@ static int tcpcheck_main(struct check *check)
next = get_next_tcpcheck_rule(head, check->current_step); next = get_next_tcpcheck_rule(head, check->current_step);
if (check->current_step->action == TCPCHK_ACT_CONNECT) { if (check->current_step->action == TCPCHK_ACT_CONNECT) {
struct tcpcheck_connect *connect = &check->current_step->connect;
struct protocol *proto; struct protocol *proto;
struct xprt_ops *xprt; struct xprt_ops *xprt;
@ -2967,14 +2968,14 @@ static int tcpcheck_main(struct check *check)
proto = protocol_by_family(conn->dst->ss_family); proto = protocol_by_family(conn->dst->ss_family);
/* port */ /* port */
if (check->current_step->port) if (connect->port)
set_host_port(conn->dst, check->current_step->port); set_host_port(conn->dst, connect->port);
else if (check->port) else if (check->port)
set_host_port(conn->dst, check->port); set_host_port(conn->dst, check->port);
else if (s->svc_port) else if (s->svc_port)
set_host_port(conn->dst, s->svc_port); set_host_port(conn->dst, s->svc_port);
if (check->current_step->conn_opts & TCPCHK_OPT_SSL) { if (connect->options & TCPCHK_OPT_SSL) {
xprt = xprt_get(XPRT_SSL); xprt = xprt_get(XPRT_SSL);
} }
else { else {
@ -3000,7 +3001,7 @@ static int tcpcheck_main(struct check *check)
ret = proto->connect(conn, flags); ret = proto->connect(conn, flags);
} }
if (conn_ctrl_ready(conn) && if (conn_ctrl_ready(conn) &&
check->current_step->conn_opts & TCPCHK_OPT_SEND_PROXY) { connect->options & TCPCHK_OPT_SEND_PROXY) {
conn->send_proxy_ofs = 1; conn->send_proxy_ofs = 1;
conn->flags |= CO_FL_SEND_PROXY; conn->flags |= CO_FL_SEND_PROXY;
if (xprt_add_hs(conn) < 0) if (xprt_add_hs(conn) < 0)
@ -3008,7 +3009,7 @@ static int tcpcheck_main(struct check *check)
} }
if (conn_ctrl_ready(conn) && if (conn_ctrl_ready(conn) &&
check->current_step->conn_opts & TCPCHK_OPT_LINGER) { connect->options & TCPCHK_OPT_LINGER) {
/* Some servers don't like reset on close */ /* Some servers don't like reset on close */
fdtab[cs->conn->handle.fd].linger_risk = 0; fdtab[cs->conn->handle.fd].linger_risk = 0;
} }
@ -3839,7 +3840,7 @@ static int init_srv_check(struct server *srv)
/* search the first action (connect / send / expect) in the list */ /* search the first action (connect / send / expect) in the list */
r = get_first_tcpcheck_rule(srv->proxy->tcpcheck_rules); r = get_first_tcpcheck_rule(srv->proxy->tcpcheck_rules);
if (!r || (r->action != TCPCHK_ACT_CONNECT) || !r->port) { if (!r || (r->action != TCPCHK_ACT_CONNECT) || !r->connect.port) {
ha_alert("config: %s '%s': server '%s' has neither service port nor check port " ha_alert("config: %s '%s': server '%s' has neither service port nor check port "
"nor tcp_check rule 'connect' with port information.\n", "nor tcp_check rule 'connect' with port information.\n",
proxy_type_str(srv->proxy), srv->proxy->id, srv->id); proxy_type_str(srv->proxy), srv->proxy->id, srv->id);
@ -3849,7 +3850,7 @@ static int init_srv_check(struct server *srv)
/* scan the tcp-check ruleset to ensure a port has been configured */ /* scan the tcp-check ruleset to ensure a port has been configured */
list_for_each_entry(r, srv->proxy->tcpcheck_rules, list) { list_for_each_entry(r, srv->proxy->tcpcheck_rules, list) {
if ((r->action == TCPCHK_ACT_CONNECT) && (!r->port)) { if ((r->action == TCPCHK_ACT_CONNECT) && (!r->connect.port)) {
ha_alert("config: %s '%s': server '%s' has neither service port nor check port, " ha_alert("config: %s '%s': server '%s' has neither service port nor check port, "
"and a tcp_check rule 'connect' with no port information.\n", "and a tcp_check rule 'connect' with no port information.\n",
proxy_type_str(srv->proxy), srv->proxy->id, srv->id); proxy_type_str(srv->proxy), srv->proxy->id, srv->id);
@ -4008,9 +4009,9 @@ static struct tcpcheck_rule *parse_tcpcheck_connect(char **args, int cur_arg, st
goto error; goto error;
} }
chk->action = TCPCHK_ACT_CONNECT; chk->action = TCPCHK_ACT_CONNECT;
chk->port = port;
chk->conn_opts = conn_opts;
chk->comment = comment; chk->comment = comment;
chk->connect.port = port;
chk->connect.options = conn_opts;
return chk; return chk;
error: error: