Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quic: removing a now redundant member variable #18755

Merged
merged 2 commits into from
Oct 26, 2021
Merged

quic: removing a now redundant member variable #18755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad0b60
quic: removing a now redundant member variable
alyssawilk Oct 25, 2021
509d46e
format
alyssawilk Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions source/common/quic/envoy_quic_client_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ EnvoyQuicClientSession::EnvoyQuicClientSession(
send_buffer_limit),
quic::QuicSpdyClientSession(config, supported_versions, connection.release(), server_id,
crypto_config.get(), push_promise_index),
host_name_(server_id.host()), crypto_config_(crypto_config),
crypto_stream_factory_(crypto_stream_factory), quic_stat_names_(quic_stat_names),
scope_(scope) {
crypto_config_(crypto_config), crypto_stream_factory_(crypto_stream_factory),
quic_stat_names_(quic_stat_names), scope_(scope) {
quic_ssl_info_ = std::make_shared<QuicSslConnectionInfo>(*this);
}

Expand All @@ -30,7 +29,7 @@ EnvoyQuicClientSession::~EnvoyQuicClientSession() {
network_connection_ = nullptr;
}

absl::string_view EnvoyQuicClientSession::requestedServerName() const { return host_name_; }
absl::string_view EnvoyQuicClientSession::requestedServerName() const { return server_id().host(); }

void EnvoyQuicClientSession::connect() {
dynamic_cast<EnvoyQuicClientConnection*>(network_connection_)
Expand Down
2 changes: 0 additions & 2 deletions source/common/quic/envoy_quic_client_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ class EnvoyQuicClientSession : public QuicFilterManagerConnectionImpl,
// These callbacks are owned by network filters and quic session should outlive
// them.
Http::ConnectionCallbacks* http_connection_callbacks_{nullptr};
// TODO(danzh) deprecate this field once server_id() is made const.
const std::string host_name_;
std::shared_ptr<quic::QuicCryptoClientConfig> crypto_config_;
EnvoyQuicCryptoClientStreamFactoryInterface& crypto_stream_factory_;
QuicStatNames& quic_stat_names_;
Expand Down