RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-27 23:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: connection: use conn_xprt_ready() instead of checking the flag

Browse Source 
It's easier and safer to rely on conn_xprt_ready() everywhere than to
check the flag itself. It will also simplify adding extra checks later
if needed. Some useless controls for !xprt have been removed, as the
XPRT_READY flag itself guarantees xprt is set.
This commit is contained in:
Willy Tarreau 2014-01-23 14:21:42 +01:00
parent 3c72872da1
commit aad69387ac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/proto/connection.h
View File

@ -44,9 +44,9 @@ int conn_recv_proxy(struct connection *conn, int flag);
int make_proxy_line(char *buf, int buf_len, struct sockaddr_storage *src, struct sockaddr_storage *dst);
/* returns true is the transport layer is ready */
static inline int conn_xprt_ready(struct connection *conn)
static inline int conn_xprt_ready(const struct connection *conn)
{
return (conn->flags & CO_FL_XPRT_READY) && conn->xprt;
return (conn->flags & CO_FL_XPRT_READY);
}
/* returns true is the control layer is ready */
@ -63,7 +63,7 @@ static inline int conn_xprt_init(struct connection *conn)
{
int ret = 0;
if (!(conn->flags & CO_FL_XPRT_READY) && conn->xprt && conn->xprt->init)
if (!conn_xprt_ready(conn) && conn->xprt && conn->xprt->init)
ret = conn->xprt->init(conn);
if (ret >= 0)
@ -80,7 +80,7 @@ static inline int conn_xprt_init(struct connection *conn)
static inline void conn_xprt_close(struct connection *conn)
{
if ((conn->flags & (CO_FL_XPRT_READY|CO_FL_XPRT_TRACKED)) == CO_FL_XPRT_READY) {
if (conn->xprt && conn->xprt->close)
if (conn->xprt->close)
conn->xprt->close(conn);
conn->flags &= ~CO_FL_XPRT_READY;
}
@ -135,7 +135,7 @@ static inline void conn_full_close(struct connection *conn)
*/
static inline void conn_force_close(struct connection *conn)
{
if ((conn->flags & CO_FL_XPRT_READY) && conn->xprt && conn->xprt->close)
if (conn_xprt_ready(conn) && conn->xprt->close)
conn->xprt->close(conn);
if (conn_ctrl_ready(conn))

2
src/dumpstats.c
View File

@ -4295,7 +4295,7 @@ static inline const char *get_conn_xprt_name(const struct connection *conn)
{
static char ptr[17];
if (!(conn->flags & CO_FL_XPRT_READY) || !conn->xprt)
if (!conn_xprt_ready(conn))
return "NONE";
if (conn->xprt == &raw_sock)