RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-14 17:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: checks: Simplify connection flag parsing in tcp-check connect

Browse Source 
The ternary operator is useless here, this can be simpler and clearer to
read.
This commit is contained in:
Gaetan Rivet 2020-02-28 11:04:21 +01:00 committed by Christopher Faulet
parent dd66732ffe
commit 08fdcb3ecb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/checks.c
View File

@ -2977,9 +2977,14 @@ static int tcpcheck_main(struct check *check)
cs_attach(cs, check, &check_conn_cb);
ret = SF_ERR_INTERNAL;
if (proto && proto->connect)
ret = proto->connect(conn,
CONNECT_HAS_DATA /* I/O polling is always needed */ | ((next && next->action == TCPCHK_ACT_EXPECT) ? 0 : CONNECT_DELACK_ALWAYS));
if (proto && proto->connect) {
int flags;
flags = CONNECT_HAS_DATA;
if (next && next->action != TCPCHK_ACT_EXPECT)
flags |= CONNECT_DELACK_ALWAYS;
ret = proto->connect(conn, flags);
}
if (conn_ctrl_ready(conn) &&
check->current_step->conn_opts & TCPCHK_OPT_SEND_PROXY) {
conn->send_proxy_ofs = 1;