]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: tcpcheck: Rely on free_tcpcheck_ruleset() to deinit tcpchecks
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 23 Apr 2026 06:49:28 +0000 (08:49 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 23 Apr 2026 08:49:13 +0000 (10:49 +0200)
There is already a function to release a tcpcheck ruleset. So let's use it
on deinit stage.

src/tcpcheck.c

index 1da341caa4e0bb55263510954ac81be1c7729b6b..105b4dc090b7109468363fa841fb556b64ae6578 100644 (file)
@@ -4192,20 +4192,13 @@ void deinit_proxy_tcpcheck(struct proxy *px)
 static void deinit_tcpchecks()
 {
        struct tcpcheck_ruleset *rs;
-       struct tcpcheck_rule *r, *rb;
        struct ebpt_node *node, *next;
 
        node = ebpt_first(&shared_tcpchecks);
        while (node) {
                next = ebpt_next(node);
-               ebpt_delete(node);
-               free(node->key);
                rs = container_of(node, typeof(*rs), node);
-               list_for_each_entry_safe(r, rb, &rs->rules, list) {
-                       LIST_DELETE(&r->list);
-                       free_tcpcheck(r, 0);
-               }
-               free(rs);
+               free_tcpcheck_ruleset(rs);
                node = next;
        }
 }