From 6c1e36ce55561281c5977fbf2e97324b4e70c211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Wed, 23 Dec 2020 17:17:37 +0100 Subject: [PATCH] CLEANUP: quic: Remove useless QUIC event trace definitions. Remove QUIC_EV_CONN_E* event trace macros which were defined for errors. Replace QUIC_EV_CONN_ECHPKT by QUIC_EV_CONN_BCFRMS used in qc_build_cfrms() --- include/haproxy/quic_tls.h | 2 +- include/haproxy/xprt_quic-t.h | 11 +---------- src/xprt_quic.c | 25 ++++++++----------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/include/haproxy/quic_tls.h b/include/haproxy/quic_tls.h index 94b978bc3..3d2160134 100644 --- a/include/haproxy/quic_tls.h +++ b/include/haproxy/quic_tls.h @@ -432,7 +432,7 @@ static inline int qc_new_isecs(struct connection *conn, return 1; err: - TRACE_DEVEL("leaving in error", QUIC_EV_CONN_EISEC, conn); + TRACE_DEVEL("leaving in error", QUIC_EV_CONN_ISEC, conn); return 0; } diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h index 143b22808..bb05c5447 100644 --- a/include/haproxy/xprt_quic-t.h +++ b/include/haproxy/xprt_quic-t.h @@ -208,16 +208,7 @@ enum quic_pkt_type { #define QUIC_EV_CONN_STIMER (1ULL << 33) #define QUIC_EV_CONN_PTIMER (1ULL << 34) #define QUIC_EV_CONN_SPTO (1ULL << 35) - -#define QUIC_EV_CONN_ENEW (1ULL << 32) -#define QUIC_EV_CONN_EISEC (1ULL << 33) -#define QUIC_EV_CONN_ERSEC (1ULL << 34) -#define QUIC_EV_CONN_EWSEC (1ULL << 35) -#define QUIC_EV_CONN_ELPKT (1ULL << 36) -#define QUIC_EV_CONN_ESPKT (1ULL << 37) -#define QUIC_EV_CONN_ECHPKT (1ULL << 38) -#define QUIC_EV_CONN_EHPKT (1ULL << 39) -#define QUIC_EV_CONN_EPAPKT (1ULL << 40) +#define QUIC_EV_CONN_BCFRMS (1ULL << 36) /* Similar to kernel min()/max() definitions. */ #define QUIC_MIN(a, b) ({ \ diff --git a/src/xprt_quic.c b/src/xprt_quic.c index 7eb48c269..88229e605 100644 --- a/src/xprt_quic.c +++ b/src/xprt_quic.c @@ -93,16 +93,7 @@ static const struct trace_event quic_trace_events[] = { { .mask = QUIC_EV_CONN_STIMER, .name = "stimer", .desc = "set timer" }, { .mask = QUIC_EV_CONN_PTIMER, .name = "ptimer", .desc = "process timer" }, { .mask = QUIC_EV_CONN_SPTO, .name = "spto", .desc = "set PTO" }, - - { .mask = QUIC_EV_CONN_ENEW, .name = "new_conn_err", .desc = "error on new QUIC connection" }, - { .mask = QUIC_EV_CONN_EISEC, .name = "init_secs_err", .desc = "error on initial secrets derivation" }, - { .mask = QUIC_EV_CONN_ERSEC, .name = "read_secs_err", .desc = "error on read secrets derivation" }, - { .mask = QUIC_EV_CONN_EWSEC, .name = "write_secs_err", .desc = "error on write secrets derivation" }, - { .mask = QUIC_EV_CONN_ELPKT, .name = "lstnr_packet_err", .desc = "error on new listener received packet" }, - { .mask = QUIC_EV_CONN_ESPKT, .name = "srv_packet_err", .desc = "error on new server received packet" }, - { .mask = QUIC_EV_CONN_ECHPKT, .name = "chdshk_pkt_err", .desc = "error on clear handhshake packet building" }, - { .mask = QUIC_EV_CONN_EHPKT, .name = "hdshk_pkt_err", .desc = "error on handhshake packet building" }, - { .mask = QUIC_EV_CONN_EPAPKT, .name = "phdshk_apkt_err", .desc = "error on post handhshake application packet building" }, + { .mask = QUIC_EV_CONN_BCFRMS, .name = "bcfrms", .desc = "build CRYPTO data frames" }, { /* end */ } }; @@ -347,7 +338,7 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace chunk_appendf(&trace_buf, " err=%s", ssl_error_str(*err)); } - if (mask & (QUIC_EV_CONN_TRMHP|QUIC_EV_CONN_ELRMHP|QUIC_EV_CONN_ESPKT|QUIC_EV_CONN_SPKT)) { + if (mask & (QUIC_EV_CONN_TRMHP|QUIC_EV_CONN_ELRMHP|QUIC_EV_CONN_SPKT)) { const struct quic_rx_packet *pkt = a2; const unsigned long *pktlen = a3; const SSL *ssl = a4; @@ -729,7 +720,7 @@ int ha_set_rsec(SSL *ssl, enum ssl_encryption_level_t level, return 1; err: - TRACE_DEVEL("leaving in error", QUIC_EV_CONN_ERSEC, conn); + TRACE_DEVEL("leaving in error", QUIC_EV_CONN_RSEC, conn); return 0; } @@ -765,7 +756,7 @@ int ha_set_wsec(SSL *ssl, enum ssl_encryption_level_t level, return 1; err: - TRACE_DEVEL("leaving in error", QUIC_EV_CONN_EWSEC, conn); + TRACE_DEVEL("leaving in error", QUIC_EV_CONN_WSEC, conn); return 0; } #endif @@ -2865,7 +2856,7 @@ static ssize_t qc_srv_pkt_rcv(unsigned char **buf, const unsigned char *end, return pkt->len; err: - TRACE_DEVEL("Leaing in error", QUIC_EV_CONN_ESPKT, qc ? qc->conn : NULL); + TRACE_DEVEL("Leaing in error", QUIC_EV_CONN_SPKT, qc ? qc->conn : NULL); return -1; } @@ -3084,7 +3075,7 @@ static ssize_t qc_lstnr_pkt_rcv(unsigned char **buf, const unsigned char *end, return pkt->len; err: - TRACE_DEVEL("Leaving in error", QUIC_EV_CONN_LPKT|QUIC_EV_CONN_ELPKT, + TRACE_DEVEL("Leaving in error", QUIC_EV_CONN_LPKT, qc ? qc->conn : NULL, pkt); return -1; } @@ -3247,7 +3238,7 @@ static inline int qc_build_cfrms(struct quic_tx_packet *pkt, new_cf = pool_alloc(pool_head_quic_tx_frm); if (!new_cf) { - TRACE_PROTO("No memory for new crypto frame", QUIC_EV_CONN_ECHPKT, conn->conn); + TRACE_PROTO("No memory for new crypto frame", QUIC_EV_CONN_BCFRMS, conn->conn); return 0; } @@ -4128,7 +4119,7 @@ static int qc_conn_init(struct connection *conn, void **xprt_ctx) if (ctx->wait_event.tasklet) tasklet_free(ctx->wait_event.tasklet); pool_free(pool_head_quic_conn_ctx, ctx); - TRACE_DEVEL("leaving in error", QUIC_EV_CONN_NEW|QUIC_EV_CONN_ENEW, conn); + TRACE_DEVEL("leaving in error", QUIC_EV_CONN_NEW, conn); return -1; }