commit 4fd53d772f6534c2556ef0348a55d25f93a6f479
author Amaury Denoyelle <adenoyelle@haproxy.com> Tue Dec 21 14:28:26 2021 +0100
committer Amaury Denoyelle <adenoyelle@haproxy.com> Tue Dec 21 15:53:19 2021 +0100
tree fca09067e11f06c6bb5e7a3d8ec4ec6cad5b2c44
parent c15dd9214bc714e3f26c6356f1a5c44a8718ee7b

MINOR: quic: add const qualifier for traces function

Add const qualifier on arguments of several dump functions used in the
trace callback. This is required to be able to replace the first trace
argument by a quic_conn instance. The first argument is a const pointer
and so the members accessed through it must also be const.

include/haproxy/quic_tls.h

diff --git a/include/haproxy/quic_tls.h b/include/haproxy/quic_tls.h
index 209576a..500f125 100644
--- a/include/haproxy/quic_tls.h
+++ b/include/haproxy/quic_tls.h
@@ -42,7 +42,8 @@
 	0xcc, 0xbb, 0x7f, 0x0a
 };
 
-void quic_tls_keys_hexdump(struct buffer *buf, struct quic_tls_secrets *secs);
+void quic_tls_keys_hexdump(struct buffer *buf,
+                           const struct quic_tls_secrets *secs);
 
 void quic_tls_secret_hexdump(struct buffer *buf,
                              const unsigned char *secret, size_t secret_len);

include/haproxy/xprt_quic.h

diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index 13de0f1..7004164 100644
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -114,7 +114,8 @@
  * debugging purposes.
  * Always succeeds.
  */
-static inline void quic_cid_dump(struct buffer *buf, struct quic_cid *cid)
+static inline void quic_cid_dump(struct buffer *buf,
+                                 const struct quic_cid *cid)
 {
 	int i;
 

src/quic_tls.c

diff --git a/src/quic_tls.c b/src/quic_tls.c
index fcb80a3..8100d47 100644
--- a/src/quic_tls.c
+++ b/src/quic_tls.c
@@ -23,7 +23,8 @@
 void hexdump(const void *buf, size_t buflen, const char *title_fmt, ...);
 
 /* Dump the RX/TX secrets of <secs> QUIC TLS secrets. */
-void quic_tls_keys_hexdump(struct buffer *buf, struct quic_tls_secrets *secs)
+void quic_tls_keys_hexdump(struct buffer *buf,
+                           const struct quic_tls_secrets *secs)
 {
 	int i;
 	size_t aead_keylen = (size_t)EVP_CIPHER_key_length(secs->aead);

src/xprt_quic.c

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index ae5241f..c15f4b4 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -321,9 +321,7 @@
 			const ssize_t *room = a4;
 
 			if (qel) {
-				struct quic_pktns *pktns;
-
-				pktns = qc->pktns;
+				const struct quic_pktns *pktns = qc->pktns;
 				chunk_appendf(&trace_buf, " qel=%c cwnd=%llu ppif=%lld pif=%llu "
 				              "if=%llu pp=%u pdg=%d",
 				              quic_enc_level_char_from_qel(qel, qc),
@@ -422,9 +420,7 @@
 			const struct quic_enc_level *qel = a2;
 
 			if (qel) {
-				struct quic_pktns *pktns;
-
-				pktns = qc->pktns;
+				const struct quic_pktns *pktns = qc->pktns;
 				chunk_appendf(&trace_buf,
 				              " qel=%c state=%s ack?%d cwnd=%llu ppif=%lld pif=%llu if=%llu pp=%u pdg=%llu",
 				              quic_enc_level_char_from_qel(qel, qc),