diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD index be256eccbf6b9..ba0c0401ea00c 100644 --- a/source/common/quic/BUILD +++ b/source/common/quic/BUILD @@ -79,7 +79,6 @@ envoy_cc_library( ":quic_io_handle_wrapper_lib", ":quic_transport_socket_factory_lib", "//include/envoy/ssl:tls_certificate_config_interface", - "//source/extensions/transport_sockets:well_known_names", "//source/server:connection_handler_lib", "@com_googlesource_quiche//:quic_core_crypto_certificate_view_lib", ], @@ -288,7 +287,6 @@ envoy_cc_library( ":quic_io_handle_wrapper_lib", ":quic_network_connection_lib", "//source/common/quic:envoy_quic_utils_lib", - "//source/extensions/transport_sockets:well_known_names", "//source/server:connection_handler_lib", "@com_googlesource_quiche//:quic_core_connection_lib", ], @@ -370,7 +368,6 @@ envoy_cc_library( "//source/common/network:listen_socket_lib", "//source/common/network:socket_option_factory_lib", "//source/common/quic:quic_io_handle_wrapper_lib", - "//source/extensions/transport_sockets:well_known_names", "@com_googlesource_quiche//:quic_core_config_lib", "@com_googlesource_quiche//:quic_core_http_header_list_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -388,7 +385,6 @@ envoy_cc_library( "//include/envoy/server:transport_socket_config_interface", "//include/envoy/ssl:context_config_interface", "//source/common/common:assert_lib", - "//source/extensions/transport_sockets:well_known_names", "//source/extensions/transport_sockets/tls:context_config_lib", "//source/extensions/transport_sockets/tls:ssl_socket_lib", "@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto", diff --git a/source/common/quic/envoy_quic_client_connection.cc b/source/common/quic/envoy_quic_client_connection.cc index 158fa4d2244b3..c9046d45b73a6 100644 --- a/source/common/quic/envoy_quic_client_connection.cc +++ b/source/common/quic/envoy_quic_client_connection.cc @@ -10,8 +10,6 @@ #include "common/quic/envoy_quic_packet_writer.h" #include "common/quic/envoy_quic_utils.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_source.cc b/source/common/quic/envoy_quic_proof_source.cc index fd9554f1a7a8b..e1b7673596d7d 100644 --- a/source/common/quic/envoy_quic_proof_source.cc +++ b/source/common/quic/envoy_quic_proof_source.cc @@ -7,8 +7,6 @@ #include "common/quic/envoy_quic_utils.h" #include "common/quic/quic_io_handle_wrapper.h" -#include "extensions/transport_sockets/well_known_names.h" - #include "openssl/bytestring.h" #include "quiche/quic/core/crypto/certificate_view.h" diff --git a/source/common/quic/envoy_quic_server_connection.cc b/source/common/quic/envoy_quic_server_connection.cc index b17a9a88663f3..f2bc90257dd85 100644 --- a/source/common/quic/envoy_quic_server_connection.cc +++ b/source/common/quic/envoy_quic_server_connection.cc @@ -4,8 +4,6 @@ #include "common/quic/envoy_quic_utils.h" #include "common/quic/quic_io_handle_wrapper.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_utils.cc b/source/common/quic/envoy_quic_utils.cc index 969782322f098..2f9682b31a20f 100644 --- a/source/common/quic/envoy_quic_utils.cc +++ b/source/common/quic/envoy_quic_utils.cc @@ -9,8 +9,6 @@ #include "common/network/socket_option_factory.h" #include "common/network/utility.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Quic { @@ -237,8 +235,7 @@ createServerConnectionSocket(Network::IoHandle& io_handle, std::make_unique(io_handle), quicAddressToEnvoyAddressInstance(self_address), quicAddressToEnvoyAddressInstance(peer_address)); - connection_socket->setDetectedTransportProtocol( - Extensions::TransportSockets::TransportProtocolNames::get().Quic); + connection_socket->setDetectedTransportProtocol("quic"); connection_socket->setRequestedServerName(hostname); connection_socket->setRequestedApplicationProtocols({alpn}); return connection_socket; diff --git a/source/common/quic/quic_transport_socket_factory.h b/source/common/quic/quic_transport_socket_factory.h index cfad2cc329a6f..18fa00a7b0342 100644 --- a/source/common/quic/quic_transport_socket_factory.h +++ b/source/common/quic/quic_transport_socket_factory.h @@ -8,7 +8,6 @@ #include "common/common/assert.h" #include "extensions/transport_sockets/tls/ssl_socket.h" -#include "extensions/transport_sockets/well_known_names.h" namespace Envoy { namespace Quic { @@ -135,9 +134,7 @@ class QuicTransportSocketConfigFactory : public virtual Server::Configuration::TransportSocketConfigFactory { public: // Server::Configuration::TransportSocketConfigFactory - std::string name() const override { - return Extensions::TransportSockets::TransportSocketNames::get().Quic; - } + std::string name() const override { return "envoy.transport_sockets.quic"; } }; class QuicServerTransportSocketConfigFactory diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index efcb951029fcc..c8f8a219b17a8 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -258,7 +258,6 @@ envoy_cc_library( "//source/common/network:resolver_lib", "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -482,7 +481,6 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", "//source/extensions/filters/network/common:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", ], ) @@ -496,7 +494,6 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -593,7 +590,6 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib", "//source/extensions/clusters:well_known_names", - "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], diff --git a/source/common/upstream/health_discovery_service.h b/source/common/upstream/health_discovery_service.h index 536b1d0b15f4f..e943efe63fe41 100644 --- a/source/common/upstream/health_discovery_service.h +++ b/source/common/upstream/health_discovery_service.h @@ -23,8 +23,6 @@ #include "server/transport_socket_config_impl.h" -#include "extensions/transport_sockets/well_known_names.h" - #include "absl/container/flat_hash_map.h" namespace Envoy { diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 07db4f18f2ff6..52affaa72b46c 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -52,7 +52,6 @@ #include "server/transport_socket_config_impl.h" #include "extensions/filters/network/common/utility.h" -#include "extensions/transport_sockets/well_known_names.h" #include "absl/container/node_hash_set.h" #include "absl/strings/str_cat.h" @@ -898,12 +897,11 @@ Network::TransportSocketFactoryPtr createTransportSocketFactory( auto transport_socket = config.transport_socket(); if (!config.has_transport_socket()) { if (config.has_hidden_envoy_deprecated_tls_context()) { - transport_socket.set_name(Extensions::TransportSockets::TransportSocketNames::get().Tls); + transport_socket.set_name("envoy.transport_sockets.tls"); transport_socket.mutable_typed_config()->PackFrom( config.hidden_envoy_deprecated_tls_context()); } else { - transport_socket.set_name( - Extensions::TransportSockets::TransportSocketNames::get().RawBuffer); + transport_socket.set_name("envoy.transport_sockets.raw_buffer"); } } diff --git a/source/extensions/filters/listener/http_inspector/BUILD b/source/extensions/filters/listener/http_inspector/BUILD index 5873f83eb830d..849277d618d12 100644 --- a/source/extensions/filters/listener/http_inspector/BUILD +++ b/source/extensions/filters/listener/http_inspector/BUILD @@ -25,7 +25,6 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/http:headers_lib", "//source/common/http:utility_lib", - "//source/extensions/transport_sockets:well_known_names", ], ) diff --git a/source/extensions/filters/listener/http_inspector/http_inspector.cc b/source/extensions/filters/listener/http_inspector/http_inspector.cc index 331277720e9e2..3f3c2c4d24264 100644 --- a/source/extensions/filters/listener/http_inspector/http_inspector.cc +++ b/source/extensions/filters/listener/http_inspector/http_inspector.cc @@ -10,8 +10,6 @@ #include "common/http/headers.h" #include "common/http/utility.h" -#include "extensions/transport_sockets/well_known_names.h" - #include "absl/strings/match.h" #include "absl/strings/str_split.h" @@ -40,8 +38,7 @@ Network::FilterStatus Filter::onAccept(Network::ListenerFilterCallbacks& cb) { const Network::ConnectionSocket& socket = cb.socket(); const absl::string_view transport_protocol = socket.detectedTransportProtocol(); - if (!transport_protocol.empty() && - transport_protocol != TransportSockets::TransportProtocolNames::get().RawBuffer) { + if (!transport_protocol.empty() && transport_protocol != "raw_buffer") { ENVOY_LOG(trace, "http inspector: cannot inspect http protocol with transport socket {}", transport_protocol); return Network::FilterStatus::Continue; diff --git a/source/extensions/filters/listener/tls_inspector/BUILD b/source/extensions/filters/listener/tls_inspector/BUILD index 9ee8da494d73a..3f6837524e2b2 100644 --- a/source/extensions/filters/listener/tls_inspector/BUILD +++ b/source/extensions/filters/listener/tls_inspector/BUILD @@ -29,7 +29,6 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", - "//source/extensions/transport_sockets:well_known_names", ], ) diff --git a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc index f773dade15d3c..f2adbaf36367e 100644 --- a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc +++ b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc @@ -13,8 +13,6 @@ #include "common/api/os_sys_calls_impl.h" #include "common/common/assert.h" -#include "extensions/transport_sockets/well_known_names.h" - #include "absl/strings/str_join.h" #include "openssl/ssl.h" @@ -227,8 +225,7 @@ ParseState Filter::parseClientHello(const void* data, size_t len) { } else { config_->stats().alpn_not_found_.inc(); } - cb_->socket().setDetectedTransportProtocol( - TransportSockets::TransportProtocolNames::get().Tls); + cb_->socket().setDetectedTransportProtocol("tls"); } else { config_->stats().tls_not_found_.inc(); } diff --git a/source/extensions/transport_sockets/alts/BUILD b/source/extensions/transport_sockets/alts/BUILD index 6e38ca522082e..587e9a2ecf29d 100644 --- a/source/extensions/transport_sockets/alts/BUILD +++ b/source/extensions/transport_sockets/alts/BUILD @@ -48,7 +48,6 @@ envoy_cc_extension( "//include/envoy/registry", "//include/envoy/server:transport_socket_config_interface", "//source/common/grpc:google_grpc_context_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/alts/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/alts/config.h b/source/extensions/transport_sockets/alts/config.h index adec81d3faec5..2a1a9d40b22d1 100644 --- a/source/extensions/transport_sockets/alts/config.h +++ b/source/extensions/transport_sockets/alts/config.h @@ -2,8 +2,6 @@ #include "envoy/server/transport_socket_config.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -14,7 +12,7 @@ class AltsTransportSocketConfigFactory : public virtual Server::Configuration::TransportSocketConfigFactory { public: ProtobufTypes::MessagePtr createEmptyConfigProto() override; - std::string name() const override { return TransportSocketNames::get().Alts; } + std::string name() const override { return "envoy.transport_sockets.alts"; } }; class UpstreamAltsTransportSocketConfigFactory diff --git a/source/extensions/transport_sockets/proxy_protocol/BUILD b/source/extensions/transport_sockets/proxy_protocol/BUILD index 105ac9b506d9f..e268b828524c3 100644 --- a/source/extensions/transport_sockets/proxy_protocol/BUILD +++ b/source/extensions/transport_sockets/proxy_protocol/BUILD @@ -23,7 +23,6 @@ envoy_cc_extension( "//include/envoy/registry", "//include/envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/proxy_protocol/config.h b/source/extensions/transport_sockets/proxy_protocol/config.h index 9ab05d870b401..b5b4bbe7bdb9e 100644 --- a/source/extensions/transport_sockets/proxy_protocol/config.h +++ b/source/extensions/transport_sockets/proxy_protocol/config.h @@ -2,8 +2,6 @@ #include "envoy/server/transport_socket_config.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -16,7 +14,7 @@ namespace ProxyProtocol { class UpstreamProxyProtocolSocketConfigFactory : public Server::Configuration::UpstreamTransportSocketConfigFactory { public: - std::string name() const override { return TransportSocketNames::get().UpstreamProxyProtocol; } + std::string name() const override { return "envoy.transport_sockets.upstream_proxy_protocol"; } ProtobufTypes::MessagePtr createEmptyConfigProto() override; Network::TransportSocketFactoryPtr createTransportSocketFactory( const Protobuf::Message& config, diff --git a/source/extensions/transport_sockets/raw_buffer/BUILD b/source/extensions/transport_sockets/raw_buffer/BUILD index d09cdff468f47..94a2bee0a980a 100644 --- a/source/extensions/transport_sockets/raw_buffer/BUILD +++ b/source/extensions/transport_sockets/raw_buffer/BUILD @@ -26,7 +26,6 @@ envoy_cc_extension( "//include/envoy/registry", "//include/envoy/server:transport_socket_config_interface", "//source/common/network:raw_buffer_socket_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/raw_buffer/config.h b/source/extensions/transport_sockets/raw_buffer/config.h index b17f9836f5552..b1353b6c2d601 100644 --- a/source/extensions/transport_sockets/raw_buffer/config.h +++ b/source/extensions/transport_sockets/raw_buffer/config.h @@ -3,8 +3,6 @@ #include "envoy/registry/registry.h" #include "envoy/server/transport_socket_config.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -16,7 +14,7 @@ namespace RawBuffer { */ class RawBufferSocketFactory : public virtual Server::Configuration::TransportSocketConfigFactory { public: - std::string name() const override { return TransportSocketNames::get().RawBuffer; } + std::string name() const override { return "envoy.transport_sockets.raw_buffer"; } ProtobufTypes::MessagePtr createEmptyConfigProto() override; }; diff --git a/source/extensions/transport_sockets/starttls/BUILD b/source/extensions/transport_sockets/starttls/BUILD index 8748f049b9b7b..f3414c9837e37 100644 --- a/source/extensions/transport_sockets/starttls/BUILD +++ b/source/extensions/transport_sockets/starttls/BUILD @@ -27,7 +27,6 @@ envoy_cc_extension( "//include/envoy/registry", "//include/envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto", ], ) @@ -50,7 +49,6 @@ envoy_cc_library( "//source/common/common:empty_string", "//source/common/common:minimal_logger_lib", "//source/common/common:thread_annotations", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/starttls/config.h b/source/extensions/transport_sockets/starttls/config.h index 89765fc5f1cfa..2b5edbbef6d00 100644 --- a/source/extensions/transport_sockets/starttls/config.h +++ b/source/extensions/transport_sockets/starttls/config.h @@ -6,8 +6,6 @@ #include "common/config/utility.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -16,7 +14,7 @@ namespace StartTls { template class BaseStartTlsSocketFactory : public ConfigFactory { public: - std::string name() const override { return TransportSocketNames::get().StartTls; } + std::string name() const override { return "envoy.transport_sockets.starttls"; } ProtobufTypes::MessagePtr createEmptyConfigProto() override { return std::make_unique(); @@ -25,12 +23,11 @@ class BaseStartTlsSocketFactory : public ConfigFactory { protected: ConfigFactory& rawSocketConfigFactory() { return Config::Utility::getAndCheckFactoryByName( - TransportSocketNames::get().RawBuffer); + "envoy.transport_sockets.raw_buffer"); } ConfigFactory& tlsSocketConfigFactory() { - return Config::Utility::getAndCheckFactoryByName( - TransportSocketNames::get().Tls); + return Config::Utility::getAndCheckFactoryByName("envoy.transport_sockets.tls"); } }; diff --git a/source/extensions/transport_sockets/starttls/starttls_socket.h b/source/extensions/transport_sockets/starttls/starttls_socket.h index dc84d776be0dc..616502b08bfa8 100644 --- a/source/extensions/transport_sockets/starttls/starttls_socket.h +++ b/source/extensions/transport_sockets/starttls/starttls_socket.h @@ -9,8 +9,6 @@ #include "common/buffer/buffer_impl.h" #include "common/common/logger.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -28,7 +26,7 @@ class StartTlsSocket : public Network::TransportSocket, Logger::LoggablefailureReason(); } diff --git a/source/extensions/transport_sockets/tap/BUILD b/source/extensions/transport_sockets/tap/BUILD index 5461e5d2585c7..e97cb4f1255c3 100644 --- a/source/extensions/transport_sockets/tap/BUILD +++ b/source/extensions/transport_sockets/tap/BUILD @@ -70,7 +70,6 @@ envoy_cc_extension( "//include/envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/transport_sockets/tap/v3:pkg_cc_proto", ], diff --git a/source/extensions/transport_sockets/tap/config.h b/source/extensions/transport_sockets/tap/config.h index ac41dd19c9fc0..c641cf45484ba 100644 --- a/source/extensions/transport_sockets/tap/config.h +++ b/source/extensions/transport_sockets/tap/config.h @@ -2,8 +2,6 @@ #include "envoy/server/transport_socket_config.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -15,7 +13,7 @@ namespace Tap { */ class TapSocketConfigFactory : public virtual Server::Configuration::TransportSocketConfigFactory { public: - std::string name() const override { return TransportSocketNames::get().Tap; } + std::string name() const override { return "envoy.transport_sockets.tap"; } ProtobufTypes::MessagePtr createEmptyConfigProto() override; }; diff --git a/source/extensions/transport_sockets/tls/BUILD b/source/extensions/transport_sockets/tls/BUILD index b05b7770a1310..29dfa2be2a9dc 100644 --- a/source/extensions/transport_sockets/tls/BUILD +++ b/source/extensions/transport_sockets/tls/BUILD @@ -27,7 +27,6 @@ envoy_cc_extension( "//include/envoy/network:transport_socket_interface", "//include/envoy/registry", "//include/envoy/server:transport_socket_config_interface", - "//source/extensions/transport_sockets:well_known_names", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/config.h b/source/extensions/transport_sockets/tls/config.h index a10d597e09db2..f05066bd8141a 100644 --- a/source/extensions/transport_sockets/tls/config.h +++ b/source/extensions/transport_sockets/tls/config.h @@ -3,8 +3,6 @@ #include "envoy/registry/registry.h" #include "envoy/server/transport_socket_config.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -17,7 +15,7 @@ namespace Tls { class SslSocketConfigFactory : public virtual Server::Configuration::TransportSocketConfigFactory { public: ~SslSocketConfigFactory() override = default; - std::string name() const override { return TransportSocketNames::get().Tls; } + std::string name() const override { return "envoy.transport_sockets.tls"; } }; class UpstreamSslSocketFactory : public Server::Configuration::UpstreamTransportSocketConfigFactory, diff --git a/source/server/BUILD b/source/server/BUILD index dd46e4e446c00..bd71a70146747 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -134,7 +134,6 @@ envoy_cc_library( "//source/common/network:connection_lib", "//source/common/stats:timespan_lib", "//source/common/stream_info:stream_info_lib", - "//source/extensions/transport_sockets:well_known_names", "//source/server:active_listener_base", ], ) @@ -153,7 +152,6 @@ envoy_cc_library( "//include/envoy/network:listen_socket_interface", "//include/envoy/network:listener_interface", "//include/envoy/server:listener_manager_interface", - "//source/extensions/transport_sockets:well_known_names", "//source/server:connection_handler_impl", ], ) @@ -412,7 +410,6 @@ envoy_cc_library( "//source/common/stream_info:stream_info_lib", "//source/extensions/filters/listener:well_known_names", "//source/extensions/filters/network/http_connection_manager:config", - "//source/extensions/transport_sockets:well_known_names", "//source/extensions/upstreams/http/generic:config", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/server/active_tcp_listener.cc b/source/server/active_tcp_listener.cc index 4146ed86b39ac..bcf5cae34d836 100644 --- a/source/server/active_tcp_listener.cc +++ b/source/server/active_tcp_listener.cc @@ -12,8 +12,6 @@ #include "common/network/utility.h" #include "common/stats/timespan_impl.h" -#include "extensions/transport_sockets/well_known_names.h" - namespace Envoy { namespace Server { @@ -198,8 +196,7 @@ void ActiveTcpSocket::newConnection() { } else { // Set default transport protocol if none of the listener filters did it. if (socket_->detectedTransportProtocol().empty()) { - socket_->setDetectedTransportProtocol( - Extensions::TransportSockets::TransportProtocolNames::get().RawBuffer); + socket_->setDetectedTransportProtocol("raw_buffer"); } // TODO(lambdai): add integration test // TODO: Address issues in wider scope. See https://github.com/envoyproxy/envoy/issues/8925 diff --git a/source/server/listener_impl.cc b/source/server/listener_impl.cc index 4c1f5f19dfa66..405937f7cf7b1 100644 --- a/source/server/listener_impl.cc +++ b/source/server/listener_impl.cc @@ -32,7 +32,6 @@ #include "server/transport_socket_config_impl.h" #include "extensions/filters/listener/well_known_names.h" -#include "extensions/transport_sockets/well_known_names.h" #if defined(ENVOY_ENABLE_QUIC) #include "common/quic/active_quic_listener.h" diff --git a/source/server/listener_manager_impl.cc b/source/server/listener_manager_impl.cc index 5bf3709c41de6..c9fa407fd7912 100644 --- a/source/server/listener_manager_impl.cc +++ b/source/server/listener_manager_impl.cc @@ -35,7 +35,6 @@ #include "server/transport_socket_config_impl.h" #include "extensions/filters/listener/well_known_names.h" -#include "extensions/transport_sockets/well_known_names.h" namespace Envoy { namespace Server { @@ -944,12 +943,11 @@ Network::DrainableFilterChainSharedPtr ListenerFilterChainFactoryBuilder::buildF auto transport_socket = filter_chain.transport_socket(); if (!filter_chain.has_transport_socket()) { if (filter_chain.has_hidden_envoy_deprecated_tls_context()) { - transport_socket.set_name(Extensions::TransportSockets::TransportSocketNames::get().Tls); + transport_socket.set_name("envoy.transport_sockets.tls"); transport_socket.mutable_typed_config()->PackFrom( filter_chain.hidden_envoy_deprecated_tls_context()); } else { - transport_socket.set_name( - Extensions::TransportSockets::TransportSocketNames::get().RawBuffer); + transport_socket.set_name("envoy.transport_sockets.raw_buffer"); } } diff --git a/test/common/quic/envoy_quic_dispatcher_test.cc b/test/common/quic/envoy_quic_dispatcher_test.cc index 5b4f7b4b76b63..f46bac22788c2 100644 --- a/test/common/quic/envoy_quic_dispatcher_test.cc +++ b/test/common/quic/envoy_quic_dispatcher_test.cc @@ -33,7 +33,6 @@ #include "test/common/quic/test_utils.h" #include "common/quic/envoy_quic_alarm_factory.h" #include "common/quic/envoy_quic_utils.h" -#include "extensions/transport_sockets/well_known_names.h" #include "server/configuration_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/quic/envoy_quic_proof_source_test.cc b/test/common/quic/envoy_quic_proof_source_test.cc index 7596d970757ae..960d385d2b2f7 100644 --- a/test/common/quic/envoy_quic_proof_source_test.cc +++ b/test/common/quic/envoy_quic_proof_source_test.cc @@ -154,8 +154,7 @@ class EnvoyQuicProofSourceTest : public ::testing::Test { *connection_socket.addressProvider().localAddress()); EXPECT_EQ(*quicAddressToEnvoyAddressInstance(client_address_), *connection_socket.addressProvider().remoteAddress()); - EXPECT_EQ(Extensions::TransportSockets::TransportProtocolNames::get().Quic, - connection_socket.detectedTransportProtocol()); + EXPECT_EQ("quic", connection_socket.detectedTransportProtocol()); EXPECT_EQ("h3-29", connection_socket.requestedApplicationProtocols()[0]); return &filter_chain_; })); @@ -243,8 +242,7 @@ TEST_F(EnvoyQuicProofSourceTest, GetProofFailNoCertConfig) { *connection_socket.addressProvider().localAddress()); EXPECT_EQ(*quicAddressToEnvoyAddressInstance(client_address_), *connection_socket.addressProvider().remoteAddress()); - EXPECT_EQ(Extensions::TransportSockets::TransportProtocolNames::get().Quic, - connection_socket.detectedTransportProtocol()); + EXPECT_EQ("quic", connection_socket.detectedTransportProtocol()); EXPECT_EQ("h3-29", connection_socket.requestedApplicationProtocols()[0]); return &filter_chain_; })); diff --git a/test/common/quic/envoy_quic_server_session_test.cc b/test/common/quic/envoy_quic_server_session_test.cc index 415b5c609823d..6f13cf9359b0c 100644 --- a/test/common/quic/envoy_quic_server_session_test.cc +++ b/test/common/quic/envoy_quic_server_session_test.cc @@ -30,7 +30,6 @@ #include "common/quic/envoy_quic_utils.h" #include "test/common/quic/test_proof_source.h" #include "test/common/quic/test_utils.h" -#include "extensions/transport_sockets/well_known_names.h" #include "envoy/stats/stats_macros.h" #include "common/event/libevent_scheduler.h" diff --git a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc index 23f0a19428124..28f51201395b0 100644 --- a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc +++ b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc @@ -38,7 +38,7 @@ TEST(StartTlsTest, BasicSwitch) { socket->setTransportSocketCallbacks(transport_callbacks); // StartTls socket is initial clear-text state. All calls should be forwarded to raw socket. - ASSERT_THAT(socket->protocol(), TransportProtocolNames::get().StartTls); + ASSERT_THAT(socket->protocol(), "starttls"); EXPECT_CALL(*raw_socket, onConnected()); EXPECT_CALL(*ssl_socket, onConnected()).Times(0); socket->onConnected(); @@ -81,7 +81,7 @@ TEST(StartTlsTest, BasicSwitch) { // Now calls to all methods should be forwarded to ssl_socket. // raw_socket has been destructed when switch to tls happened. - ASSERT_THAT(socket->protocol(), TransportProtocolNames::get().StartTls); + ASSERT_THAT(socket->protocol(), "starttls"); EXPECT_CALL(*ssl_socket, onConnected()); socket->onConnected(); diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index ef5403bdb471a..07f12b7812a82 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -11,8 +11,6 @@ #include "server/filter_chain_manager_impl.h" -#include "extensions/transport_sockets/well_known_names.h" - #include "test/benchmark/main.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h"