mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: connection: rearrange conn_get_src/dst to be a bit more extensible

Browse Source 
We'll want conn_get_src/dst to support other means of retrieving these
respective IP addresses, but the functions as they're designed are a bit
too restrictive for now.

This patch arranges them to have a default error fallback allowing to
test different mechanisms. In addition we now make sure the underlying
protocol is of type stream before calling the family's get_src/dst as
it makes no sense to do that on dgram sockets for example.
This commit is contained in:
Willy Tarreau 2022-04-08 18:05:41 +02:00
parent 671bd5af25
commit 987c08a5e2
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/haproxy/connection.h
View File

@ -348,17 +348,27 @@ static inline int conn_get_src(struct connection *conn)
if (conn->flags & CO_FL_ADDR_FROM_SET)
return 1;
if (!conn_ctrl_ready(conn) || !conn->ctrl->fam->get_src)
return 0;
if (!conn_ctrl_ready(conn))
goto fail;
if (!sockaddr_alloc(&conn->src, NULL, 0))
return 0;
goto fail;
if (conn->ctrl->proto_type != PROTO_TYPE_STREAM)
goto fail;
/* most other socket-based stream protocols will use their socket family's functions */
if (conn->ctrl->fam->get_src && !(conn->flags & CO_FL_FDLESS) &&
conn->ctrl->fam->get_src(conn->handle.fd, (struct sockaddr *)conn->src,
sizeof(*conn->src),
obj_type(conn->target) != OBJ_TYPE_LISTENER) == -1)
return 0;
obj_type(conn->target) != OBJ_TYPE_LISTENER) != -1)
goto done;
/* no other means */
fail:
sockaddr_free(&conn->src);
return 0;
done:
conn->flags |= CO_FL_ADDR_FROM_SET;
return 1;
}
@ -372,17 +382,27 @@ static inline int conn_get_dst(struct connection *conn)
if (conn->flags & CO_FL_ADDR_TO_SET)
return 1;
if (!conn_ctrl_ready(conn) || !conn->ctrl->fam->get_dst)
return 0;
if (!conn_ctrl_ready(conn))
goto fail;
if (!sockaddr_alloc(&conn->dst, NULL, 0))
return 0;
goto fail;
if (conn->ctrl->proto_type != PROTO_TYPE_STREAM)
goto fail;
/* most other socket-based stream protocols will use their socket family's functions */
if (conn->ctrl->fam->get_dst && !(conn->flags & CO_FL_FDLESS) &&
conn->ctrl->fam->get_dst(conn->handle.fd, (struct sockaddr *)conn->dst,
sizeof(*conn->dst),
obj_type(conn->target) != OBJ_TYPE_LISTENER) == -1)
return 0;
obj_type(conn->target) != OBJ_TYPE_LISTENER) != -1)
goto done;
/* no other means */
fail:
sockaddr_free(&conn->dst);
return 0;
done:
conn->flags |= CO_FL_ADDR_TO_SET;
return 1;
}