From: Willy Tarreau Date: Sun, 26 Nov 2017 07:44:34 +0000 (+0100) Subject: CLEANUP: checks: remove 16 bytes of holes in struct check X-Git-Tag: v1.8.0~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08eaa787392f0b955d26041c08ef885ffc1196c5;p=thirdparty%2Fhaproxy.git CLEANUP: checks: remove 16 bytes of holes in struct check These ones were easily recovered by swapping two members. --- diff --git a/include/types/checks.h b/include/types/checks.h index ac3e7b6441..b1fe7f337c 100644 --- a/include/types/checks.h +++ b/include/types/checks.h @@ -158,12 +158,12 @@ enum { struct check { struct xprt_ops *xprt; /* transport layer operations for health checks */ struct conn_stream *cs; /* conn_stream state for health checks */ - unsigned short port; /* the port to use for the health checks */ struct buffer *bi, *bo; /* input and output buffers to send/recv check */ struct task *task; /* the task associated to the health check processing, NULL if disabled */ struct timeval start; /* last health check start time */ long duration; /* time in ms took to finish last health check */ short status, code; /* check result, check code */ + unsigned short port; /* the port to use for the health checks */ char desc[HCHK_DESC_LEN]; /* health check description */ int use_ssl; /* use SSL for health checks */ int send_proxy; /* send a PROXY protocol header with checks */ @@ -177,8 +177,8 @@ struct check { * rise to rise+fall-1 = good */ int rise, fall; /* time in iterations */ int type; /* Check type, one of PR_O2_*_CHK */ - char *send_string; /* optionally send a string when connecting to the agent */ int send_string_len; /* length of agent command string */ + char *send_string; /* optionally send a string when connecting to the agent */ struct server *server; /* back-pointer to server */ char **argv; /* the arguments to use if running a process-based check */ char **envp; /* the environment to use if running a process-based check */