From d1c5df68662e5335e2f25f0d6a0fef895984c026 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 12 Sep 2025 15:49:48 +0200 Subject: [PATCH] CLEANUP: server: use eb64_entry() not ebmb_entry() to convert an eb64 There were a few leftovers from an earlier version of the conn_hash_node that was using ebmb nodes. A few calls to ebmb_first() and ebmb_entry() were still present while acting on an eb64 tree. These are harmless as one is just eb_first() and the other container_of(), but it's confusing so let's clean them up. --- src/server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server.c b/src/server.c index 8457573fe..8cbda7ef8 100644 --- a/src/server.c +++ b/src/server.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -7278,7 +7278,7 @@ struct connection *srv_lookup_conn(struct eb_root *tree, uint64_t hash) node = eb64_lookup(tree, hash); if (node) { - hash_node = ebmb_entry(node, struct conn_hash_node, node); + hash_node = eb64_entry(node, struct conn_hash_node, node); conn = hash_node->conn; } @@ -7518,8 +7518,8 @@ static void srv_close_idle_conns(struct server *srv) for (cleaned_tree = conn_trees; *cleaned_tree; ++cleaned_tree) { while (!eb_is_empty(*cleaned_tree)) { - struct ebmb_node *node = ebmb_first(*cleaned_tree); - struct conn_hash_node *conn_hash_node = ebmb_entry(node, struct conn_hash_node, node); + struct eb64_node *node = eb64_first(*cleaned_tree); + struct conn_hash_node *conn_hash_node = eb64_entry(node, struct conn_hash_node, node); struct connection *conn = conn_hash_node->conn; if (conn->ctrl->ctrl_close)