Skip to content

Update QUICHE from 1e04d1e30 to 0b75841d5 #18862

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

Merged
alyssawilk merged 2 commits into from
Nov 3, 2021
Merged

Update QUICHE from 1e04d1e30 to 0b75841d5 #18862

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
438d19c
Update QUICHE from 1e04d1e30 to 0b75841d5
alyssawilk Nov 2, 2021
8cab64d
comments
alyssawilk Nov 2, 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
1 change: 1 addition & 0 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3493,6 +3493,7 @@ envoy_cc_library(
":quic_core_time_lib",
":quic_platform_base",
":quiche_common_endian_lib",
":quiche_common_print_elements_lib",
],
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,12 +838,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "QUICHE",
project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
project_url = "https://github.com/google/quiche",
version = "1e04d1e300be1425e2098c4f7ea0e92b697f90a8",
sha256 = "c10fccecbfae316d27ee18bc52af78bac1da863b9892d1e00d54be8c084331fc",
version = "0b75841d5b5844c53f4399a41d64de7250c204d8",
sha256 = "a00b0671180fc79952baf754148e65364bfca9d35b988710594752fb7f9bf6a1",
urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
strip_prefix = "quiche-{version}",
use_category = ["dataplane_core"],
release_date = "2021-10-29",
release_date = "2021-11-02",
cpe = "N/A",
),
com_googlesource_googleurl = dict(
Expand Down
4 changes: 2 additions & 2 deletions source/common/quic/envoy_quic_dispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i
std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession(
quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address,
const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/,
const quic::ParsedQuicVersion& version, absl::string_view sni) {
const quic::ParsedQuicVersion& version, const quic::ParsedClientHello& parsed_chlo) {
quic::QuicConfig quic_config = config();
// TODO(danzh) use passed-in ALPN instead of hard-coded h3 after proof source interfaces takes in
// ALPN.
Network::ConnectionSocketPtr connection_socket = createServerConnectionSocket(
listen_socket_.ioHandle(), self_address, peer_address, std::string(sni), "h3");
listen_socket_.ioHandle(), self_address, peer_address, std::string(parsed_chlo.sni), "h3");
const Network::FilterChain* filter_chain =
listener_config_->filterChainManager().findFilterChain(*connection_socket);

Expand Down
10 changes: 4 additions & 6 deletions source/common/quic/envoy_quic_dispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ class EnvoyQuicDispatcher : public quic::QuicDispatcher {

protected:
// quic::QuicDispatcher
std::unique_ptr<quic::QuicSession> CreateQuicSession(quic::QuicConnectionId server_connection_id,
const quic::QuicSocketAddress& self_address,
const quic::QuicSocketAddress& peer_address,
absl::string_view alpn,
const quic::ParsedQuicVersion& version,
absl::string_view sni) override;
std::unique_ptr<quic::QuicSession> CreateQuicSession(
quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address,
const quic::QuicSocketAddress& peer_address, absl::string_view alpn,
const quic::ParsedQuicVersion& version, const quic::ParsedClientHello& parsed_chlo) override;
// Overridden to restore the first 4 bytes of the connection ID because our BPF filter only looks
// at the first 4 bytes. This ensures that the replacement routes to the same quic dispatcher.
quic::QuicConnectionId
Expand Down