From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Tue, 8 Feb 2022 14:05:58 +0000 (+0100)
Subject: MINOR: quic: rename local tid variable
X-Git-Tag: v2.6-dev2~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6dcbce53e5a795f40e69145029946cbd453193d;p=thirdparty%2Fhaproxy.git

MINOR: quic: rename local tid variable

Rename a local variable tid to cid_tid. This ensures there is no
confusion with the global tid. It is now more explicit that we are
manipulating a quic datagram handlers from another thread in
quic_lstnr_dgram_dispatch.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 23126e7beb..eee9bae516 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -5457,7 +5457,7 @@ int quic_lstnr_dgram_dispatch(unsigned char *buf, size_t len, void *owner,
 	struct quic_dgram *dgram;
 	unsigned char *dcid;
 	size_t dcid_len;
-	int tid;
+	int cid_tid;
 	struct listener *l = owner;
 
 	if (!len || !quic_get_dgram_dcid(buf, buf + len, &dcid, &dcid_len))
@@ -5467,7 +5467,8 @@ int quic_lstnr_dgram_dispatch(unsigned char *buf, size_t len, void *owner,
 	if (!dgram)
 		goto err;
 
-	tid = quic_get_cid_tid(dcid);
+	cid_tid = quic_get_cid_tid(dcid);
+
 	/* All the members must be initialized! */
 	dgram->owner = owner;
 	dgram->buf = buf;
@@ -5477,9 +5478,9 @@ int quic_lstnr_dgram_dispatch(unsigned char *buf, size_t len, void *owner,
 	dgram->saddr = *saddr;
 	dgram->qc = NULL;
 	LIST_APPEND(dgrams, &dgram->list);
-	MT_LIST_APPEND(&l->rx.dghdlrs[tid]->dgrams, &dgram->mt_list);
+	MT_LIST_APPEND(&l->rx.dghdlrs[cid_tid]->dgrams, &dgram->mt_list);
 
-	tasklet_wakeup(l->rx.dghdlrs[tid]->task);
+	tasklet_wakeup(l->rx.dghdlrs[cid_tid]->task);
 
 	return 1;