This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.2.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 3955d91c049efb32d3e484de4e4599f9f147cd13 Author: Leif Hedstrom <[email protected]> AuthorDate: Fri Jun 5 09:11:32 2026 -0600 Fix build: TLS log fields use m_data, not m_http_sm (#13241) m_http_sm was removed from LogAccess by #13059 (TransactionLogData). (cherry picked from commit bc4bce393825da39d08aa3db488096caa7fcfec4) --- include/proxy/logging/TransactionLogData.h | 5 +++++ src/proxy/logging/LogAccess.cc | 21 ++++++++++----------- src/proxy/logging/TransactionLogData.cc | 27 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/include/proxy/logging/TransactionLogData.h b/include/proxy/logging/TransactionLogData.h index d617458bd6..908e036e38 100644 --- a/include/proxy/logging/TransactionLogData.h +++ b/include/proxy/logging/TransactionLogData.h @@ -107,6 +107,11 @@ public: int64_t get_cache_response_body_bytes() const; int64_t get_cache_response_hdr_bytes() const; + // ===== TLS handshake byte counters ===== + uint64_t get_client_tls_handshake_bytes_rx() const; + uint64_t get_client_tls_handshake_bytes_tx() const; + size_t get_client_tls_early_data_len() const; + // ===== Transaction identifiers ===== int64_t get_sm_id() const; int64_t get_connection_id() const; diff --git a/src/proxy/logging/LogAccess.cc b/src/proxy/logging/LogAccess.cc index 2f2c1d2b24..67b07d9be4 100644 --- a/src/proxy/logging/LogAccess.cc +++ b/src/proxy/logging/LogAccess.cc @@ -2203,12 +2203,12 @@ LogAccess::marshal_client_req_squid_len_tls(char *buf) int64_t val = 0; if (m_client_request) { - val = m_client_request->length_get() + m_http_sm->client_request_body_bytes; + val = m_client_request->length_get() + m_data->get_client_request_body_bytes(); } - if (!m_http_sm->get_user_agent().get_client_tcp_reused()) { - uint64_t handshake_rx = m_http_sm->get_user_agent().get_client_tls_handshake_bytes_rx(); - size_t early_data_len = m_http_sm->get_user_agent().get_client_tls_early_data_len(); + if (!m_data->get_client_tcp_reused()) { + uint64_t handshake_rx = m_data->get_client_tls_handshake_bytes_rx(); + size_t early_data_len = m_data->get_client_tls_early_data_len(); if (early_data_len > 0) { handshake_rx -= std::min(handshake_rx, static_cast<uint64_t>(early_data_len)); @@ -2446,7 +2446,7 @@ int LogAccess::marshal_client_tls_handshake_bytes_rx(char *buf) { if (buf) { - marshal_int(buf, static_cast<int64_t>(m_http_sm->get_user_agent().get_client_tls_handshake_bytes_rx())); + marshal_int(buf, static_cast<int64_t>(m_data->get_client_tls_handshake_bytes_rx())); } return INK_MIN_ALIGN; } @@ -2458,7 +2458,7 @@ int LogAccess::marshal_client_tls_handshake_bytes_tx(char *buf) { if (buf) { - marshal_int(buf, static_cast<int64_t>(m_http_sm->get_user_agent().get_client_tls_handshake_bytes_tx())); + marshal_int(buf, static_cast<int64_t>(m_data->get_client_tls_handshake_bytes_tx())); } return INK_MIN_ALIGN; } @@ -2470,8 +2470,7 @@ int LogAccess::marshal_client_tls_handshake_bytes(char *buf) { if (buf) { - uint64_t total = m_http_sm->get_user_agent().get_client_tls_handshake_bytes_rx() + - m_http_sm->get_user_agent().get_client_tls_handshake_bytes_tx(); + uint64_t total = m_data->get_client_tls_handshake_bytes_rx() + m_data->get_client_tls_handshake_bytes_tx(); marshal_int(buf, static_cast<int64_t>(total)); } return INK_MIN_ALIGN; @@ -2524,10 +2523,10 @@ int LogAccess::marshal_proxy_resp_squid_len_tls(char *buf) { if (buf) { - int64_t val = m_http_sm->client_response_hdr_bytes + m_http_sm->client_response_body_bytes; + int64_t val = m_data->get_client_response_hdr_bytes() + m_data->get_client_response_body_bytes(); - if (!m_http_sm->get_user_agent().get_client_tcp_reused()) { - val += m_http_sm->get_user_agent().get_client_tls_handshake_bytes_tx(); + if (!m_data->get_client_tcp_reused()) { + val += m_data->get_client_tls_handshake_bytes_tx(); } marshal_int(buf, val); } diff --git a/src/proxy/logging/TransactionLogData.cc b/src/proxy/logging/TransactionLogData.cc index c1c613f03d..81243496ff 100644 --- a/src/proxy/logging/TransactionLogData.cc +++ b/src/proxy/logging/TransactionLogData.cc @@ -738,6 +738,33 @@ TransactionLogData::get_client_tcp_reused() const return false; } +uint64_t +TransactionLogData::get_client_tls_handshake_bytes_rx() const +{ + if (likely(m_http_sm != nullptr)) { + return m_http_sm->get_user_agent().get_client_tls_handshake_bytes_rx(); + } + return 0; +} + +uint64_t +TransactionLogData::get_client_tls_handshake_bytes_tx() const +{ + if (likely(m_http_sm != nullptr)) { + return m_http_sm->get_user_agent().get_client_tls_handshake_bytes_tx(); + } + return 0; +} + +size_t +TransactionLogData::get_client_tls_early_data_len() const +{ + if (likely(m_http_sm != nullptr)) { + return m_http_sm->get_user_agent().get_client_tls_early_data_len(); + } + return 0; +} + bool TransactionLogData::get_client_connection_is_ssl() const {
