From 8ff9686bb49c2ac954f56a281362e17846fa64fd Mon Sep 17 00:00:00 2001 From: Zhang Bo Date: Tue, 2 Jul 2024 04:13:43 -0700 Subject: [PATCH] fix format Signed-off-by: Zhang Bo --- .../tls_session_cache/v3/tls_session_cache.proto | 10 +++++----- source/common/tls/server_context_impl.cc | 2 +- source/common/tls/session_cache/BUILD | 3 --- source/common/tls/session_cache/session_cache_impl.cc | 8 ++++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/api/envoy/service/tls_session_cache/v3/tls_session_cache.proto b/api/envoy/service/tls_session_cache/v3/tls_session_cache.proto index 326f964f92bf9..4baba4e810587 100644 --- a/api/envoy/service/tls_session_cache/v3/tls_session_cache.proto +++ b/api/envoy/service/tls_session_cache/v3/tls_session_cache.proto @@ -17,7 +17,7 @@ service TlsSessionCacheService { } } -enum Type { +enum TYPE { // The request type to store a session to the cache. STORE = 0; @@ -26,7 +26,7 @@ enum Type { } message TlsSessionRequest { - Type type = 1; + TYPE type = 1; // The TLS session id string session_id = 2; @@ -35,7 +35,7 @@ message TlsSessionRequest { } message TlsSessionResponse { - enum Code { + enum CODE { // The response code to notify that the session id is added . OK = 0; @@ -46,9 +46,9 @@ message TlsSessionResponse { NOT_FOUND = 2; } - Type type = 1; + TYPE type = 1; - Code code = 2; + CODE code = 2; string session_id = 3; diff --git a/source/common/tls/server_context_impl.cc b/source/common/tls/server_context_impl.cc index a44dcc4c2b8e3..e353e54afc147 100644 --- a/source/common/tls/server_context_impl.cc +++ b/source/common/tls/server_context_impl.cc @@ -27,10 +27,10 @@ #include "source/common/runtime/runtime_features.h" #include "source/common/stats/utility.h" #include "source/common/tls/cert_validator/factory.h" +#include "source/common/tls/context_config_impl.h" #include "source/common/tls/stats.h" #include "source/common/tls/utility.h" -#include "" #include "absl/container/node_hash_set.h" #include "absl/strings/match.h" #include "absl/strings/str_join.h" diff --git a/source/common/tls/session_cache/BUILD b/source/common/tls/session_cache/BUILD index 062c11d882a3f..38d54c45fde40 100644 --- a/source/common/tls/session_cache/BUILD +++ b/source/common/tls/session_cache/BUILD @@ -2,13 +2,10 @@ load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_extension_package", - "envoy_package", ) licenses(["notice"]) # Apache 2 -envoy_package() - envoy_extension_package() envoy_cc_library( diff --git a/source/common/tls/session_cache/session_cache_impl.cc b/source/common/tls/session_cache/session_cache_impl.cc index ca9257fdc323b..49456ea4dab2d 100644 --- a/source/common/tls/session_cache/session_cache_impl.cc +++ b/source/common/tls/session_cache/session_cache_impl.cc @@ -78,12 +78,12 @@ void GrpcClientImpl::onSuccess( if (response->type() == envoy::service::tls_session_cache::v3::FETCH) { // Copy the session data into the provided buffer. switch (response->code()) { - case envoy::service::tls_session_cache::v3::TlsSessionResponse_Code_NOT_FOUND: { + case envoy::service::tls_session_cache::v3::TlsSessionResponse_CODE_NOT_FOUND: { ENVOY_LOG(debug, "Session not found, set session cache index"); SSL_set_ex_data(ssl_, index_, static_cast(callbacks_)); break; } - case envoy::service::tls_session_cache::v3::TlsSessionResponse_Code_OK: { + case envoy::service::tls_session_cache::v3::TlsSessionResponse_CODE_OK: { ENVOY_LOG(debug, "fetching session succeed"); auto len = response->session_data().length(); if (len > 0) { @@ -120,11 +120,11 @@ void GrpcClientImpl::onSuccess( // The response is a STORE response, which means the session was successfully stored. // Nothing to do here. switch (response->code()) { - case envoy::service::tls_session_cache::v3::TlsSessionResponse_Code_OK: { + case envoy::service::tls_session_cache::v3::TlsSessionResponse_CODE_OK: { ENVOY_LOG(debug, "Session stored successfully"); break; } - case envoy::service::tls_session_cache::v3::TlsSessionResponse_Code_ALEADY_EXIST: { + case envoy::service::tls_session_cache::v3::TlsSessionResponse_CODE_ALEADY_EXIST: { ENVOY_LOG(debug, "Session already exists"); break; }