From cc4df3b3de9045a7634b548c30f92625c34ded0a Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 17 Jul 2019 11:55:52 +0200 Subject: [PATCH] CLEANUP: connection: remove the now unused conn_get_{from,to}_addr() These functions are not used anymore. They didn't report failures and as such were often misused. conn_get_src() and conn_get_dst() now replaced them everywhere. --- include/proto/connection.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/include/proto/connection.h b/include/proto/connection.h index 4c896daee..af9b77722 100644 --- a/include/proto/connection.h +++ b/include/proto/connection.h @@ -629,38 +629,6 @@ static inline struct connection *cs_conn(const struct conn_stream *cs) return cs ? cs->conn : NULL; } -/* Retrieves the connection's source address */ -static inline void conn_get_from_addr(struct connection *conn) -{ - if (conn->flags & CO_FL_ADDR_FROM_SET) - return; - - if (!conn_ctrl_ready(conn) || !conn->ctrl->get_src) - return; - - if (conn->ctrl->get_src(conn->handle.fd, (struct sockaddr *)&conn->addr.from, - sizeof(conn->addr.from), - obj_type(conn->target) != OBJ_TYPE_LISTENER) == -1) - return; - conn->flags |= CO_FL_ADDR_FROM_SET; -} - -/* Retrieves the connection's original destination address */ -static inline void conn_get_to_addr(struct connection *conn) -{ - if (conn->flags & CO_FL_ADDR_TO_SET) - return; - - if (!conn_ctrl_ready(conn) || !conn->ctrl->get_dst) - return; - - if (conn->ctrl->get_dst(conn->handle.fd, (struct sockaddr *)&conn->addr.to, - sizeof(conn->addr.to), - obj_type(conn->target) != OBJ_TYPE_LISTENER) == -1) - return; - conn->flags |= CO_FL_ADDR_TO_SET; -} - /* Retrieves the connection's original source address. Returns non-zero on * success or zero on failure. The operation is only performed once and the * address is stored in the connection for future use.