From 002bd77a6e50c755ac1d2905c464867386f5679e Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Sat, 6 Mar 2021 20:06:49 +0100 Subject: [PATCH] CLEANUP: connection: Use istptr / istlen for proxy_unique_id Don't access the ist's fields directly, use the helper functions instead. --- include/haproxy/connection.h | 2 +- src/connection.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h index 58b0d0e..33c1380 100644 --- a/include/haproxy/connection.h +++ b/include/haproxy/connection.h @@ -556,7 +556,7 @@ static inline void conn_free(struct connection *conn) pool_free(pool_head_authority, conn->proxy_authority); conn->proxy_authority = NULL; - pool_free(pool_head_uniqueid, conn->proxy_unique_id.ptr); + pool_free(pool_head_uniqueid, istptr(conn->proxy_unique_id)); conn->proxy_unique_id = IST_NULL; pool_free(pool_head_conn_hash_node, conn->hash_node); diff --git a/src/connection.c b/src/connection.c index c394d0f..10bc671 100644 --- a/src/connection.c +++ b/src/connection.c @@ -499,7 +499,7 @@ int conn_recv_proxy(struct connection *conn, int flag) case PP2_TYPE_UNIQUE_ID: { const struct ist tlv = ist2((const char *)tlv_packet->value, tlv_len); - if (tlv.len > UNIQUEID_LEN) + if (istlen(tlv) > UNIQUEID_LEN) goto bad_header; conn->proxy_unique_id = ist2(pool_alloc(pool_head_uniqueid), 0); if (!isttest(conn->proxy_unique_id)) @@ -1384,8 +1384,8 @@ int smp_fetch_fc_pp_unique_id(const struct arg *args, struct sample *smp, const smp->flags = 0; smp->data.type = SMP_T_STR; - smp->data.u.str.area = conn->proxy_unique_id.ptr; - smp->data.u.str.data = conn->proxy_unique_id.len; + smp->data.u.str.area = istptr(conn->proxy_unique_id); + smp->data.u.str.data = istlen(conn->proxy_unique_id); return 1; } -- 1.7.10.4